Mercurial > hg-stable

changeset 11443:9e1bc1aafdb1 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: fix bogus cut and paste for outgoing
author Matt Mackall <mpm@selenic.com>
date Sat, 26 Jun 2010 12:24:55 -0500
parents ee1ed6afac21
children b9a46acdfe1f
files hgext/bookmarks.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/bookmarks.py	Fri Jun 25 13:47:28 2010 -0500
+++ b/hgext/bookmarks.py	Sat Jun 26 12:24:55 2010 -0500
@@ -473,14 +473,15 @@
     else:
         oldincoming(ui, repo, source, **opts)
 
-def outgoing(oldoutgoing, ui, repo, source="default", **opts):
+def outgoing(oldoutgoing, ui, repo, dest=None, **opts):
     if opts.get('bookmarks'):
-        source, branches = hg.parseurl(ui.expandpath(source), opts.get('branch'))
-        other = hg.repository(hg.remoteui(repo, opts), source)
-        ui.status(_('comparing with %s\n') % url.hidepassword(source))
+        dest = ui.expandpath(dest or 'default-push', dest or 'default')
+        dest, branches = hg.parseurl(dest, opts.get('branch'))
+        other = hg.repository(hg.remoteui(repo, opts), dest)
+        ui.status(_('comparing with %s\n') % url.hidepassword(dest))
         diffbookmarks(ui, other, repo)
     else:
-        oldoutgoing(ui, repo, source, **opts)
+        oldoutgoing(ui, repo, dest, **opts)
 
 def uisetup(ui):
     extensions.wrapfunction(repair, "strip", strip)