changeset 11111:d2da9e6dd13e

subrepo: print pushing url
author Edouard Gomez <ed.gomez@free.fr>
date Sat, 01 May 2010 23:05:22 +0200
parents 22f5ad0b5857
children 4a9bee613737
files mercurial/subrepo.py tests/test-subrepo.out
diffstat 2 files changed, 10 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Sat May 01 23:05:21 2010 +0200
+++ b/mercurial/subrepo.py	Sat May 01 23:05:22 2010 +0200
@@ -266,8 +266,9 @@
             if not c.sub(s).push(force):
                 return False
 
-        self._repo.ui.status(_('pushing subrepo %s\n') % self._path)
         dsturl = _abssource(self._repo, True)
+        self._repo.ui.status(_('pushing subrepo %s to %s\n') %
+            (self._path, dsturl))
         other = hg.repository(self._repo.ui, dsturl)
         return self._repo.push(other, force)
 
--- a/tests/test-subrepo.out	Sat May 01 23:05:21 2010 +0200
+++ b/tests/test-subrepo.out	Sat May 01 23:05:22 2010 +0200
@@ -151,13 +151,13 @@
 % push
 committing subrepository t
 pushing ...sub/t
-pushing ...subrepo ss
+pushing ...sub/t/s/ss
 searching for changes
 no changes found
-pushing ...subrepo s
+pushing ...sub/t/s
 searching for changes
 no changes found
-pushing ...subrepo t
+pushing ...sub/t/t
 searching for changes
 adding changesets
 adding manifests
@@ -172,23 +172,23 @@
 committing subrepository s
 abort: push creates new remote heads on branch 'default'!
 pushing ...sub/t
-pushing ...subrepo ss
+pushing ...sub/t/s/ss
 searching for changes
 no changes found
-pushing ...subrepo s
+pushing ...sub/t/s
 searching for changes
 (did you forget to merge? use push -f to force)
 pushing ...sub/t
-pushing ...subrepo ss
+pushing ...sub/t/s/ss
 searching for changes
 no changes found
-pushing ...subrepo s
+pushing ...sub/t/s
 searching for changes
 adding changesets
 adding manifests
 adding file changes
 added 1 changesets with 1 changes to 1 files (+1 heads)
-pushing ...subrepo t
+pushing ...sub/t/t
 searching for changes
 no changes found
 searching for changes