From: Felipe Contreras <felipe.contreras@gmail.com>
To: Chris Webb <chris@arachsys.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Ilari Liusvaara <ilari.liusvaara@elisanet.fi>,
Daniel Barkalow <barkalow@iabervon.org>,
Jeff King <peff@peff.net>,
Michael J Gruber <git@drmicha.warpmail.net>
Subject: Re: [PATCH v5 00/14] New remote-hg helper
Date: Tue, 30 Oct 2012 16:51:50 +0100 [thread overview]
Message-ID: <CAMP44s1g8rFGP7UOcvp9BEZ1oiSh3+-gYheciqO8Fmghipot8A@mail.gmail.com> (raw)
In-Reply-To: <20121030102526.GN4891@arachsys.com>
On Tue, Oct 30, 2012 at 11:25 AM, Chris Webb <chris@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.
Great!
> 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:
http://github.com/felipec/git/commit/d006d54fc444484707dffa24d9fad053e574918d
Both issues should be fixed now :)
Cheers.
--
Felipe Contreras
next prev parent reply other threads:[~2012-10-30 15:52 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 4:35 [PATCH v5 00/14] New remote-hg helper Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 01/14] Add new remote-hg transport helper Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 02/14] remote-hg: add support for bookmarks Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 03/14] remote-hg: add support for pushing Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 04/14] remote-hg: add support for remote pushing Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 05/14] remote-hg: add support to push URLs Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 06/14] remote-hg: make sure the encoding is correct Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 07/14] remote-hg: match hg merge behavior Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 08/14] remote-hg: add support for hg-git compat mode Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 09/14] remote-hg: add compat for hg-git author fixes Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 10/14] remote-hg: fake bookmark when there's none Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 11/14] remote-hg: add support for fake remote Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 12/14] remote-hg: add biridectional tests Felipe Contreras
[not found] ` <CAPc5daUuCsiQd4MoQzQm_aQ6c88b_E8vYfA5btXMW4yCBX8E=g@mail.gmail.com>
2012-10-30 4:49 ` Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 13/14] remote-hg: add tests to compare with hg-git Felipe Contreras
2012-10-30 4:35 ` [PATCH v5 14/14] remote-hg: add extra author test Felipe Contreras
2012-10-30 10:25 ` [PATCH v5 00/14] New remote-hg helper Chris Webb
2012-10-30 10:28 ` Chris Webb
2012-10-30 15:51 ` Felipe Contreras [this message]
2012-10-30 18:00 ` Chris Webb
2012-10-30 18:16 ` Chris Webb
2012-10-30 18:29 ` Felipe Contreras
2012-11-01 6:05 ` Felipe Contreras
2012-11-11 22:17 ` Chris Webb
2012-11-13 3:45 ` Felipe Contreras
2012-10-30 17:27 ` Johannes Schindelin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMP44s1g8rFGP7UOcvp9BEZ1oiSh3+-gYheciqO8Fmghipot8A@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=chris@arachsys.com \
--cc=git@drmicha.warpmail.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=ilari.liusvaara@elisanet.fi \
--cc=peff@peff.net \
--cc=srabbelier@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).