Mercurial > hg-git
changeset 560:9c71a6f00863
push: suppress "exporting hg objects to git" message
When communicating with the user on push/outgoing, Mercurial doesn't show a
"exporting hg objects to git" message, so we shouldn't. The message has been
changed to be shown if --verbose is specified.
| author | David M. Carr <david@carrclan.us> |
|---|---|
| date | Thu, 25 Oct 2012 21:47:44 -0400 |
| parents | d4ccec82b816 |
| children | 9f919924bf81 |
| files | hggit/git_handler.py tests/test-conflict-1.t tests/test-conflict-2.t tests/test-convergedmerge.t tests/test-empty-working-tree.t tests/test-encoding.t tests/test-file-removal.t tests/test-git-tags.t tests/test-git-workflow.t tests/test-hg-author.t tests/test-hg-branch.t tests/test-hg-tags.t tests/test-merge.t tests/test-octopus.t tests/test-outgoing.t tests/test-push.t tests/test-subrepos.t tests/test-tree-decomposition.t |
| diffstat | 18 files changed, 1 insertions(+), 26 deletions(-) [+] |
line wrap: on
line diff
--- a/hggit/git_handler.py Thu Oct 25 21:47:36 2012 -0400 +++ b/hggit/git_handler.py Thu Oct 25 21:47:44 2012 -0400 @@ -337,7 +337,7 @@ export = [node for node in nodes if not hex(node) in self._map_hg] total = len(export) if total: - self.ui.status(_("exporting hg objects to git\n")) + self.ui.note(_("exporting hg objects to git\n")) for i, rev in enumerate(export): util.progress(self.ui, 'exporting', i, total=total) ctx = self.repo.changectx(rev)
--- a/tests/test-conflict-1.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-conflict-1.t Thu Oct 25 21:47:44 2012 -0400 @@ -60,7 +60,6 @@ $ hg bookmark -r tip master $ hg push -r master ../gitrepo pushing to ../gitrepo - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-conflict-2.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-conflict-2.t Thu Oct 25 21:47:44 2012 -0400 @@ -60,7 +60,6 @@ $ hg bookmark -r tip master $ hg push -r master ../gitrepo pushing to ../gitrepo - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-convergedmerge.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-convergedmerge.t Thu Oct 25 21:47:44 2012 -0400 @@ -61,7 +61,6 @@ $ hg bookmark -r4 master $ hg push -r master ../gitrepo pushing to ../gitrepo - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-empty-working-tree.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-empty-working-tree.t Thu Oct 25 21:47:44 2012 -0400 @@ -39,7 +39,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ../gitrepo2
--- a/tests/test-encoding.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-encoding.t Thu Oct 25 21:47:44 2012 -0400 @@ -121,7 +121,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ../gitrepo2
--- a/tests/test-file-removal.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-file-removal.t Thu Oct 25 21:47:44 2012 -0400 @@ -108,7 +108,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ../gitrepo2
--- a/tests/test-git-tags.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-git-tags.t Thu Oct 25 21:47:44 2012 -0400 @@ -71,7 +71,6 @@ $ hg commit -m 'fix for beta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-git-workflow.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-git-workflow.t Thu Oct 25 21:47:44 2012 -0400 @@ -66,7 +66,6 @@ $ echo "[git]" >> .hg/hgrc $ echo "intree = True" >> .hg/hgrc $ hg gexport - exporting hg objects to git $ echo % do some work % do some work
--- a/tests/test-hg-author.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-hg-author.t Thu Oct 25 21:47:44 2012 -0400 @@ -54,14 +54,12 @@ $ hgcommit -u "test" -m 'add beta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo gamma >> beta $ hgcommit -u "test <test@example.com> (comment)" -m 'modify beta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo gamma > gamma @@ -69,7 +67,6 @@ $ hgcommit -u "<test@example.com>" -m 'add gamma' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo delta > delta @@ -77,7 +74,6 @@ $ hgcommit -u "name<test@example.com>" -m 'add delta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo epsilon > epsilon @@ -85,7 +81,6 @@ $ hgcommit -u "name <test@example.com" -m 'add epsilon' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo zeta > zeta @@ -93,7 +88,6 @@ $ hgcommit -u " test " -m 'add zeta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo eta > eta @@ -101,7 +95,6 @@ $ hgcommit -u "test < test@example.com >" -m 'add eta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ echo theta > theta @@ -109,7 +102,6 @@ $ hgcommit -u "test >test@example.com>" -m 'add theta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ hg log --graph | egrep -v ': *(not-master|master)'
--- a/tests/test-hg-branch.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-hg-branch.t Thu Oct 25 21:47:44 2012 -0400 @@ -57,7 +57,6 @@ $ hgcommit -m 'rename alpha to beta' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ hg branch gamma | grep -v 'permanent and global' @@ -65,7 +64,6 @@ $ hgcommit -m 'started branch gamma' $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ hg log --graph | $filterhash | egrep -v ': *(not-master|master)'
--- a/tests/test-hg-tags.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-hg-tags.t Thu Oct 25 21:47:44 2012 -0400 @@ -52,7 +52,6 @@ $ hgtag alpha $ hg push pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ hg log --graph | egrep -v ': *(not-master|master)'
--- a/tests/test-merge.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-merge.t Thu Oct 25 21:47:44 2012 -0400 @@ -69,7 +69,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-octopus.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-octopus.t Thu Oct 25 21:47:44 2012 -0400 @@ -96,7 +96,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ../gitrepo2
--- a/tests/test-outgoing.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-outgoing.t Thu Oct 25 21:47:44 2012 -0400 @@ -60,7 +60,6 @@ $ hg outgoing | sed 's/bookmark: /tag: /' | grep -v 'searching for changes' comparing with */gitrepo (glob) - exporting hg objects to git changeset: 1:0564f526fb0f tag: beta user: test
--- a/tests/test-push.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-push.t Thu Oct 25 21:47:44 2012 -0400 @@ -59,7 +59,6 @@ $ hg book -r 1 beta $ hg push -r beta pushing to $TESTTMP/gitrepo - exporting hg objects to git searching for changes $ cd ..
--- a/tests/test-subrepos.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-subrepos.t Thu Oct 25 21:47:44 2012 -0400 @@ -115,7 +115,6 @@ $ hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true $ hg push pushing to $TESTTMP/gitrepo1 - exporting hg objects to git searching for changes $ cd .. $ cd gitrepo1
--- a/tests/test-tree-decomposition.t Thu Oct 25 21:47:36 2012 -0400 +++ b/tests/test-tree-decomposition.t Thu Oct 25 21:47:44 2012 -0400 @@ -67,7 +67,6 @@ clearing out the git cache data $ hg push ../gitrepo2 pushing to ../gitrepo2 - exporting hg objects to git searching for changes $ cd ../gitrepo2