Show More
@@ -655,7 +655,7 b' class hgsubrepo(abstractsubrepo):' | |||||
655 | shareopts = {} |
|
655 | shareopts = {} | |
656 |
|
656 | |||
657 | self.ui.status(_('cloning subrepo %s from %s\n') |
|
657 | self.ui.status(_('cloning subrepo %s from %s\n') | |
658 | % (subrelpath(self), srcurl)) |
|
658 | % (subrelpath(self), util.hidepassword(srcurl))) | |
659 | other, cloned = hg.clone(self._repo._subparent.baseui, {}, |
|
659 | other, cloned = hg.clone(self._repo._subparent.baseui, {}, | |
660 | other, self._repo.root, |
|
660 | other, self._repo.root, | |
661 | update=False, shareopts=shareopts) |
|
661 | update=False, shareopts=shareopts) | |
@@ -664,7 +664,7 b' class hgsubrepo(abstractsubrepo):' | |||||
664 | self._cachestorehash(srcurl) |
|
664 | self._cachestorehash(srcurl) | |
665 | else: |
|
665 | else: | |
666 | self.ui.status(_('pulling subrepo %s from %s\n') |
|
666 | self.ui.status(_('pulling subrepo %s from %s\n') | |
667 | % (subrelpath(self), srcurl)) |
|
667 | % (subrelpath(self), util.hidepassword(srcurl))) | |
668 | cleansub = self.storeclean(srcurl) |
|
668 | cleansub = self.storeclean(srcurl) | |
669 | exchange.pull(self._repo, other) |
|
669 | exchange.pull(self._repo, other) | |
670 | if cleansub: |
|
670 | if cleansub: | |
@@ -735,10 +735,10 b' class hgsubrepo(abstractsubrepo):' | |||||
735 | if self.storeclean(dsturl): |
|
735 | if self.storeclean(dsturl): | |
736 | self.ui.status( |
|
736 | self.ui.status( | |
737 | _('no changes made to subrepo %s since last push to %s\n') |
|
737 | _('no changes made to subrepo %s since last push to %s\n') | |
738 | % (subrelpath(self), dsturl)) |
|
738 | % (subrelpath(self), util.hidepassword(dsturl))) | |
739 | return None |
|
739 | return None | |
740 | self.ui.status(_('pushing subrepo %s to %s\n') % |
|
740 | self.ui.status(_('pushing subrepo %s to %s\n') % | |
741 | (subrelpath(self), dsturl)) |
|
741 | (subrelpath(self), util.hidepassword(dsturl))) | |
742 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) |
|
742 | other = hg.peer(self._repo, {'ssh': ssh}, dsturl) | |
743 | res = exchange.push(self._repo, other, force, newbranch=newbranch) |
|
743 | res = exchange.push(self._repo, other, force, newbranch=newbranch) | |
744 |
|
744 |
@@ -39,7 +39,7 b' Serving them both using hgweb' | |||||
39 |
|
39 | |||
40 | Clone main from hgweb |
|
40 | Clone main from hgweb | |
41 |
|
41 | |||
42 | $ hg clone "http://localhost:$HGPORT/main" cloned |
|
42 | $ hg clone "http://user:pass@localhost:$HGPORT/main" cloned | |
43 | requesting all changes |
|
43 | requesting all changes | |
44 | adding changesets |
|
44 | adding changesets | |
45 | adding manifests |
|
45 | adding manifests | |
@@ -47,7 +47,7 b' Clone main from hgweb' | |||||
47 | added 1 changesets with 3 changes to 3 files |
|
47 | added 1 changesets with 3 changes to 3 files | |
48 | new changesets fdfeeb3e979e |
|
48 | new changesets fdfeeb3e979e | |
49 | updating to branch default |
|
49 | updating to branch default | |
50 | cloning subrepo sub from http://localhost:$HGPORT/sub |
|
50 | cloning subrepo sub from http://user@localhost:$HGPORT/sub | |
51 | requesting all changes |
|
51 | requesting all changes | |
52 | adding changesets |
|
52 | adding changesets | |
53 | adding manifests |
|
53 | adding manifests | |
@@ -60,21 +60,28 b' Ensure that subrepos pay attention to de' | |||||
60 |
|
60 | |||
61 | $ cat > cloned/.hg/hgrc << EOF |
|
61 | $ cat > cloned/.hg/hgrc << EOF | |
62 | > [paths] |
|
62 | > [paths] | |
63 | > default:pushurl = http://localhost:$HGPORT/main |
|
63 | > default:pushurl = http://user:pass@localhost:$HGPORT/main | |
64 | > EOF |
|
64 | > EOF | |
65 |
|
65 | |||
66 | $ hg -R cloned out -S --config paths.default=bogus://invalid |
|
66 | $ hg -R cloned out -S --config paths.default=bogus://invalid | |
67 | comparing with http://localhost:$HGPORT/main |
|
67 | comparing with http://user:***@localhost:$HGPORT/main | |
68 | searching for changes |
|
68 | searching for changes | |
69 | no changes found |
|
69 | no changes found | |
70 | comparing with http://localhost:$HGPORT/sub |
|
70 | comparing with http://user:***@localhost:$HGPORT/sub | |
71 | searching for changes |
|
71 | searching for changes | |
72 | no changes found |
|
72 | no changes found | |
73 | [1] |
|
73 | [1] | |
74 |
|
74 | |||
|
75 | TODO: Figure out why, if the password is left out of the default:pushurl URL, | |||
|
76 | this says "no changes made to subrepo sub since last push". It looks like from | |||
|
77 | the original clone command above, the password is getting stripped off, not | |||
|
78 | just masked out, and that would make the hashed URL different. | |||
|
79 | ||||
75 | $ hg -R cloned push --config paths.default=bogus://invalid |
|
80 | $ hg -R cloned push --config paths.default=bogus://invalid | |
76 | pushing to http://localhost:$HGPORT/main |
|
81 | pushing to http://user:***@localhost:$HGPORT/main | |
77 |
|
|
82 | pushing subrepo sub to http://user:***@localhost:$HGPORT/sub | |
|
83 | searching for changes | |||
|
84 | no changes found | |||
78 | searching for changes |
|
85 | searching for changes | |
79 | no changes found |
|
86 | no changes found | |
80 | abort: HTTP Error 403: ssl required |
|
87 | abort: HTTP Error 403: ssl required |
General Comments 0
You need to be logged in to leave comments.
Login now