mercurial/hg.py
changeset 14556 517e1d88bf7e
parent 14555 1ceb2cf9f9d9
child 14568 5f002e3336ba
equal deleted inserted replaced
14555:1ceb2cf9f9d9 14556:517e1d88bf7e
   426     displaychlist gets called with
   426     displaychlist gets called with
   427         (remoterepo, incomingchangesetlist, displayer) parameters,
   427         (remoterepo, incomingchangesetlist, displayer) parameters,
   428     and is supposed to contain only code that can't be unified.
   428     and is supposed to contain only code that can't be unified.
   429     """
   429     """
   430     source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
   430     source, branches = parseurl(ui.expandpath(source), opts.get('branch'))
   431     other = repository(remoteui(repo, opts), source)
   431     other = peer(repo, opts, source)
   432     ui.status(_('comparing with %s\n') % util.hidepassword(source))
   432     ui.status(_('comparing with %s\n') % util.hidepassword(source))
   433     revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
   433     revs, checkout = addbranchrevs(repo, other, branches, opts.get('rev'))
   434 
   434 
   435     if revs:
   435     if revs:
   436         revs = [other.lookup(rev) for rev in revs]
   436         revs = [other.lookup(rev) for rev in revs]
   484     ui.status(_('comparing with %s\n') % util.hidepassword(dest))
   484     ui.status(_('comparing with %s\n') % util.hidepassword(dest))
   485     revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
   485     revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
   486     if revs:
   486     if revs:
   487         revs = [repo.lookup(rev) for rev in revs]
   487         revs = [repo.lookup(rev) for rev in revs]
   488 
   488 
   489     other = repository(remoteui(repo, opts), dest)
   489     other = peer(repo, opts, dest)
   490     common, outheads = discovery.findcommonoutgoing(repo, other, revs,
   490     common, outheads = discovery.findcommonoutgoing(repo, other, revs,
   491                                                     force=opts.get('force'))
   491                                                     force=opts.get('force'))
   492     o = repo.changelog.findmissing(common, outheads)
   492     o = repo.changelog.findmissing(common, outheads)
   493     if not o:
   493     if not o:
   494         ui.status(_("no changes found\n"))
   494         ui.status(_("no changes found\n"))