[PATCH V2] bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)

Sean Farley sean at farley.io
Mon Jun 20 17:15:30 EDT 2016


Yuya Nishihara <yuya at tcha.org> writes:

> On Mon, 20 Jun 2016 09:51:01 +0200, liscju wrote:
>> # HG changeset patch
>> # User liscju <piotr.listkiewicz at gmail.com>
>> # Date 1464814737 -7200
>> #      Wed Jun 01 22:58:57 2016 +0200
>> # Node ID 9c9bacc0c8f7c830fe05ff47442d85ac9576fa04
>> # Parent  d269e7db2f55f812c9ee1efe5626602614174df3
>> bookmarks: add 'hg pull -B .' for pulling the active bookmark (issue5258)
>
> Queued this, thanks. Can you update the help message as a follow-up?
>
>> +++ b/mercurial/exchange.py
>> @@ -1056,7 +1056,8 @@ class pulloperation(object):
>>          # revision we try to pull (None is "all")
>>          self.heads = heads
>>          # bookmark pulled explicitly
>> -        self.explicitbookmarks = bookmarks
>> +        self.explicitbookmarks = [repo._bookmarks.expandname(bookmark)
>> +                                  for bookmark in bookmarks]
>
> I have no idea where '.' should be expanded, but it seems inconsistent that
> pulloperation keeps expanded names but pushoperation doesn't. Thoughts?

To add from a previous mail about this, I think we should expand '.' in
the bookmark class (or util) and permanently reserve '.' from all
namespaces. Are there any corner-cases to think about here?


More information about the Mercurial-devel mailing list