Comments
Patch
@@ -410,6 +410,28 @@
if failed:
return 1
+def incoming(ui, repo, other):
+ ui.status(_("searching for changed bookmarks\n"))
+ (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
+ ) = compare(repo, other.listkeys('bookmarks'), repo._bookmarks,
+ dsthex=hex)
+
+ incomings = []
+ def add(b, id):
+ incomings.append(" %-25s %s\n" %
+ (b, ui.debugflag and id or id[:12]))
+ for b, scid, dcid in addsrc:
+ add(b, scid)
+
+ if not incomings:
+ ui.status(_("no changed bookmarks found\n"))
+ return 1
+
+ for s in sorted(incomings):
+ ui.write(s)
+
+ return 0
+
def diff(ui, dst, src):
ui.status(_("searching for changed bookmarks\n"))
@@ -3868,7 +3868,7 @@
ui.warn(_("remote doesn't support bookmarks\n"))
return 0
ui.status(_('comparing with %s\n') % util.hidepassword(source))
- return bookmarks.diff(ui, repo, other)
+ return bookmarks.incoming(ui, repo, other)
repo._subtoppath = ui.expandpath(source)
try: