Mercurial > public > mercurial-scm > hg-stable
diff mercurial/bookmarks.py @ 24660:bf13b44bbb0a
bookmarks: show detailed status 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 detailed status about incoming bookmarks at "hg
incoming -B".
To avoid breaking backward compatibility with other tool chains, this
patch shows status, only if --verbose is specified,
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 08 Apr 2015 02:56:19 +0900 |
| parents | 8ea893ab0572 |
| children | 8cf70c97a6e1 |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Wed Apr 08 02:56:19 2015 +0900 +++ b/mercurial/bookmarks.py Wed Apr 08 02:56:19 2015 +0900 @@ -456,16 +456,20 @@ getid = lambda id: id else: getid = lambda id: id[:12] - def add(b, id): - incomings.append(" %-25s %s\n" % (b, getid(id))) + if ui.verbose: + def add(b, id, st): + incomings.append(" %-25s %s %s\n" % (b, getid(id), st)) + else: + def add(b, id, st): + incomings.append(" %-25s %s\n" % (b, getid(id))) for b, scid, dcid in addsrc: - add(b, scid) + add(b, scid, _('added')) for b, scid, dcid in advsrc: - add(b, scid) + add(b, scid, _('advanced')) for b, scid, dcid in diverge: - add(b, scid) + add(b, scid, _('diverged')) for b, scid, dcid in differ: - add(b, scid) + add(b, scid, _('changed')) if not incomings: ui.status(_("no changed bookmarks found\n"))