threads / patch / 33839

patchRevert "remote-hg: update bookmarks when pulling"

Subject: [PATCH] Revert "remote-hg: update bookmarks when pulling"

## tl;dr

6 messages between May 16, 2013 and May 16, 2013. Diffs are folded; open one to read it.

replies: 5people: 2as markdown or json

Felipe Contreras· May 16, 2013, 12:43 UTC · lore

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 <felipe.contreras@gmail.com>
---

Intended for master (v1.8.3).

 contrib/remote-helpers/git-remote-hg | 3 ---
 1 file changed, 3 deletions(-)

Show changes to contrib/remote-helpers/git-remote-hg +0 −3

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· May 16, 2013, 16:39 UTC · re: Felipe Contreras · lore

Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 13 quoted lines

> 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 <felipe.contreras@gmail.com>
> ---
>
> Intended for master (v1.8.3).

Hmm, is this the one we merged yesterday?

Show 18 quoted lines

>
>  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· May 16, 2013, 18:16 UTC · re: Junio C Hamano · lore

Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"

Junio C Hamano <gitster@pobox.com> writes:

Show 17 quoted lines

> Felipe Contreras <felipe.contreras@gmail.com> 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 <felipe.contreras@gmail.com>
>> ---
>>
>> 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).

Show 19 quoted lines

>
>>
>>  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):

Felipe Contreras· May 16, 2013, 23:04 UTC · re: Junio C Hamano · lore

Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"

On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano <gitster@pobox.com> wrote:

Show 21 quoted lines

> Junio C Hamano <gitster@pobox.com> writes:
>
>> Felipe Contreras <felipe.contreras@gmail.com> 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 <felipe.contreras@gmail.com>
>>> ---
>>>
>>> Intended for master (v1.8.3).
>>
>> Hmm, is this the one we merged yesterday?
>
> Just double-checking.

Yes.

-- 
Felipe Contreras

Junio C Hamano· May 16, 2013, 23:14 UTC · re: Felipe Contreras · lore

Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 24 quoted lines

> On Thu, May 16, 2013 at 1:16 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Junio C Hamano <gitster@pobox.com> writes:
>>
>>> Felipe Contreras <felipe.contreras@gmail.com> 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 <felipe.contreras@gmail.com>
>>>> ---
>>>>
>>>> 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.

Junio C Hamano· May 16, 2013, 22:55 UTC · re: Felipe Contreras · lore

Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"

Felipe Contreras <felipe.contreras@gmail.com> writes:

Show 13 quoted lines

> 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 <felipe.contreras@gmail.com>
> ---
>
> Intended for master (v1.8.3).

OK, will revert before I start today's final integration run.

Thanks.