# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1401745453 25200
# Node ID b107f3549ec204109586babc70bf5c3005bebb45
# Parent  72670e28246086ea91ce43328f7af5a742e8da1e
evolve: make exchange output compact in the old pushkey case too.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2286,12 +2286,11 @@
             repo.ui.progress('OBSEXC', None)
         else:
             rslts = []
-            repo.ui.status("OBSEXC: pushing %i markers\n" % len(markers))
             remotedata = _pushkeyescape(markers).items()
             totalbytes = sum(len(d) for k,d in remotedata)
             sentbytes = 0
-            repo.ui.status("OBSEXC: sending %i pushkey payload (%i bytes)\n"
-                            % (len(remotedata), totalbytes))
+            repo.ui.status("OBSEXC: pushing %i markers in %i pushkey payload (%i bytes)\n"
+                            % (len(markers), len(remotedata), totalbytes))
             for key, data in remotedata:
                 repo.ui.progress('OBSEXC', sentbytes, item=key, unit="bytes",
                                  total=totalbytes)
diff --git a/tests/test-corrupt.t b/tests/test-corrupt.t
--- a/tests/test-corrupt.t
+++ b/tests/test-corrupt.t
@@ -113,8 +113,7 @@
   added 1 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 4 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (184 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (184 bytes)
   OBSEXC: DONE
   $ hg -R ../other verify
   checking changesets
diff --git a/tests/test-exchange-A1.t b/tests/test-exchange-A1.t
--- a/tests/test-exchange-A1.t
+++ b/tests/test-exchange-A1.t
@@ -74,8 +74,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -125,8 +124,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -235,8 +233,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -283,8 +280,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-A2.t b/tests/test-exchange-A2.t
--- a/tests/test-exchange-A2.t
+++ b/tests/test-exchange-A2.t
@@ -82,8 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-A3.t b/tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t
+++ b/tests/test-exchange-A3.t
@@ -94,8 +94,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -199,8 +198,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-A4.t b/tests/test-exchange-A4.t
--- a/tests/test-exchange-A4.t
+++ b/tests/test-exchange-A4.t
@@ -87,8 +87,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-A5.t b/tests/test-exchange-A5.t
--- a/tests/test-exchange-A5.t
+++ b/tests/test-exchange-A5.t
@@ -95,8 +95,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-A6.t b/tests/test-exchange-A6.t
--- a/tests/test-exchange-A6.t
+++ b/tests/test-exchange-A6.t
@@ -82,8 +82,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -122,8 +121,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (78 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-B1.t b/tests/test-exchange-B1.t
--- a/tests/test-exchange-B1.t
+++ b/tests/test-exchange-B1.t
@@ -73,8 +73,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -121,8 +120,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-B2.t b/tests/test-exchange-B2.t
--- a/tests/test-exchange-B2.t
+++ b/tests/test-exchange-B2.t
@@ -65,8 +65,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -105,8 +104,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-B4.t b/tests/test-exchange-B4.t
--- a/tests/test-exchange-B4.t
+++ b/tests/test-exchange-B4.t
@@ -91,8 +91,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -131,8 +130,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 1 markers
-  OBSEXC: sending 1 pushkey payload (112 bytes)
+  OBSEXC: pushing 1 markers in 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-B5.t b/tests/test-exchange-B5.t
--- a/tests/test-exchange-B5.t
+++ b/tests/test-exchange-B5.t
@@ -93,8 +93,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -149,8 +148,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-B6.t b/tests/test-exchange-B6.t
--- a/tests/test-exchange-B6.t
+++ b/tests/test-exchange-B6.t
@@ -77,8 +77,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-C1.t b/tests/test-exchange-C1.t
--- a/tests/test-exchange-C1.t
+++ b/tests/test-exchange-C1.t
@@ -72,8 +72,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (222 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (222 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -118,8 +117,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (222 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (222 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-C2.t b/tests/test-exchange-C2.t
--- a/tests/test-exchange-C2.t
+++ b/tests/test-exchange-C2.t
@@ -82,8 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -136,8 +135,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-C3.t b/tests/test-exchange-C3.t
--- a/tests/test-exchange-C3.t
+++ b/tests/test-exchange-C3.t
@@ -85,8 +85,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 3 markers
-  OBSEXC: sending 1 pushkey payload (298 bytes)
+  OBSEXC: pushing 3 markers in 1 pushkey payload (298 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
@@ -137,8 +136,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 3 markers
-  OBSEXC: sending 1 pushkey payload (298 bytes)
+  OBSEXC: pushing 3 markers in 1 pushkey payload (298 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-C4.t b/tests/test-exchange-C4.t
--- a/tests/test-exchange-C4.t
+++ b/tests/test-exchange-C4.t
@@ -93,8 +93,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-D1.t b/tests/test-exchange-D1.t
--- a/tests/test-exchange-D1.t
+++ b/tests/test-exchange-D1.t
@@ -76,8 +76,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-D2.t b/tests/test-exchange-D2.t
--- a/tests/test-exchange-D2.t
+++ b/tests/test-exchange-D2.t
@@ -69,8 +69,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (188 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-exchange-D4.t b/tests/test-exchange-D4.t
--- a/tests/test-exchange-D4.t
+++ b/tests/test-exchange-D4.t
@@ -92,8 +92,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (154 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (154 bytes)
   OBSEXC: DONE
   ## post push state
   # obstore: main
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -183,8 +183,7 @@
   added 5 changesets with 5 changes to 5 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 2 markers
-  OBSEXC: sending 1 pushkey payload (154 bytes)
+  OBSEXC: pushing 2 markers in 1 pushkey payload (154 bytes)
   OBSEXC: DONE
   $ hg -R ../other-new verify
   checking changesets
@@ -241,8 +240,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 3 markers
-  OBSEXC: sending 1 pushkey payload (230 bytes)
+  OBSEXC: pushing 3 markers in 1 pushkey payload (230 bytes)
   OBSEXC: DONE
   $ qlog -R ../other-new
   5
@@ -267,8 +265,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 3 markers
-  OBSEXC: sending 1 pushkey payload (230 bytes)
+  OBSEXC: pushing 3 markers in 1 pushkey payload (230 bytes)
   OBSEXC: DONE
   [1]
 
@@ -551,8 +548,7 @@
   added 2 changesets with 1 changes to [12] files (re)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 7 markers
-  OBSEXC: sending 1 pushkey payload (565 bytes)
+  OBSEXC: pushing 7 markers in 1 pushkey payload (565 bytes)
   OBSEXC: DONE
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
@@ -567,8 +563,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 8 markers
-  OBSEXC: sending 1 pushkey payload (642 bytes)
+  OBSEXC: pushing 8 markers in 1 pushkey payload (642 bytes)
   OBSEXC: DONE
   $ cd ..
 
diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -407,8 +407,7 @@
   added 3 changesets with 3 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: pushing 6 markers
-  OBSEXC: sending 1 pushkey payload (609 bytes)
+  OBSEXC: pushing 6 markers in 1 pushkey payload (609 bytes)
   OBSEXC: DONE
 
 for simplicity sake we get the bathroom change in line again
@@ -741,8 +740,7 @@
   added 2 changesets with 2 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 7 nodes
-  OBSEXC: pushing 10 markers
-  OBSEXC: sending 1 pushkey payload (1004 bytes)
+  OBSEXC: pushing 10 markers in 1 pushkey payload (1004 bytes)
   OBSEXC: DONE
 
 remote get a warning that current working directory is based on an obsolete changeset