Mercurial > public > mercurial-scm > hg
comparison mercurial/commands.py @ 24397:d0ea2028e8e6
bookmarks: add incoming() to replace diff() for incoming bookmarks
This replacement makes enhancement of "show incoming 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 | 72d7d390ef5d |
children | c0096a2bd3ff |
comparison
equal
deleted
inserted
replaced
24396:9e03602cd2d8 | 24397:d0ea2028e8e6 |
---|---|
4300 other = hg.peer(repo, opts, source) | 4300 other = hg.peer(repo, opts, source) |
4301 if 'bookmarks' not in other.listkeys('namespaces'): | 4301 if 'bookmarks' not in other.listkeys('namespaces'): |
4302 ui.warn(_("remote doesn't support bookmarks\n")) | 4302 ui.warn(_("remote doesn't support bookmarks\n")) |
4303 return 0 | 4303 return 0 |
4304 ui.status(_('comparing with %s\n') % util.hidepassword(source)) | 4304 ui.status(_('comparing with %s\n') % util.hidepassword(source)) |
4305 return bookmarks.diff(ui, repo, other) | 4305 return bookmarks.incoming(ui, repo, other) |
4306 | 4306 |
4307 repo._subtoppath = ui.expandpath(source) | 4307 repo._subtoppath = ui.expandpath(source) |
4308 try: | 4308 try: |
4309 return hg.incoming(ui, repo, source, opts) | 4309 return hg.incoming(ui, repo, source, opts) |
4310 finally: | 4310 finally: |