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

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

[Felipe Contreras]

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

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

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

[Junio C Hamano]

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?

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

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

[Junio C Hamano]

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.

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

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

[Junio C Hamano]

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

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

Thanks.

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

[Felipe Contreras]

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.

-- 
Felipe Contreras

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

[Junio C Hamano]

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

> 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.