@@ -449,11 +449,21 @@
srchex=hex)
outgoings = []
- def add(b, id):
- outgoings.append(" %-25s %s\n" %
- (b, ui.debugflag and id or id[:12]))
+ def add(b, id, act, msg):
+ outgoings.append(" %-25s %s (%s) %s\n" %
+ (b, ui.debugflag and id or id[:12], act, msg))
for b, scid, dcid in addsrc:
- add(b, scid)
+ add(b, scid, 'B', _('added locally'))
+ for b, scid, dcid in adddst:
+ add(b, ' ' * 40, 'B', _('deleted locally, perhaps'))
+ for b, scid, dcid in advsrc:
+ add(b, scid, '-', _('advanced locally'))
+ for b, scid, dcid in advdst:
+ add(b, scid, 'B', _('advanced remotely'))
+ for b, scid, dcid in diverge:
+ add(b, scid, 'B', _('diverged'))
+ for b, scid, dcid in differ:
+ add(b, scid, 'B', _('changed'))
if not outgoings:
ui.status(_("no changed bookmarks found\n"))
@@ -4335,6 +4335,23 @@
See pull for details of valid destination formats.
+ .. container:: verbose
+
+ With -B/--bookmarks, the result of bookmark comparison between
+ local and remote repositories is displayed as follows::
+
+ BM1 01234567890a (-) advanced locally
+ BM2 1234567890ab (B) diverged
+
+ Each lines consist of four columns: "bookmark name", "local
+ value", "action at pushing" and "detail of difference".
+
+ "action at pushing" column shows about bookmark updating in the
+ remote repository by marks below:
+
+ :``-``: updated implicitly
+ :``B``: not updated implicitly (use -B to update forcibly)
+
Returns 0 if there are outgoing changes, 1 otherwise.
"""
if opts.get('graph'):
@@ -350,8 +350,11 @@
$ hg out -B http://localhost:$HGPORT/
comparing with http://localhost:$HGPORT/
searching for changed bookmarks
- no changed bookmarks found
- [1]
+ @ 0d2164f0ce0d (B) diverged
+ X 0d2164f0ce0d (B) diverged
+ Z 0d2164f0ce0d (B) diverged
+ foo (B) deleted locally, perhaps
+ foobar (B) deleted locally, perhaps
$ hg push -B Z http://localhost:$HGPORT/
pushing to http://localhost:$HGPORT/
searching for changes
@@ -171,7 +171,7 @@
$ hg out -B
comparing with ssh://user@dummy/remote
searching for changed bookmarks
- foo 1160648e36ce
+ foo 1160648e36ce (B) added locally
$ hg push -B foo
pushing to ssh://user@dummy/remote
searching for changes