Mercurial > evolve

changeset 1093:a49f2e7a2755

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
obsexch: respect todosteps when using the old push
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 27 Aug 2014 18:59:11 +0200
parents 85c699c4fba4
children bb2c01cd096f
files hgext/evolve.py tests/test-exchange-A1.t tests/test-exchange-A2.t tests/test-exchange-A3.t tests/test-exchange-A4.t tests/test-exchange-A5.t tests/test-exchange-A6.t tests/test-exchange-A7.t tests/test-exchange-B1.t tests/test-exchange-B2.t tests/test-exchange-B3.t tests/test-exchange-B4.t tests/test-exchange-B5.t tests/test-exchange-B6.t tests/test-exchange-B7.t tests/test-exchange-C1.t tests/test-exchange-C2.t tests/test-exchange-C3.t tests/test-exchange-C4.t tests/test-exchange-D1.t tests/test-exchange-D2.t tests/test-exchange-D3.t tests/test-exchange-D4.t tests/test-wireproto.t
diffstat 24 files changed, 63 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Aug 27 18:28:22 2014 +0200
+++ b/hgext/evolve.py	Wed Aug 27 18:59:11 2014 +0200
@@ -2525,6 +2525,8 @@
 def _pullobsolete(orig, pullop):
     if not obsolete._enabled:
         return None
+    if 'obsmarkers' not in pullop.todosteps:
+        return None
     wirepull = pullop.remote.capable('_evoext_pullobsmarkers_0')
     if not wirepull:
         return orig(pullop)
--- a/tests/test-exchange-A1.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A1.t	Wed Aug 27 18:59:11 2014 +0200
@@ -72,7 +72,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -86,8 +86,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -117,7 +116,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -131,8 +130,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -221,7 +219,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -235,8 +233,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -263,7 +260,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -277,8 +274,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A2.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A2.t	Wed Aug 27 18:59:11 2014 +0200
@@ -80,7 +80,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -95,8 +95,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A3.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A3.t	Wed Aug 27 18:59:11 2014 +0200
@@ -92,7 +92,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -107,8 +107,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -191,7 +190,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -206,8 +205,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 2 files (+1 heads)
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg heads' to see heads, 'hg merge' to merge)
   1 new unstable changesets
   ## post pull state
--- a/tests/test-exchange-A4.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A4.t	Wed Aug 27 18:59:11 2014 +0200
@@ -85,7 +85,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -100,8 +100,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A5.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A5.t	Wed Aug 27 18:59:11 2014 +0200
@@ -92,7 +92,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 8c0a98c8372212c6efde4bfdcef006f27ff759d3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -108,8 +108,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-A6.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A6.t	Wed Aug 27 18:59:11 2014 +0200
@@ -80,7 +80,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -90,8 +90,7 @@
   ## pulling "e5ea8f9c7314" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -114,7 +113,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (65 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -125,8 +124,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-A7.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-A7.t	Wed Aug 27 18:59:11 2014 +0200
@@ -68,7 +68,6 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
   ## post pull state
   # obstore: main
   aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B1.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B1.t	Wed Aug 27 18:59:11 2014 +0200
@@ -71,7 +71,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -85,8 +85,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -113,7 +112,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -127,8 +126,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-B2.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B2.t	Wed Aug 27 18:59:11 2014 +0200
@@ -63,7 +63,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -73,8 +73,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -97,7 +96,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -108,8 +107,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B3.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B3.t	Wed Aug 27 18:59:11 2014 +0200
@@ -91,7 +91,6 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-B4.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B4.t	Wed Aug 27 18:59:11 2014 +0200
@@ -89,7 +89,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -99,8 +99,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -123,7 +122,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 1 obsolescence markers (89 bytes)
+  remote: 1 new obsolescence markers
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -134,8 +133,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  1 obsolescence markers added
+  1 new obsolescence markers
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B5.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B5.t	Wed Aug 27 18:59:11 2014 +0200
@@ -91,7 +91,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -107,8 +107,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state
@@ -141,7 +140,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 2 changesets with 2 changes to 2 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -157,8 +156,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   1 new unstable changesets
   ## post pull state
--- a/tests/test-exchange-B6.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B6.t	Wed Aug 27 18:59:11 2014 +0200
@@ -75,7 +75,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -87,8 +87,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-B7.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-B7.t	Wed Aug 27 18:59:11 2014 +0200
@@ -75,7 +75,6 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
   ## post pull state
   # obstore: main
   f6fbb35d8ac958bbe70035e4c789c18471cdc0af 0 {f5bc6836db60e308a17ba08bf050154ba9c4fad7} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C1.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-C1.t	Wed Aug 27 18:59:11 2014 +0200
@@ -70,7 +70,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (177 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -82,8 +82,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -110,7 +109,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (177 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -123,8 +122,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C2.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-C2.t	Wed Aug 27 18:59:11 2014 +0200
@@ -80,7 +80,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -96,8 +96,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -128,7 +127,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -144,8 +143,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-C3.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-C3.t	Wed Aug 27 18:59:11 2014 +0200
@@ -83,7 +83,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 3 obsolescence markers (241 bytes)
+  remote: 3 new obsolescence markers
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -97,8 +97,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  3 obsolescence markers added
+  3 new obsolescence markers
   ## post pull state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -129,7 +128,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 3 obsolescence markers (241 bytes)
+  remote: 3 new obsolescence markers
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -144,8 +143,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  3 obsolescence markers added
+  3 new obsolescence markers
   ## post pull state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-C4.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-C4.t	Wed Aug 27 18:59:11 2014 +0200
@@ -90,7 +90,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -103,8 +103,7 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D1.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-D1.t	Wed Aug 27 18:59:11 2014 +0200
@@ -74,7 +74,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   06055a7959d4128e6e3bccfd01482e83a2db8a3a 0 {28b51eb45704506b5c603decd6bf7ac5e0f6a52f} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -90,8 +90,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-D2.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-D2.t	Wed Aug 27 18:59:11 2014 +0200
@@ -67,7 +67,7 @@
   pushing to pushdest
   searching for changes
   no changes found
-  pushing 2 obsolescence markers (153 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -80,8 +80,7 @@
   pulling from main
   searching for changes
   no changes found
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D3.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-D3.t	Wed Aug 27 18:59:11 2014 +0200
@@ -81,7 +81,6 @@
   ## pulling "a9bdc8b26820" from main into pulldest
   pulling from main
   no changes found
-  pull obsolescence markers
   ## post pull state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 6aa67a7b4baa6fb41b06aed38d5b1201436546e2 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
--- a/tests/test-exchange-D4.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-exchange-D4.t	Wed Aug 27 18:59:11 2014 +0200
@@ -89,7 +89,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files
-  pushing 2 obsolescence markers (129 bytes)
+  remote: 2 new obsolescence markers
   ## post push state
   # obstore: main
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}
@@ -107,8 +107,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  pull obsolescence markers
-  2 obsolescence markers added
+  2 new obsolescence markers
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-wireproto.t	Wed Aug 27 18:28:22 2014 +0200
+++ b/tests/test-wireproto.t	Wed Aug 27 18:59:11 2014 +0200
@@ -72,6 +72,7 @@
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
   pushing 2 obsolescence markers (171 bytes)
+  remote: 2 obsolescence markers added
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes