[PATCH RFC] incoming: show changed bookmarks in addition to new ones

Augie Fackler raf at durin42.com
Wed Feb 11 08:44:37 CST 2015


On Feb 11, 2015, at 6:57 AM, FUJIWARA Katsunori <foozy at lares.dti.ne.jp> wrote:

> At Tue, 10 Feb 2015 19:52:51 -0800,
> Ryan McElroy wrote:
>> 
>> # HG changeset patch
>> # User Ryan McElroy <rmcelroy at fb.com>
>> # Date 1422335152 28800
>> #      Mon Jan 26 21:05:52 2015 -0800
>> # Node ID 80a86a48208bfb7013db0604af0243850d21016d
>> # Parent  ff5caa8dfd993680d9602ca6ebb14da9de10d5f4
>> incoming: show changed bookmarks in addition to new ones
>> 
>> Currently, `hg incoming -B` shows only new bookmarks on the server, not updated
>> bookmarks. This seems wrong -- I would expect it to show all bookmark activity.
>> Certainly, the help message of 'compare bookmarks' implies that this is what it
>> will do. Let's make `incoming -B` behave like it feels it should.
> 
> Once I posted the series to show detail about bookmarks at
> incoming/outgoing (refreshing them for current tip of hg repo is
> queued in my own TODO list :-))
> 
>    http://selenic.com/pipermail/mercurial-devel/2013-November/054580.html
>    http://selenic.com/pipermail/mercurial-devel/2013-November/054582.html
> 
> How about showing in this style ?

I agree that bookmarks incoming is currently somewhat broken (I'm shocked it doesn't mention moves!). It'd be nice to use foozy's proposed format if possible, but I'm not sure if that is okay within our BC policies. We'll probably need to revisit this in a couple of weeks when I can consult mpm.

> 
>> diff --git a/mercurial/bookmarks.py b/mercurial/bookmarks.py
>> --- a/mercurial/bookmarks.py
>> +++ b/mercurial/bookmarks.py
>> @@ -433,8 +433,8 @@ def diff(ui, dst, src):
>>     smarks = src.listkeys('bookmarks')
>>     dmarks = dst.listkeys('bookmarks')
>> 
>> -    diff = sorted(set(smarks) - set(dmarks))
>> -    for k in diff:
>> +    diff = sorted(set(smarks.items()) - set(dmarks.items()))
>> +    for k, v in diff:
>>         mark = ui.debugflag and smarks[k] or smarks[k][:12]
>>         ui.write("   %-25s %s\n" % (k, mark))
>> 
>> _______________________________________________
>> Mercurial-devel mailing list
>> Mercurial-devel at selenic.com
>> http://selenic.com/mailman/listinfo/mercurial-devel
> 
> ----------------------------------------------------------------------
> [FUJIWARA Katsunori]                             foozy at lares.dti.ne.jp
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://selenic.com/pipermail/mercurial-devel/attachments/20150211/f4180643/attachment.pgp>


More information about the Mercurial-devel mailing list