--- a/mercurial/commands.py Thu Mar 17 22:17:27 2011 +0100
+++ b/mercurial/commands.py Thu Mar 17 17:08:13 2011 -0500
@@ -3039,9 +3039,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 22:17:27 2011 +0100
+++ b/mercurial/hg.py Thu Mar 17 17:08:13 2011 -0500
@@ -487,12 +487,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/mercurial/subrepo.py Thu Mar 17 22:17:27 2011 +0100
+++ b/mercurial/subrepo.py Thu Mar 17 17:08:13 2011 -0500
@@ -764,6 +764,11 @@
return tracking
def _abssource(self, source):
+ if '://' not in source:
+ # recognize the scp syntax as an absolute source
+ colon = source.find(':')
+ if colon != -1 and '/' not in source[:colon]:
+ return source
self._subsource = source
return _abssource(self)
--- a/tests/test-ssh.t Thu Mar 17 22:17:27 2011 +0100
+++ b/tests/test-ssh.t Thu Mar 17 17:08:13 2011 -0500
@@ -282,6 +282,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]