Mercurial > hg-stable
changeset 13694:4f5ed2bd1724
merge with stable
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Thu, 17 Mar 2011 17:08:13 -0500 |
| parents | ad02eba55459 (current diff) adf3c4401c5d (diff) |
| children | 136854393eed |
| files | mercurial/commands.py mercurial/hg.py mercurial/subrepo.py tests/test-ssh.t |
| diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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)