# HG changeset patch # User David M. Carr <david@carrclan.us> # Date 1349655087 14400 # Sun Oct 07 20:11:27 2012 -0400 # Node ID 4bc39fd24db3869e3e427b3f6b5d2f895a2bfa56 # Parent 36812cecfb9e9f6b4d6613e1414c8e74a6331ee5 push: change "no changes" default output to match normal mercurial The output for "hg push" when there were no changes didn't quite match between Mercurial with and without Hg-Git, so I changed the behavior to bring it into synch. The existing "creating and sending data" message was changed to be included 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 @@ -862,7 +862,8 @@ genpack = self.git.object_store.generate_pack_contents try: - self.ui.status(_("creating and sending data\n")) + self.ui.status(_("searching for changes\n")) + self.ui.note(_("creating and sending data\n")) new_refs = client.send_pack(path, changed, genpack) return old_refs, new_refs except (HangupException, GitProtocolError), e: diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t old mode 100755 new mode 100644 --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -61,7 +61,7 @@ $ hg push -r master ../gitrepo pushing to ../gitrepo exporting hg objects to git - creating and sending data + searching for changes $ cd .. $ hg clone gitrepo hgrepo2 | grep -v '^updating' diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t old mode 100755 new mode 100644 --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -61,7 +61,7 @@ $ hg push -r master ../gitrepo pushing to ../gitrepo exporting hg objects to git - creating and sending data + searching for changes $ cd .. $ hg clone gitrepo hgrepo2 | grep -v '^updating' diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t old mode 100755 new mode 100644 --- a/tests/test-convergedmerge.t +++ b/tests/test-convergedmerge.t @@ -62,7 +62,7 @@ $ hg push -r master ../gitrepo pushing to ../gitrepo exporting hg objects to git - creating and sending data + searching for changes $ cd .. $ hg clone gitrepo hgrepo2 | grep -v '^updating' diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t old mode 100755 new mode 100644 --- a/tests/test-empty-working-tree.t +++ b/tests/test-empty-working-tree.t @@ -40,7 +40,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd ../gitrepo2 $ git log --pretty=medium diff --git a/tests/test-encoding.t b/tests/test-encoding.t old mode 100755 new mode 100644 --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -122,7 +122,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd ../gitrepo2 $ git log --pretty=medium diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t old mode 100755 new mode 100644 --- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -109,7 +109,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd ../gitrepo2 $ git log --pretty=medium diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t old mode 100755 new mode 100644 --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -72,7 +72,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:3b7fd1b3 $ cd .. diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t old mode 100755 new mode 100644 --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -55,7 +55,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:cffa0e8d $ echo gamma >> beta @@ -63,7 +63,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:2b9ec6a4 $ echo gamma > gamma @@ -72,7 +72,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:fee30180 $ echo delta > delta @@ -81,7 +81,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:d1659250 $ echo epsilon > epsilon @@ -90,7 +90,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:ee985f12 $ echo zeta > zeta @@ -99,7 +99,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:d21e26b4 $ echo eta > eta @@ -108,7 +108,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:8c878c97 $ echo theta > theta @@ -117,7 +117,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:1e03e913 $ hg log --graph | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t old mode 100755 new mode 100644 --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -58,7 +58,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:05c2bcbe $ hg branch gamma | grep -v 'permanent and global' @@ -67,7 +67,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:296802ef $ hg log --graph | $filterhash | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t old mode 100755 new mode 100644 --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -53,7 +53,7 @@ $ hg push pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/tags/alpha => GIT:7eeab2ea default::refs/heads/master => GIT:9a2616b9 diff --git a/tests/test-merge.t b/tests/test-merge.t old mode 100755 new mode 100644 --- a/tests/test-merge.t +++ b/tests/test-merge.t @@ -70,7 +70,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd .. $ cd gitrepo2 diff --git a/tests/test-octopus.t b/tests/test-octopus.t old mode 100755 new mode 100644 --- a/tests/test-octopus.t +++ b/tests/test-octopus.t @@ -97,7 +97,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd ../gitrepo2 $ git log --pretty=medium | sed s/\\.\\.\\.//g diff --git a/tests/test-push.t b/tests/test-push.t old mode 100755 new mode 100644 --- a/tests/test-push.t +++ b/tests/test-push.t @@ -60,7 +60,7 @@ $ hg push -r beta pushing to $TESTTMP/gitrepo exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/beta => GIT:cffa0e8d $ cd .. @@ -90,7 +90,7 @@ % this should fail $ hg push -r master pushing to $TESTTMP/gitrepo - creating and sending data + searching for changes abort: refs/heads/master changed on the server, please pull and merge before pushing [255] @@ -98,7 +98,7 @@ % ... even with -f $ hg push -fr master pushing to $TESTTMP/gitrepo - creating and sending data + searching for changes abort: refs/heads/master changed on the server, please pull and merge before pushing [255] @@ -131,7 +131,7 @@ % this should also fail $ hg push -r master pushing to $TESTTMP/gitrepo - creating and sending data + searching for changes abort: pushing refs/heads/master overwrites 72f56395749d [255] @@ -139,7 +139,7 @@ % ... but succeed with -f $ hg push -fr master pushing to $TESTTMP/gitrepo - creating and sending data + searching for changes default::refs/heads/master => GIT:cc119202 $ echo % this should fail, no changes to push @@ -148,7 +148,7 @@ issue3228 was fixed in 2.1 $ hg push -r master && false pushing to $TESTTMP/gitrepo - creating and sending data + searching for changes no changes found [1] diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -116,7 +116,7 @@ $ hg push pushing to $TESTTMP/gitrepo1 exporting hg objects to git - creating and sending data + searching for changes default::refs/heads/master => GIT:4663c492 $ cd .. $ cd gitrepo1 diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t old mode 100755 new mode 100644 --- a/tests/test-tree-decomposition.t +++ b/tests/test-tree-decomposition.t @@ -68,7 +68,7 @@ $ hg push ../gitrepo2 pushing to ../gitrepo2 exporting hg objects to git - creating and sending data + searching for changes $ cd ../gitrepo2 $ git log --pretty=medium