# [PATCH] remote-hg: do not fail on invalid bookmarks 7 messages from 2013-12-29 to 2014-01-06. Participants: Antoine Pelisse, Mike Hommey, Junio C Hamano, Torsten Bögershausen. Thread: https://gitlist.dev/t/35583 ## Antoine Pelisse, 2013-12-29 11:30 Subject: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: <1388316602-22443-1-git-send-email-apelisse@gmail.com> URL: https://gitlist.dev/e/1388316602-22443-1-git-send-email-apelisse%40gmail.com ``` Mercurial can have bookmarks pointing to "nullid" (the empty root revision), while Git can not have references to it. When cloning or fetching from a Mercurial repository that has such a bookmark, the import will fail because git-remote-hg will not be able to create the corresponding reference. Warn the user about the invalid reference, and continue the import, instead of stopping right away. Signed-off-by: Antoine Pelisse --- contrib/remote-helpers/git-remote-hg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index eb89ef6..12d850e 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -625,6 +625,9 @@ def list_head(repo, cur): def do_list(parser): repo = parser.repo for bmark, node in bookmarks.listbookmarks(repo).iteritems(): + if node == '0000000000000000000000000000000000000000': + warn("Ignoring invalid bookmark '%s'", bmark) + continue bmarks[bmark] = repo[node] cur = repo.dirstate.branch() -- 1.8.5.1.97.g8d784da.dirty ``` ## Mike Hommey, 2013-12-29 22:24 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: <20131229222433.GA31355@glandium.org> URL: https://gitlist.dev/e/20131229222433.GA31355%40glandium.org In-Reply-To: <1388316602-22443-1-git-send-email-apelisse@gmail.com> ``` On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote: > Mercurial can have bookmarks pointing to "nullid" (the empty root > revision), while Git can not have references to it. > When cloning or fetching from a Mercurial repository that has such a > bookmark, the import will fail because git-remote-hg will not be able to > create the corresponding reference. > > Warn the user about the invalid reference, and continue the import, > instead of stopping right away. It's not invalid, it's used to indicate deleted bookmarks. (Tags have the same property) Mike ``` ## Antoine Pelisse, 2013-12-30 07:41 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: URL: https://gitlist.dev/e/CALWbr2wYqxdMhaWfXQCOk3J_Mxy6%3DNcScyg9-__j8PPdhY7reA%40mail.gmail.com In-Reply-To: <20131229222433.GA31355@glandium.org> ``` On Sun, Dec 29, 2013 at 11:24 PM, Mike Hommey wrote: > On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote: >> Mercurial can have bookmarks pointing to "nullid" (the empty root >> revision), while Git can not have references to it. >> When cloning or fetching from a Mercurial repository that has such a >> bookmark, the import will fail because git-remote-hg will not be able to >> create the corresponding reference. >> >> Warn the user about the invalid reference, and continue the import, >> instead of stopping right away. > > It's not invalid, it's used to indicate deleted bookmarks. (Tags have > the same property) Hey Mike, Indeed, I don't know how I ended-up with such a bookmark, but it prevented me from git-cloning the repository (and the backtrace was not very helpful at first). But I'm still not sure what you mean by "deleted bookmarks" ? I guess it's not "hg bookmark --delete", as it would not be listed at all. Is it "hg strip some_changeset" that end-up deleting the bookmarked changeset ? I think I've tested this use-case and it moved the bookmark to a parent changeset. Antoine, ``` ## Junio C Hamano, 2013-12-30 19:12 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: URL: https://gitlist.dev/e/xmqqha9qrw4s.fsf%40gitster.dls.corp.google.com In-Reply-To: <20131229222433.GA31355@glandium.org> ``` Mike Hommey writes: > On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote: >> Mercurial can have bookmarks pointing to "nullid" (the empty root >> revision), while Git can not have references to it. >> When cloning or fetching from a Mercurial repository that has such a >> bookmark, the import will fail because git-remote-hg will not be able to >> create the corresponding reference. >> >> Warn the user about the invalid reference, and continue the import, >> instead of stopping right away. > > It's not invalid, it's used to indicate deleted bookmarks. (Tags have > the same property) So what should remote-hg behave in such a case, other than what Antoine's change does (which is to, IIRC, warn, ignore and continue). ``` ## Mike Hommey, 2013-12-30 23:22 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: <20131230232239.GA5688@glandium.org> URL: https://gitlist.dev/e/20131230232239.GA5688%40glandium.org In-Reply-To: ``` On Mon, Dec 30, 2013 at 08:41:13AM +0100, Antoine Pelisse wrote: > On Sun, Dec 29, 2013 at 11:24 PM, Mike Hommey wrote: > > On Sun, Dec 29, 2013 at 12:30:02PM +0100, Antoine Pelisse wrote: > >> Mercurial can have bookmarks pointing to "nullid" (the empty root > >> revision), while Git can not have references to it. > >> When cloning or fetching from a Mercurial repository that has such a > >> bookmark, the import will fail because git-remote-hg will not be able to > >> create the corresponding reference. > >> > >> Warn the user about the invalid reference, and continue the import, > >> instead of stopping right away. > > > > It's not invalid, it's used to indicate deleted bookmarks. (Tags have > > the same property) > > Hey Mike, > Indeed, I don't know how I ended-up with such a bookmark, but it > prevented me from git-cloning the repository (and the backtrace was > not very helpful at first). > But I'm still not sure what you mean by "deleted bookmarks" ? > I guess it's not "hg bookmark --delete", as it would not be listed at > all. Is it "hg strip some_changeset" that end-up deleting the > bookmarked changeset ? I think I've tested this use-case and it moved > the bookmark to a parent changeset. Mmmm after looking at the mercurial code, it looks like i was wrong and bookmarks are not handled like tags. You can actually create such a bookmark on purpose with: $ hg bookmark -r null foo Then, if you do, say: $ hg up -r foo $ echo a > a $ hg add a $ hg commit -m a Then you end up with a completely new head with no ancestors in common with the others. In git terms, $ hg bookmark -r null foo $ hg up -r foo is equivalent to $ git checkout --orphan foo But git never creates an actual ref in that case. Mike ``` ## Torsten Bögershausen, 2014-01-06 13:52 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: <52CAB508.5010002@web.de> URL: https://gitlist.dev/e/52CAB508.5010002%40web.de In-Reply-To: <1388316602-22443-1-git-send-email-apelisse@gmail.com> ``` On 2013-12-29 12.30, Antoine Pelisse wrote: > Mercurial can have bookmarks pointing to "nullid" (the empty root > revision), while Git can not have references to it. > When cloning or fetching from a Mercurial repository that has such a > bookmark, the import will fail because git-remote-hg will not be able to > create the corresponding reference. > > Warn the user about the invalid reference, and continue the import, > instead of stopping right away. > > Signed-off-by: Antoine Pelisse > --- > contrib/remote-helpers/git-remote-hg | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg > index eb89ef6..12d850e 100755 > --- a/contrib/remote-helpers/git-remote-hg > +++ b/contrib/remote-helpers/git-remote-hg > @@ -625,6 +625,9 @@ def list_head(repo, cur): > def do_list(parser): > repo = parser.repo > for bmark, node in bookmarks.listbookmarks(repo).iteritems(): > + if node == '0000000000000000000000000000000000000000': > + warn("Ignoring invalid bookmark '%s'", bmark) > + continue > bmarks[bmark] = repo[node] > > cur = repo.dirstate.branch() > (Side note: ap/remote-hg-skip-null-bookmarks) When I run the test-suite like this: ~/projects/git/git.pu/contrib/remote-helpers$ debug=t verbose=t make test-hg-hg-git.sh All 11 test cases fail on my systems (Debian Wheezy and Mac OS X): [snip] WARNING: Ignoring invalid bookmark 'master' To hg::../hgrepo-git ! [remote rejected] master -> master error: failed to push some refs to 'hg::../hgrepo-git' not ok 1 - executable bit # [snip] ``` ## Antoine Pelisse, 2014-01-06 21:51 Subject: Re: [PATCH] remote-hg: do not fail on invalid bookmarks Message-ID: URL: https://gitlist.dev/e/CALWbr2zC-Q8YduW9b1feThBtz38Tsk7D1BoCRd7KxnCuht27PQ%40mail.gmail.com In-Reply-To: <52CAB508.5010002@web.de> ``` Thanks for noticing, I can reproduce at work, I will try to come-up with an improved version soon, Cheers, Antoine On Mon, Jan 6, 2014 at 2:52 PM, Torsten Bögershausen wrote: > On 2013-12-29 12.30, Antoine Pelisse wrote: >> Mercurial can have bookmarks pointing to "nullid" (the empty root >> revision), while Git can not have references to it. >> When cloning or fetching from a Mercurial repository that has such a >> bookmark, the import will fail because git-remote-hg will not be able to >> create the corresponding reference. >> >> Warn the user about the invalid reference, and continue the import, >> instead of stopping right away. >> >> Signed-off-by: Antoine Pelisse >> --- >> contrib/remote-helpers/git-remote-hg | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg >> index eb89ef6..12d850e 100755 >> --- a/contrib/remote-helpers/git-remote-hg >> +++ b/contrib/remote-helpers/git-remote-hg >> @@ -625,6 +625,9 @@ def list_head(repo, cur): >> def do_list(parser): >> repo = parser.repo >> for bmark, node in bookmarks.listbookmarks(repo).iteritems(): >> + if node == '0000000000000000000000000000000000000000': >> + warn("Ignoring invalid bookmark '%s'", bmark) >> + continue >> bmarks[bmark] = repo[node] >> >> cur = repo.dirstate.branch() >> > (Side note: ap/remote-hg-skip-null-bookmarks) > > When I run the test-suite like this: > ~/projects/git/git.pu/contrib/remote-helpers$ debug=t verbose=t make test-hg-hg-git.sh > > All 11 test cases fail on my systems (Debian Wheezy and Mac OS X): > [snip] > WARNING: Ignoring invalid bookmark 'master' > To hg::../hgrepo-git > ! [remote rejected] master -> master > error: failed to push some refs to 'hg::../hgrepo-git' > not ok 1 - executable bit > # > [snip] > > ```