# HG changeset patch # User David M. Carr <david@carrclan.us> # Date 1351216064 14400 # Thu Oct 25 21:47:44 2012 -0400 # Node ID 9c71a6f00863434faa5b776370b340fb2d0f4050 # Parent d4ccec82b8164908f73c4ea23a4b0b00803b750b 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. diff --git a/hggit/git_handler.py b/hggit/git_handler.py --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -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) diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -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 .. diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -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 .. diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t --- a/tests/test-convergedmerge.t +++ b/tests/test-convergedmerge.t @@ -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 .. diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t --- a/tests/test-empty-working-tree.t +++ b/tests/test-empty-working-tree.t @@ -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 diff --git a/tests/test-encoding.t b/tests/test-encoding.t --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -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 diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t --- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -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 diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -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 .. diff --git a/tests/test-git-workflow.t b/tests/test-git-workflow.t --- a/tests/test-git-workflow.t +++ b/tests/test-git-workflow.t @@ -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 diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -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)' diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -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)' diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -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)' diff --git a/tests/test-merge.t b/tests/test-merge.t --- a/tests/test-merge.t +++ b/tests/test-merge.t @@ -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 .. diff --git a/tests/test-octopus.t b/tests/test-octopus.t --- a/tests/test-octopus.t +++ b/tests/test-octopus.t @@ -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 diff --git a/tests/test-outgoing.t b/tests/test-outgoing.t --- a/tests/test-outgoing.t +++ b/tests/test-outgoing.t @@ -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 diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -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 .. diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -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 diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t --- a/tests/test-tree-decomposition.t +++ b/tests/test-tree-decomposition.t @@ -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