Mercurial > hg
changeset 10668:05856e682521
subrepo: print subrepo pulling URL
| author | Edouard Gomez <ed.gomez@free.fr> |
|---|---|
| date | Fri, 12 Mar 2010 01:23:35 +0100 |
| parents | 85e81d9bfb7a |
| children | 97022cef0a20 |
| files | mercurial/subrepo.py tests/test-subrepo tests/test-subrepo.out |
| diffstat | 3 files changed, 8 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/subrepo.py Sat Mar 13 12:57:20 2010 +0100 +++ b/mercurial/subrepo.py Fri Mar 12 01:23:35 2010 +0100 @@ -217,8 +217,8 @@ self._repo.lookup(revision) except error.RepoError: self._repo._subsource = source - self._repo.ui.status(_('pulling subrepo %s\n') % self._path) srcurl = _abssource(self._repo) + self._repo.ui.status(_('pulling subrepo %s from %s\n') % (self._path, srcurl)) other = hg.repository(self._repo.ui, srcurl) self._repo.pull(other)
--- a/tests/test-subrepo Sat Mar 13 12:57:20 2010 +0100 +++ b/tests/test-subrepo Fri Mar 12 01:23:35 2010 +0100 @@ -78,7 +78,7 @@ echo % clone cd .. -hg clone t tc +hg clone t tc | sed 's|from .*/sub|from .../sub|g' cd tc hg debugsub @@ -102,7 +102,8 @@ echo % pull cd ../tc hg pull | sed 's/ .*sub/ ...sub/g' -hg up # should pull t +# should pull t +hg up | sed 's|from .*/sub|from .../sub|g' cat t/t echo % bogus subrepo path aborts
--- a/tests/test-subrepo.out Sat Mar 13 12:57:20 2010 +0100 +++ b/tests/test-subrepo.out Fri Mar 12 01:23:35 2010 +0100 @@ -108,19 +108,19 @@ >>>>>>> other % clone updating to branch default -pulling subrepo s +pulling subrepo s from .../sub/t/s requesting all changes adding changesets adding manifests adding file changes added 4 changesets with 5 changes to 3 files -pulling subrepo ss +pulling subrepo ss from .../sub/t/s/ss requesting all changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -pulling subrepo t +pulling subrepo t from .../sub/t/t requesting all changes adding changesets adding manifests @@ -197,7 +197,7 @@ adding file changes added 1 changesets with 1 changes to 1 files (run 'hg update' to get a working copy) -pulling subrepo t +pulling subrepo t from .../sub/t/t searching for changes adding changesets adding manifests