##// END OF EJS Templates
subrepo: show the source that git clones
Eric Eisner -
r13525:c1208825 default
parent child Browse files
Show More
@@ -759,8 +759,10 b' class gitsubrepo(abstractsubrepo):'
759
759
760 def _fetch(self, source, revision):
760 def _fetch(self, source, revision):
761 if not os.path.exists(os.path.join(self._abspath, '.git')):
761 if not os.path.exists(os.path.join(self._abspath, '.git')):
762 self._ui.status(_('cloning subrepo %s\n') % self._relpath)
762 source = self._abssource(source)
763 self._gitnodir(['clone', self._abssource(source), self._abspath])
763 self._ui.status(_('cloning subrepo %s from %s\n') %
764 (self._relpath, source))
765 self._gitnodir(['clone', source, self._abspath])
764 if self._githavelocally(revision):
766 if self._githavelocally(revision):
765 return
767 return
766 self._ui.status(_('pulling subrepo %s\n') % self._relpath)
768 self._ui.status(_('pulling subrepo %s\n') % self._relpath)
@@ -73,7 +73,7 b' clone root'
73 $ cd t
73 $ cd t
74 $ hg clone . ../tc
74 $ hg clone . ../tc
75 updating to branch default
75 updating to branch default
76 cloning subrepo s
76 cloning subrepo s from $TESTTMP/gitroot
77 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
77 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
78 $ cd ../tc
78 $ cd ../tc
79 $ hg debugsub
79 $ hg debugsub
@@ -96,7 +96,7 b' clone root, make local change'
96 $ cd ../t
96 $ cd ../t
97 $ hg clone . ../ta
97 $ hg clone . ../ta
98 updating to branch default
98 updating to branch default
99 cloning subrepo s
99 cloning subrepo s from $TESTTMP/gitroot
100 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
100 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
101
101
102 $ cd ../ta
102 $ cd ../ta
@@ -115,7 +115,7 b' clone root separately, make different lo'
115 $ cd ../t
115 $ cd ../t
116 $ hg clone . ../tb
116 $ hg clone . ../tb
117 updating to branch default
117 updating to branch default
118 cloning subrepo s
118 cloning subrepo s from $TESTTMP/gitroot
119 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
119 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
120
120
121 $ cd ../tb/s
121 $ cd ../tb/s
@@ -199,7 +199,7 b' make and push changes to hg without upda'
199 $ cd ../t
199 $ cd ../t
200 $ hg clone . ../td
200 $ hg clone . ../td
201 updating to branch default
201 updating to branch default
202 cloning subrepo s
202 cloning subrepo s from $TESTTMP/gitroot
203 checking out detached HEAD in subrepo s
203 checking out detached HEAD in subrepo s
204 check out a git branch if you intend to make changes
204 check out a git branch if you intend to make changes
205 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
205 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -282,7 +282,7 b' create nested repo'
282
282
283 $ hg clone ../t inner
283 $ hg clone ../t inner
284 updating to branch default
284 updating to branch default
285 cloning subrepo s
285 cloning subrepo s from $TESTTMP/gitroot
286 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
286 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
287 $ echo inner = inner > .hgsub
287 $ echo inner = inner > .hgsub
288 $ hg add .hgsub
288 $ hg add .hgsub
@@ -311,7 +311,7 b' relative source expansion'
311 $ mkdir d
311 $ mkdir d
312 $ hg clone t d/t
312 $ hg clone t d/t
313 updating to branch default
313 updating to branch default
314 cloning subrepo s
314 cloning subrepo s from $TESTTMP/gitroot
315 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
315 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
316
316
317 Check hg update --clean
317 Check hg update --clean
General Comments 0
You need to be logged in to leave comments. Login now