* [PATCH] Revert "remote-hg: update bookmarks when pulling"
@ 2013-05-16 12:43 Felipe Contreras
2013-05-16 16:39 ` Junio C Hamano
2013-05-16 22:55 ` Junio C Hamano
0 siblings, 2 replies; 6+ messages in thread
From: Felipe Contreras @ 2013-05-16 12:43 UTC (permalink / raw)
To: git; +Cc: Junio C Hamano, 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
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
2013-05-16 12:43 [PATCH] Revert "remote-hg: update bookmarks when pulling" Felipe Contreras
@ 2013-05-16 16:39 ` Junio C Hamano
2013-05-16 18:16 ` Junio C Hamano
2013-05-16 22:55 ` Junio C Hamano
1 sibling, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2013-05-16 16:39 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
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):
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
2013-05-16 16:39 ` Junio C Hamano
@ 2013-05-16 18:16 ` Junio C Hamano
2013-05-16 23:04 ` Felipe Contreras
0 siblings, 1 reply; 6+ messages in thread
From: Junio C Hamano @ 2013-05-16 18:16 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
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):
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
2013-05-16 18:16 ` Junio C Hamano
@ 2013-05-16 23:04 ` Felipe Contreras
2013-05-16 23:14 ` Junio C Hamano
0 siblings, 1 reply; 6+ messages in thread
From: Felipe Contreras @ 2013-05-16 23:04 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
2013-05-16 23:04 ` Felipe Contreras
@ 2013-05-16 23:14 ` Junio C Hamano
0 siblings, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2013-05-16 23:14 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] Revert "remote-hg: update bookmarks when pulling"
2013-05-16 12:43 [PATCH] Revert "remote-hg: update bookmarks when pulling" Felipe Contreras
2013-05-16 16:39 ` Junio C Hamano
@ 2013-05-16 22:55 ` Junio C Hamano
1 sibling, 0 replies; 6+ messages in thread
From: Junio C Hamano @ 2013-05-16 22:55 UTC (permalink / raw)
To: Felipe Contreras; +Cc: git
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-05-16 23:14 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-16 12:43 [PATCH] Revert "remote-hg: update bookmarks when pulling" Felipe Contreras
2013-05-16 16:39 ` Junio C Hamano
2013-05-16 18:16 ` Junio C Hamano
2013-05-16 23:04 ` Felipe Contreras
2013-05-16 23:14 ` Junio C Hamano
2013-05-16 22:55 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox