Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/commands.py @ 24398:c0096a2bd3ff
bookmarks: add outgoing() to replace diff() for outgoing bookmarks
This replacement makes enhancement of "show outgoing bookmarks" easy,
because "compare()" can detect more detailed difference of bookmarks
between two repositories.
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Thu, 19 Mar 2015 23:36:05 +0900 |
parents | d0ea2028e8e6 |
children | 03c84c966ef5 |
comparison
equal
deleted
inserted
replaced
24397:d0ea2028e8e6 | 24398:c0096a2bd3ff |
---|---|
4755 other = hg.peer(repo, opts, dest) | 4755 other = hg.peer(repo, opts, dest) |
4756 if 'bookmarks' not in other.listkeys('namespaces'): | 4756 if 'bookmarks' not in other.listkeys('namespaces'): |
4757 ui.warn(_("remote doesn't support bookmarks\n")) | 4757 ui.warn(_("remote doesn't support bookmarks\n")) |
4758 return 0 | 4758 return 0 |
4759 ui.status(_('comparing with %s\n') % util.hidepassword(dest)) | 4759 ui.status(_('comparing with %s\n') % util.hidepassword(dest)) |
4760 return bookmarks.diff(ui, other, repo) | 4760 return bookmarks.outgoing(ui, repo, other) |
4761 | 4761 |
4762 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') | 4762 repo._subtoppath = ui.expandpath(dest or 'default-push', dest or 'default') |
4763 try: | 4763 try: |
4764 return hg.outgoing(ui, repo, dest, opts) | 4764 return hg.outgoing(ui, repo, dest, opts) |
4765 finally: | 4765 finally: |