On Tue, Oct 30, 2012 at 11:25 AM, Chris Webb <ch...@arachsys.com> wrote:
> Hi. I routinely work with projects in both hg and git, so I'm really
> interested in this. Thanks for working on it! I grabbed the latest version
> from
> https://github.com/felipec/git/blob/fc-remote-hg/contrib/remote-hg/git-remote-hg
> and have been trying it out. For the most part, it seems to work very nicely
> for the hg repos I have access to and can test against. I've spotted a couple
> of issues along the way that I thought would be worth reporting.


> The first is really a symptom of a general difference between hg and git: an 
> hg
> repository can have multiple heads, whereas a git repo has exactly one head. 
> To
> demonstrate:

> Now if I try to convert this:
>   $ git clone hg::$PWD/hgtest gittest
>   Cloning into 'gittest'...
>   WARNING: Branch 'default' has more than one head, consider merging
>   Traceback (most recent call last):
>     File "/home/chris/bin/git-remote-hg", line 773, in <module>
>       sys.exit(main(sys.argv))
>     File "/home/chris/bin/git-remote-hg", line 759, in main
>       do_list(parser)
>     File "/home/chris/bin/git-remote-hg", line 463, in do_list
>       list_branch_head(repo, cur)
>     File "/home/chris/bin/git-remote-hg", line 425, in list_branch_head
>       tip = get_branch_tip(repo, cur)
>     File "/home/chris/bin/git-remote-hg", line 418, in get_branch_tip
>       return repo.branchtip(branch)
>   AttributeError: 'mqrepo' object has no attribute 'branchtip'

Yes, it seems this is an API issue; repo.branchtip doesn't exist in
python 2.2. I've added a check for that, and it should work fine now.
We'll be picking a random head (the first one), but the user has been
warned anyway.

> The second thing I spotted is the behaviour of bookmarks on push:

> i.e. the development bookmark hasn't been updated by the push. This might be
> connected to the warning message

This is not an API issue, this is a bug; bookmarks are not updated
(only the first creation works). I've fixed this as well, and added a
test with the example you put above:


Both issues should be fixed now :)


Felipe Contreras
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to