# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1400618752 25200
# Node ID b71b563b17deb90f190bcccc4ff61ae96c0e3677
# Parent  5b8d9c2ab4802eac4d84d11e49f01e0bdbb03faa
evolve: more compact output in the wire protocol case

We made the wording more similar and use less line. The writing operation is
usually fast so we do not needs a specific line for it.

diff -r 5b8d9c2ab480 -r b71b563b17de hgext/evolve.py
--- a/hgext/evolve.py	Tue May 20 23:57:48 2014 -0700
+++ b/hgext/evolve.py	Tue May 20 13:45:52 2014 -0700
@@ -2254,13 +2254,12 @@
         if not markers:
             repo.ui.status("OBSEXC: no marker to push\n")
         elif remote.capable('_evoext_pushobsmarkers_0'):
-            repo.ui.status("OBSEXC: writing %i markers\n" % len(markers))
             obsdata = pushobsmarkerStringIO()
             _encodemarkersstream(obsdata, markers)
             obsdata.seek(0)
             obsdata.ui = repo.ui
-            repo.ui.status("OBSEXC: pushing %i bytes\n"
-                           % len(obsdata.getvalue()))
+            repo.ui.status("OBSEXC: pushing %i markers (%i bytes)\n"
+                           % (len(markers), len(obsdata.getvalue())))
             remote.evoext_pushobsmarkers_0(obsdata)
             repo.ui.progress('OBSEXC', None)
         else:
diff -r 5b8d9c2ab480 -r b71b563b17de tests/test-simple4server.t
--- a/tests/test-simple4server.t	Tue May 20 23:57:48 2014 -0700
+++ b/tests/test-simple4server.t	Tue May 20 13:45:52 2014 -0700
@@ -101,8 +101,7 @@
   OBSEXC: computing relevant nodes
   OBSEXC: looking for common markers in 2 nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: writing 2 markers
-  OBSEXC: pushing 171 bytes
+  OBSEXC: pushing 2 markers (171 bytes)
   OBSEXC: DONE
   $ hg push
   pushing to http://localhost:$HGPORT/
diff -r 5b8d9c2ab480 -r b71b563b17de tests/test-wireproto.t
--- a/tests/test-wireproto.t	Tue May 20 23:57:48 2014 -0700
+++ b/tests/test-wireproto.t	Tue May 20 13:45:52 2014 -0700
@@ -81,8 +81,7 @@
   OBSEXC: computing relevant nodes
   OBSEXC: looking for common markers in 2 nodes
   OBSEXC: computing markers relevant to 1 nodes
-  OBSEXC: writing 2 markers
-  OBSEXC: pushing 171 bytes
+  OBSEXC: pushing 2 markers (171 bytes)
   OBSEXC: DONE
   remote: adding changesets
   remote: adding manifests