Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: stop pretending we are pulling markers when we don't
authorPierre-Yves David <pierre-yves.david@fb.com>
Fri, 08 Aug 2014 18:06:08 -0700
changeset 1042 86bd794f6037
parent 1041 7632f1f79946
child 1043 6a7d34010f8f
evolve: stop pretending we are pulling markers when we don't If discovery did not found any unknown marker, we should not display the "pulling marker" message.
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-simple4server.t file | annotate | diff | comparison | revisions
tests/test-wireproto.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Fri Aug 08 18:01:02 2014 -0700
+++ b/hgext/evolve.py	Fri Aug 08 18:06:08 2014 -0700
@@ -2656,12 +2656,12 @@
         return None # remote opted out of obsolescence marker exchange
     tr = None
     ui = pullop.repo.ui
-    obsexcmsg(ui, "pull obsolescence markers\n", True)
     boundaries = _buildpullobsmerkersboundaries(pullop)
     if not set(boundaries['heads']) - set(boundaries['common']):
         obsexcmsg(ui, "nothing to pull\n")
         return None
 
+    obsexcmsg(ui, "pull obsolescence markers\n", True)
     new = 0
 
     if b2xpull:
--- a/tests/test-simple4server.t	Fri Aug 08 18:01:02 2014 -0700
+++ b/tests/test-simple4server.t	Fri Aug 08 18:06:08 2014 -0700
@@ -50,7 +50,6 @@
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  pull obsolescence markers
   $ hg pull -R ../other
   pulling from http://localhost:$HGPORT/
   requesting all changes
@@ -116,7 +115,6 @@
   pulling from http://localhost:$HGPORT/
   searching for changes
   no changes found
-  pull obsolescence markers
 
   $ cd ..
 
--- a/tests/test-wireproto.t	Fri Aug 08 18:01:02 2014 -0700
+++ b/tests/test-wireproto.t	Fri Aug 08 18:06:08 2014 -0700
@@ -23,7 +23,6 @@
 
   $ hg clone ssh://user@dummy/server client
   no changes found
-  pull obsolescence markers
   updating to branch default
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cp -r client other
@@ -45,7 +44,6 @@
   pulling from ssh://user@dummy/server
   searching for changes
   no changes found
-  pull obsolescence markers
   $ hg pull -R ../other
   pulling from ssh://user@dummy/server
   requesting all changes
@@ -97,7 +95,6 @@
   pulling from ssh://user@dummy/server
   searching for changes
   no changes found
-  pull obsolescence markers
 
   $ cd ..
evolve