Mercurial > hg-stable
changeset 24657:3d7c512b258d
bookmarks: show incoming bookmarks more exactly
Before this patch, "hg incoming -B" shows only bookmarks added
remotely. Then, users can't know about bookmarks below before "hg
pull" execution.
- advanced remotely
- diverged
- changed (remote revision is unknown for local)
This patch shows such bookmarks, too.
| author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
|---|---|
| date | Wed, 08 Apr 2015 02:56:19 +0900 |
| parents | 29c238e4a58a |
| children | 8ea893ab0572 |
| files | mercurial/bookmarks.py tests/test-bookmarks-pushpull.t |
| diffstat | 2 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/bookmarks.py Tue Apr 07 15:16:19 2015 -0700 +++ b/mercurial/bookmarks.py Wed Apr 08 02:56:19 2015 +0900 @@ -460,6 +460,12 @@ incomings.append(" %-25s %s\n" % (b, getid(id))) for b, scid, dcid in addsrc: add(b, scid) + for b, scid, dcid in advsrc: + add(b, scid) + for b, scid, dcid in diverge: + add(b, scid) + for b, scid, dcid in differ: + add(b, scid) if not incomings: ui.status(_("no changed bookmarks found\n"))
--- a/tests/test-bookmarks-pushpull.t Tue Apr 07 15:16:19 2015 -0700 +++ b/tests/test-bookmarks-pushpull.t Wed Apr 08 02:56:19 2015 +0900 @@ -414,6 +414,8 @@ $ hg in -B http://localhost:$HGPORT/ comparing with http://localhost:$HGPORT/ searching for changed bookmarks + @ 9b140be10808 + X 9b140be10808 Z 0d2164f0ce0d foo 000000000000 foobar 9b140be10808