mercurial/commands.py
changeset 24397 d0ea2028e8e6
parent 24390 72d7d390ef5d
child 24398 c0096a2bd3ff
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: