# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1400617812 25200
# Node ID 010c7e4aa8204b6a921ec39427c880ea4beeda73
# Parent  576d3a1982699fa759fcff6d4ecdcd28686dfa0e
evolve: align working during obsmarker push using pushkey

lets use the same wording everywhere to prevent user confusion.

diff -r 576d3a198269 -r 010c7e4aa820 hgext/evolve.py
--- a/hgext/evolve.py	Mon May 19 17:43:31 2014 -0700
+++ b/hgext/evolve.py	Tue May 20 13:30:12 2014 -0700
@@ -2265,7 +2265,7 @@
             repo.ui.progress('OBSEXC', None)
         else:
             rslts = []
-            repo.ui.status("OBSEXC: encoding %i markers\n" % len(markers))
+            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
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-corrupt.t
--- a/tests/test-corrupt.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-corrupt.t	Tue May 20 13:30:12 2014 -0700
@@ -113,7 +113,7 @@
   added 1 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 4 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (184 bytes)
   OBSEXC: DONE
   $ hg -R ../other verify
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A1.t
--- a/tests/test-exchange-A1.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A1.t	Tue May 20 13:30:12 2014 -0700
@@ -74,7 +74,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
@@ -125,7 +125,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
@@ -235,7 +235,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
@@ -283,7 +283,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A2.t
--- a/tests/test-exchange-A2.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A2.t	Tue May 20 13:30:12 2014 -0700
@@ -82,7 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A3.t	Tue May 20 13:30:12 2014 -0700
@@ -94,7 +94,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
@@ -199,7 +199,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A4.t
--- a/tests/test-exchange-A4.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A4.t	Tue May 20 13:30:12 2014 -0700
@@ -87,7 +87,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A5.t
--- a/tests/test-exchange-A5.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A5.t	Tue May 20 13:30:12 2014 -0700
@@ -95,7 +95,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-A6.t
--- a/tests/test-exchange-A6.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-A6.t	Tue May 20 13:30:12 2014 -0700
@@ -82,7 +82,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
@@ -122,7 +122,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (78 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-B1.t
--- a/tests/test-exchange-B1.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-B1.t	Tue May 20 13:30:12 2014 -0700
@@ -73,7 +73,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
@@ -121,7 +121,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-B2.t
--- a/tests/test-exchange-B2.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-B2.t	Tue May 20 13:30:12 2014 -0700
@@ -65,7 +65,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
@@ -105,7 +105,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-B4.t
--- a/tests/test-exchange-B4.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-B4.t	Tue May 20 13:30:12 2014 -0700
@@ -91,7 +91,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
@@ -131,7 +131,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 1 markers
+  OBSEXC: pushing 1 markers
   OBSEXC: sending 1 pushkey payload (112 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-B5.t
--- a/tests/test-exchange-B5.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-B5.t	Tue May 20 13:30:12 2014 -0700
@@ -93,7 +93,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
@@ -149,7 +149,7 @@
   added 2 changesets with 2 changes to 2 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 3 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-B6.t
--- a/tests/test-exchange-B6.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-B6.t	Tue May 20 13:30:12 2014 -0700
@@ -77,7 +77,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-C1.t
--- a/tests/test-exchange-C1.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-C1.t	Tue May 20 13:30:12 2014 -0700
@@ -72,7 +72,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (222 bytes)
   OBSEXC: DONE
   ## post push state
@@ -118,7 +118,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (222 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-C2.t
--- a/tests/test-exchange-C2.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-C2.t	Tue May 20 13:30:12 2014 -0700
@@ -82,7 +82,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
@@ -136,7 +136,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-C3.t
--- a/tests/test-exchange-C3.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-C3.t	Tue May 20 13:30:12 2014 -0700
@@ -85,7 +85,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 3 markers
+  OBSEXC: pushing 3 markers
   OBSEXC: sending 1 pushkey payload (298 bytes)
   OBSEXC: DONE
   ## post push state
@@ -137,7 +137,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 3 markers
+  OBSEXC: pushing 3 markers
   OBSEXC: sending 1 pushkey payload (298 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-C4.t
--- a/tests/test-exchange-C4.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-C4.t	Tue May 20 13:30:12 2014 -0700
@@ -93,7 +93,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-D1.t
--- a/tests/test-exchange-D1.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-D1.t	Tue May 20 13:30:12 2014 -0700
@@ -76,7 +76,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-D2.t
--- a/tests/test-exchange-D2.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-D2.t	Tue May 20 13:30:12 2014 -0700
@@ -69,7 +69,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (188 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-exchange-D4.t
--- a/tests/test-exchange-D4.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-exchange-D4.t	Tue May 20 13:30:12 2014 -0700
@@ -92,7 +92,7 @@
   added 1 changesets with 1 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 2 nodes
-  OBSEXC: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (154 bytes)
   OBSEXC: DONE
   ## post push state
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-obsolete.t
--- a/tests/test-obsolete.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-obsolete.t	Tue May 20 13:30:12 2014 -0700
@@ -183,7 +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: encoding 2 markers
+  OBSEXC: pushing 2 markers
   OBSEXC: sending 1 pushkey payload (154 bytes)
   OBSEXC: DONE
   $ hg -R ../other-new verify
@@ -241,7 +241,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: encoding 3 markers
+  OBSEXC: pushing 3 markers
   OBSEXC: sending 1 pushkey payload (230 bytes)
   OBSEXC: DONE
   $ qlog -R ../other-new
@@ -267,7 +267,7 @@
   no changes found
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: encoding 3 markers
+  OBSEXC: pushing 3 markers
   OBSEXC: sending 1 pushkey payload (230 bytes)
   OBSEXC: DONE
   [1]
@@ -551,7 +551,7 @@
   added 2 changesets with 1 changes to [12] files (re)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: encoding 7 markers
+  OBSEXC: pushing 7 markers
   OBSEXC: sending 1 pushkey payload (565 bytes)
   OBSEXC: DONE
   $ hg up -q 10
@@ -567,7 +567,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: encoding 8 markers
+  OBSEXC: pushing 8 markers
   OBSEXC: sending 1 pushkey payload (642 bytes)
   OBSEXC: DONE
   $ cd ..
diff -r 576d3a198269 -r 010c7e4aa820 tests/test-tutorial.t
--- a/tests/test-tutorial.t	Mon May 19 17:43:31 2014 -0700
+++ b/tests/test-tutorial.t	Tue May 20 13:30:12 2014 -0700
@@ -407,7 +407,7 @@
   added 3 changesets with 3 changes to 1 files
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 5 nodes
-  OBSEXC: encoding 6 markers
+  OBSEXC: pushing 6 markers
   OBSEXC: sending 1 pushkey payload (609 bytes)
   OBSEXC: DONE
 
@@ -741,7 +741,7 @@
   added 2 changesets with 2 changes to 1 files (+1 heads)
   OBSEXC: computing relevant nodes
   OBSEXC: computing markers relevant to 7 nodes
-  OBSEXC: encoding 10 markers
+  OBSEXC: pushing 10 markers
   OBSEXC: sending 1 pushkey payload (1004 bytes)
   OBSEXC: DONE