# [PATCH] Revert "remote-hg: update bookmarks when pulling" 6 messages from 2013-05-16 to 2013-05-16. Participants: Felipe Contreras, Junio C Hamano. Thread: https://gitlist.dev/t/33839 ## Felipe Contreras, 2013-05-16 12:43 Subject: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <1368708195-1044-1-git-send-email-felipe.contreras@gmail.com> URL: https://gitlist.dev/e/1368708195-1044-1-git-send-email-felipe.contreras%40gmail.com ``` This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. Different versions of Mercurial have different arguments for bookmarks.updatefromremote(), while it should be possible to call the right function with the right arguments depending on the version, it's safer to restore the old behavior for now. Reported by Rodney Lorrimar. Signed-off-by: Felipe Contreras --- Intended for master (v1.8.3). contrib/remote-helpers/git-remote-hg | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index dc276af..beb864b 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -363,9 +363,6 @@ def get_repo(url, alias): die('Repository error') repo.pull(peer, heads=None, force=True) - rb = peer.listkeys('bookmarks') - bookmarks.updatefromremote(myui, repo, rb, url) - return repo def rev_to_mark(rev): -- 1.8.3.rc2.542.g24820ba ``` ## Junio C Hamano, 2013-05-16 16:39 Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <7v4ne27ubp.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v4ne27ubp.fsf%40alter.siamese.dyndns.org In-Reply-To: <1368708195-1044-1-git-send-email-felipe.contreras@gmail.com> ``` Felipe Contreras writes: > This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. > > Different versions of Mercurial have different arguments for > bookmarks.updatefromremote(), while it should be possible to call the > right function with the right arguments depending on the version, it's > safer to restore the old behavior for now. > > Reported by Rodney Lorrimar. > > Signed-off-by: Felipe Contreras > --- > > Intended for master (v1.8.3). Hmm, is this the one we merged yesterday? > > contrib/remote-helpers/git-remote-hg | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg > index dc276af..beb864b 100755 > --- a/contrib/remote-helpers/git-remote-hg > +++ b/contrib/remote-helpers/git-remote-hg > @@ -363,9 +363,6 @@ def get_repo(url, alias): > die('Repository error') > repo.pull(peer, heads=None, force=True) > > - rb = peer.listkeys('bookmarks') > - bookmarks.updatefromremote(myui, repo, rb, url) > - > return repo > > def rev_to_mark(rev): ``` ## Junio C Hamano, 2013-05-16 18:16 Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <7vbo8a6b9c.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vbo8a6b9c.fsf%40alter.siamese.dyndns.org In-Reply-To: <7v4ne27ubp.fsf@alter.siamese.dyndns.org> ``` Junio C Hamano writes: > Felipe Contreras writes: > >> This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. >> >> Different versions of Mercurial have different arguments for >> bookmarks.updatefromremote(), while it should be possible to call the >> right function with the right arguments depending on the version, it's >> safer to restore the old behavior for now. >> >> Reported by Rodney Lorrimar. >> >> Signed-off-by: Felipe Contreras >> --- >> >> Intended for master (v1.8.3). > > Hmm, is this the one we merged yesterday? Just double-checking. This is a lot more urgent request for confirmation than anything else I've been sending today (and receiving responses from you about). > >> >> contrib/remote-helpers/git-remote-hg | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg >> index dc276af..beb864b 100755 >> --- a/contrib/remote-helpers/git-remote-hg >> +++ b/contrib/remote-helpers/git-remote-hg >> @@ -363,9 +363,6 @@ def get_repo(url, alias): >> die('Repository error') >> repo.pull(peer, heads=None, force=True) >> >> - rb = peer.listkeys('bookmarks') >> - bookmarks.updatefromremote(myui, repo, rb, url) >> - >> return repo >> >> def rev_to_mark(rev): ``` ## Junio C Hamano, 2013-05-16 22:55 Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <7v1u964jsn.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v1u964jsn.fsf%40alter.siamese.dyndns.org In-Reply-To: <1368708195-1044-1-git-send-email-felipe.contreras@gmail.com> ``` Felipe Contreras writes: > This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. > > Different versions of Mercurial have different arguments for > bookmarks.updatefromremote(), while it should be possible to call the > right function with the right arguments depending on the version, it's > safer to restore the old behavior for now. > > Reported by Rodney Lorrimar. > > Signed-off-by: Felipe Contreras > --- > > Intended for master (v1.8.3). OK, will revert before I start today's final integration run. Thanks. ``` ## Felipe Contreras, 2013-05-16 23:04 Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: URL: https://gitlist.dev/e/CAMP44s3HKgWE%3D8SU%2BaBMBWzwe-fQ8Rjf0yGmGQxcdedhYCNJmQ%40mail.gmail.com In-Reply-To: <7vbo8a6b9c.fsf@alter.siamese.dyndns.org> ``` On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Felipe Contreras writes: >> >>> This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. >>> >>> Different versions of Mercurial have different arguments for >>> bookmarks.updatefromremote(), while it should be possible to call the >>> right function with the right arguments depending on the version, it's >>> safer to restore the old behavior for now. >>> >>> Reported by Rodney Lorrimar. >>> >>> Signed-off-by: Felipe Contreras >>> --- >>> >>> Intended for master (v1.8.3). >> >> Hmm, is this the one we merged yesterday? > > Just double-checking. Yes. -- Felipe Contreras ``` ## Junio C Hamano, 2013-05-16 23:14 Subject: Re: [PATCH] Revert "remote-hg: update bookmarks when pulling" Message-ID: <7vsj1m34bj.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vsj1m34bj.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Felipe Contreras writes: > On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano wrote: >> Junio C Hamano writes: >> >>> Felipe Contreras writes: >>> >>>> This reverts commit 24317ef32ac3111ed00792f9b2921dc19dd28fe2. >>>> >>>> Different versions of Mercurial have different arguments for >>>> bookmarks.updatefromremote(), while it should be possible to call the >>>> right function with the right arguments depending on the version, it's >>>> safer to restore the old behavior for now. >>>> >>>> Reported by Rodney Lorrimar. >>>> >>>> Signed-off-by: Felipe Contreras >>>> --- >>>> >>>> Intended for master (v1.8.3). >>> >>> Hmm, is this the one we merged yesterday? >> >> Just double-checking. > > Yes. OK. Thanks for keeping an eye on real user reports. Please relay our thanks to Rodney as well. ```