Comments
Patch
@@ -438,6 +438,27 @@
return 1
return 0
+def outgoing(ui, repo, other):
+ ui.status(_("searching for changed bookmarks\n"))
+
+ def write(b, id):
+ ui.write(" %-25s %s\n" %
+ (b, ui.debugflag and id or id[:12]))
+ return True
+ def addsrc(b, scid, dcid):
+ return write(b, scid)
+
+ if not _execactions(compare(repo,
+ repo._bookmarks, other.listkeys('bookmarks'),
+ srchex=hex),
+ {'addsrc': addsrc,
+ },
+ ignore=set(['adddst', 'advsrc', 'advdst',
+ 'diverge', 'differ'])):
+ ui.status(_("no changed bookmarks found\n"))
+ return 1
+ return 0
+
def diff(ui, dst, src):
ui.status(_("searching for changed bookmarks\n"))
@@ -4337,7 +4337,7 @@
ui.warn(_("remote doesn't support bookmarks\n"))
return 0
ui.status(_('comparing with %s\n') % util.hidepassword(dest))
- return bookmarks.diff(ui, other, repo)
+ return bookmarks.outgoing(ui, repo, other)
repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default')
try: