Show More
@@ -3039,9 +3039,9 b' def push(ui, repo, dest=None, **opts):' | |||||
3039 |
|
3039 | |||
3040 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
3040 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
3041 | dest, branches = hg.parseurl(dest, opts.get('branch')) |
|
3041 | dest, branches = hg.parseurl(dest, opts.get('branch')) | |
|
3042 | ui.status(_('pushing to %s\n') % url.hidepassword(dest)) | |||
3042 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
3043 | revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev')) | |
3043 | other = hg.repository(hg.remoteui(repo, opts), dest) |
|
3044 | other = hg.repository(hg.remoteui(repo, opts), dest) | |
3044 | ui.status(_('pushing to %s\n') % url.hidepassword(dest)) |
|
|||
3045 | if revs: |
|
3045 | if revs: | |
3046 | revs = [repo.lookup(rev) for rev in revs] |
|
3046 | revs = [repo.lookup(rev) for rev in revs] | |
3047 |
|
3047 |
@@ -487,12 +487,12 b' def incoming(ui, repo, source, opts):' | |||||
487 | def _outgoing(ui, repo, dest, opts): |
|
487 | def _outgoing(ui, repo, dest, opts): | |
488 | dest = ui.expandpath(dest or 'default-push', dest or 'default') |
|
488 | dest = ui.expandpath(dest or 'default-push', dest or 'default') | |
489 | dest, branches = parseurl(dest, opts.get('branch')) |
|
489 | dest, branches = parseurl(dest, opts.get('branch')) | |
|
490 | ui.status(_('comparing with %s\n') % url.hidepassword(dest)) | |||
490 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) |
|
491 | revs, checkout = addbranchrevs(repo, repo, branches, opts.get('rev')) | |
491 | if revs: |
|
492 | if revs: | |
492 | revs = [repo.lookup(rev) for rev in revs] |
|
493 | revs = [repo.lookup(rev) for rev in revs] | |
493 |
|
494 | |||
494 | other = repository(remoteui(repo, opts), dest) |
|
495 | other = repository(remoteui(repo, opts), dest) | |
495 | ui.status(_('comparing with %s\n') % url.hidepassword(dest)) |
|
|||
496 | o = discovery.findoutgoing(repo, other, force=opts.get('force')) |
|
496 | o = discovery.findoutgoing(repo, other, force=opts.get('force')) | |
497 | if not o: |
|
497 | if not o: | |
498 | ui.status(_("no changes found\n")) |
|
498 | ui.status(_("no changes found\n")) |
@@ -764,6 +764,11 b' class gitsubrepo(abstractsubrepo):' | |||||
764 | return tracking |
|
764 | return tracking | |
765 |
|
765 | |||
766 | def _abssource(self, source): |
|
766 | def _abssource(self, source): | |
|
767 | if '://' not in source: | |||
|
768 | # recognize the scp syntax as an absolute source | |||
|
769 | colon = source.find(':') | |||
|
770 | if colon != -1 and '/' not in source[:colon]: | |||
|
771 | return source | |||
767 | self._subsource = source |
|
772 | self._subsource = source | |
768 | return _abssource(self) |
|
773 | return _abssource(self) | |
769 |
|
774 |
@@ -282,6 +282,7 b' clone bookmarks' | |||||
282 | passwords in ssh urls are not supported |
|
282 | passwords in ssh urls are not supported | |
283 |
|
283 | |||
284 | $ hg push ssh://user:erroneouspwd@dummy/remote |
|
284 | $ hg push ssh://user:erroneouspwd@dummy/remote | |
|
285 | pushing to ssh://user:***@dummy/remote | |||
285 | abort: password in URL not supported! |
|
286 | abort: password in URL not supported! | |
286 | [255] |
|
287 | [255] | |
287 |
|
288 |
General Comments 0
You need to be logged in to leave comments.
Login now