[PATCH 4 of 5 V6-3] bookmarks: show more detail about incoming bookmarks

Matt Mackall mpm at selenic.com
Fri Apr 3 21:55:42 UTC 2015


On Sat, 2015-04-04 at 02:21 +0900, FUJIWARA Katsunori wrote:
> # HG changeset patch
> # User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
> # Date 1428081282 -32400
> #      Sat Apr 04 02:14:42 2015 +0900
> # Node ID 52464858f510461d6714d50d68bcc961c8097ebc
> # Parent  1bbe353452c4e9df453e2bd37b5a5ccc7a2f218b
> bookmarks: show more detail about incoming bookmarks
> 
> Before this patch, "hg incoming -B" shows only difference of bookmarks
> between two repositories, and it isn't user friendly.
> 
> This patch shows more detail about incoming bookmarks for "hg incoming
> -B" with --verbose as below:
> 
>     BM1                       01234567890a (-) advanced remotely
>     BM2                       1234567890ab (B) advanced locally

If I understand this correctly, this bookmark shouldn't be considered
incoming at all?

>     BM3                       234567890abc (@) diverged
>     BM4                       34567890abcd (?) changed

Stylistically, I'm not excited about the new action column. I think the
table should instead look like:

    BM1                       01234567890a advanced
    BM3                       234567890abc diverged
    BM4                       34567890abcd changed

and we can define those terms in the help. Also.. we seem to have lost
what was originally the only information available here: which bookmarks
are not present at all locally?

-- 
Mathematics is the supreme nostalgia of our time.





More information about the Mercurial-devel mailing list