push/outgoing: print remote target path even if there's an error (issue2561) stable
authorMiloš Hadžić <milos.hadzic@gmail.com>
Thu, 17 Mar 2011 22:55:02 +0100
branchstable
changeset 13693 adf3c4401c5d
parent 13692 a7c9735307bd
child 13694 4f5ed2bd1724
child 13695 a083c6e62acb
push/outgoing: print remote target path even if there's an error (issue2561) This is a simple patch to make hg push/hg outgoing print their remote target path even if the operation fails. I'm not sure if the original behavior was by design. This patch also changes one test to reflect the changed behaviour.
mercurial/commands.py
mercurial/hg.py
tests/test-ssh.t
--- a/mercurial/commands.py	Thu Mar 17 16:29:09 2011 -0400
+++ b/mercurial/commands.py	Thu Mar 17 22:55:02 2011 +0100
@@ -2999,9 +2999,9 @@
 
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = hg.parseurl(dest, opts.get('branch'))
+    ui.status(_('pushing to %s\n') % url.hidepassword(dest))
     revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
     other = hg.repository(hg.remoteui(repo, opts), dest)
-    ui.status(_('pushing to %s\n') % url.hidepassword(dest))
     if revs:
         revs = [repo.lookup(rev) for rev in revs]
 
--- a/mercurial/hg.py	Thu Mar 17 16:29:09 2011 -0400
+++ b/mercurial/hg.py	Thu Mar 17 22:55:02 2011 +0100
@@ -472,12 +472,12 @@
 def _outgoing(ui, repo, dest, opts):
     dest = ui.expandpath(dest or 'default-push', dest or 'default')
     dest, branches = parseurl(dest, opts.get('branch'))
+    ui.status(_('comparing with %s\n') % url.hidepassword(dest))
     revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev'))
     if revs:
         revs = [repo.lookup(rev) for rev in revs]
 
     other = repository(remoteui(repo, opts), dest)
-    ui.status(_('comparing with %s\n') % url.hidepassword(dest))
     o = discovery.findoutgoing(repo, other, force=opts.get('force'))
     if not o:
         ui.status(_("no changes found\n"))
--- a/tests/test-ssh.t	Thu Mar 17 16:29:09 2011 -0400
+++ b/tests/test-ssh.t	Thu Mar 17 22:55:02 2011 +0100
@@ -266,6 +266,7 @@
 passwords in ssh urls are not supported
 
   $ hg push ssh://user:erroneouspwd@dummy/remote
+  pushing to ssh://user:***@dummy/remote
   abort: password in URL not supported!
   [255]