facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 07:17:55 +03:00
Code Issues Projects Releases Wiki Activity

subrepo: show the source that git clones

Browse Source
This commit is contained in:
Eric Eisner 2011-03-02 12:19:18 -05:00
parent e8a21642ee
commit bcb09d6c72
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mercurial/subrepo.py
View File

@ -759,8 +759,10 @@ class gitsubrepo(abstractsubrepo):
def _fetch(self, source, revision):
if not os.path.exists(os.path.join(self._abspath, '.git')):
self._ui.status(_('cloning subrepo %s\n') % self._relpath)
self._gitnodir(['clone', self._abssource(source), self._abspath])
source = self._abssource(source)
self._ui.status(_('cloning subrepo %s from %s\n') %
(self._relpath, source))
self._gitnodir(['clone', source, self._abspath])
if self._githavelocally(revision):
return
self._ui.status(_('pulling subrepo %s\n') % self._relpath)

12
tests/test-subrepo-git.t
View File

@ -73,7 +73,7 @@ clone root
$ cd t
$ hg clone . ../tc
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../tc
$ hg debugsub
@ -96,7 +96,7 @@ clone root, make local change
$ cd ../t
$ hg clone . ../ta
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../ta
@ -115,7 +115,7 @@ clone root separately, make different local change
$ cd ../t
$ hg clone . ../tb
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd ../tb/s
@ -199,7 +199,7 @@ make and push changes to hg without updating the subrepo
$ cd ../t
$ hg clone . ../td
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
checking out detached HEAD in subrepo s
check out a git branch if you intend to make changes
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@ -282,7 +282,7 @@ create nested repo
$ hg clone ../t inner
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ echo inner = inner > .hgsub
$ hg add .hgsub
@ -311,7 +311,7 @@ relative source expansion
$ mkdir d
$ hg clone t d/t
updating to branch default
cloning subrepo s
cloning subrepo s from $TESTTMP/gitroot
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Check hg update --clean