comparison mercurial/hg.py @ 13694:4f5ed2bd1724

merge with stable
author Matt Mackall <mpm@selenic.com>
date Thu, 17 Mar 2011 17:08:13 -0500
parents 3f6a4579f803 adf3c4401c5d
children 7abab875e647
comparison
equal deleted inserted replaced
13691:ad02eba55459 13694:4f5ed2bd1724
485 return _incoming(display, subreporecurse, ui, repo, source, opts) 485 return _incoming(display, subreporecurse, ui, repo, source, opts)
486 486
487 def _outgoing(ui, repo, dest, opts): 487 def _outgoing(ui, repo, dest, opts):
488 dest = ui.expandpath(dest or 'default-push', dest or 'default') 488 dest = ui.expandpath(dest or 'default-push', dest or 'default')
489 dest, branches = parseurl(dest, opts.get('branch')) 489 dest, branches = parseurl(dest, opts.get('branch'))
490 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
490 revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) 491 revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
491 if revs: 492 if revs:
492 revs = [repo.lookup(rev) for rev in revs] 493 revs = [repo.lookup(rev) for rev in revs]
493 494
494 other = repository(remoteui(repo, opts), dest) 495 other = repository(remoteui(repo, opts), dest)
495 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
496 o = discovery.findoutgoing(repo, other, force=opts.get('force')) 496 o = discovery.findoutgoing(repo, other, force=opts.get('force'))
497 if not o: 497 if not o:
498 ui.status(_("no changes found\n")) 498 ui.status(_("no changes found\n"))
499 return None 499 return None
500 500