##// END OF EJS Templates
bookmarks: fix bogus cut and paste for outgoing
Matt Mackall -
r11443:9e1bc1aa stable
parent child Browse files
Show More
@@ -473,14 +473,15 b' def incoming(oldincoming, ui, repo, sour'
473 else:
473 else:
474 oldincoming(ui, repo, source, **opts)
474 oldincoming(ui, repo, source, **opts)
475
475
476 def outgoing(oldoutgoing, ui, repo, source="default", **opts):
476 def outgoing(oldoutgoing, ui, repo, dest=None, **opts):
477 if opts.get('bookmarks'):
477 if opts.get('bookmarks'):
478 source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
478 dest = ui.expandpath(dest or 'default-push', dest or 'default')
479 other = hg.repository(hg.remoteui(repo, opts), source)
479 dest, branches = hg.parseurl(dest, opts.get('branch'))
480 ui.status(_('comparing with %s\n') % url.hidepassword(source))
480 other = hg.repository(hg.remoteui(repo, opts), dest)
481 ui.status(_('comparing with %s\n') % url.hidepassword(dest))
481 diffbookmarks(ui, other, repo)
482 diffbookmarks(ui, other, repo)
482 else:
483 else:
483 oldoutgoing(ui, repo, source, **opts)
484 oldoutgoing(ui, repo, dest, **opts)
484
485
485 def uisetup(ui):
486 def uisetup(ui):
486 extensions.wrapfunction(repair, "strip", strip)
487 extensions.wrapfunction(repair, "strip", strip)
General Comments 0
You need to be logged in to leave comments. Login now