New Emacs Bazaar Repository II

[Ian Clatworthy]

Ian Clatworthy wrote:
> Jason Earl wrote:

>> First of all, how would I go about turning some of these branches back
>> into tags?
> 
> See above. According to fast-import's head tracking logic, these really
> are branches. Note however that the head tracking logic was recently
> tweaked to support resets. There's a chance I've broken it. FWIW,
> fast-import-info still uses the *old* head tracking logic so I'd be
> curious as to whether the branches that got created matched what f-i-i
> said would happen.

So I did indeed break the head tracking logic when I tweaked Brian's
reset patch. Brian was completely innocent. :-) The fix is now included
in rev 130. fast-import-info now uses the fixed code as well so fast-import
should generate branches for exactly the set of heads that fast-import-info
finds.

I've also added explicit unit tests for head tracking. See
tests/test_head_tracking.py and let me know if you think the results look
correct and/or if I need to add any more tests related to this.

>> Thirdly, the fast-import-info bit of fast-import is broken with regards
>> to the Emacs repository.  Emacs has so many "stickies" that it creates a
>> ConfigObj that ConfigObj can't read in a reasonable amount of time (I
>> let it run for 24 hours).

Your follow-up email suggested the problem was related to parsing
the 'other-resets' value. Now that resets are handled, that field is
of no/limited value so I've removed it altogether in rev 131.

> Also, I'm not done with bzr-fastimport. Here's my planned changes before
> announcing 0.8, hopefully around the same time as bzr 1.13rc goes out.

> 2. Better bzr-like & deterministic mapping of branch names:
>    * refs/heads/master -> trunk
>    * refs/heads/foo -> foo
>    * refs/tags/foo -> foo.tag
>    * refs/remotes/origin/foo -> foo.remote

This is now done in the latest trunk. The mapping used in documented in
the help and in NEWS. If required, we can easily add new mappings. See
branch_mapper.py for the code if you're interested.

Ian C.