# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1407544169 25200
# Node ID 70de12b7721a70ded53d87230b1920e396f1c929
# Parent  59bc29c84ce064f39dd7734739e13ed9c95fd145
evolve: re-introduce the "pushing 42 markers…" message

Informing the user about marker behind pushed sounds a good idea.

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -2225,9 +2225,12 @@
 ### Obsolescence marker exchange experimenation                   ###
 #####################################################################
 
-def obsexcmsg(ui, message):
-    if ui.configbool('experimental', 'verbose-obsolescence-exchange', False):
+def obsexcmsg(ui, message, important=False):
+    verbose = ui.configbool('experimental', 'verbose-obsolescence-exchange',
+                             False)
+    if verbose:
         message = 'OBSEXC: ' + message
+    if important or verbose:
         ui.status(message)
 
 def obsexcprg(ui, *args, **kwargs):
@@ -2401,7 +2404,8 @@
             obsdata.seek(0)
             obsdata.ui = repo.ui
             obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
-                               % (len(markers), len(obsdata.getvalue())))
+                               % (len(markers), len(obsdata.getvalue())),
+                      True)
             bundler.newpart('EVOLVE:B2X:OBSMARKERV1', data=obsdata)
             def callback(op):
                 obsexcprg(repo.ui, None)
@@ -2475,7 +2479,8 @@
             obsdata.seek(0)
             obsdata.ui = repo.ui
             obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
-                               % (len(markers), len(obsdata.getvalue())))
+                               % (len(markers), len(obsdata.getvalue())),
+                      True)
             bundler = bundle2.bundle20(pushop.ui, {})
             capsblob = bundle2.encodecaps(pushop.repo.bundle2caps)
             bundler.addpart(bundle2.bundlepart('b2x:replycaps', data=capsblob))
@@ -2497,7 +2502,8 @@
             obsdata.seek(0)
             obsdata.ui = repo.ui
             obsexcmsg(repo.ui, "pushing %i markers (%i bytes)\n"
-                               % (len(markers), len(obsdata.getvalue())))
+                               % (len(markers), len(obsdata.getvalue())),
+                      True)
             remote.evoext_pushobsmarkers_0(obsdata)
             obsexcprg(repo.ui, None)
         else:
@@ -2506,7 +2512,8 @@
             totalbytes = sum(len(d) for k,d in remotedata)
             sentbytes = 0
             obsexcmsg(repo.ui, "pushing %i markers in %i pushkey payload (%i bytes)\n"
-                                % (len(markers), len(remotedata), totalbytes))
+                                % (len(markers), len(remotedata), totalbytes),
+                      True)
             for key, data in remotedata:
                 obsexcprg(repo.ui, 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
@@ -111,6 +111,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 2 changes to 2 files
+  pushing 2 markers (147 bytes)
   $ hg -R ../other verify
   checking changesets
   checking manifests
diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -181,6 +181,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files (+1 heads)
+  pushing 2 markers (123 bytes)
   $ hg -R ../other-new verify
   checking changesets
   checking manifests
@@ -234,6 +235,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pushing 3 markers (184 bytes)
   $ qlog -R ../other-new
   5
   - 95de7fc6918d
@@ -255,6 +257,7 @@
   pushing to ../other-new
   searching for changes
   no changes found
+  pushing 3 markers (184 bytes)
   [1]
 
   $ hg up --hidden -q .^ # 3
@@ -529,6 +532,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 1 changes to [12] files (re)
+  pushing 7 markers (452 bytes)
   $ hg up -q 10
   $ mkcommit "obsol_d'''"
   created new head
@@ -540,6 +544,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
+  pushing 8 markers (513 bytes)
   $ cd ..
 
 check bumped detection
diff --git a/tests/test-sharing.t b/tests/test-sharing.t
--- a/tests/test-sharing.t
+++ b/tests/test-sharing.t
@@ -112,6 +112,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
+  pushing 4 markers (341 bytes)
 
 Figure SG05
   $ hg -R ../public shortlog -G
diff --git a/tests/test-simple4server.t b/tests/test-simple4server.t
--- a/tests/test-simple4server.t
+++ b/tests/test-simple4server.t
@@ -90,6 +90,7 @@
   remote: adding manifests
   remote: adding file changes
   remote: added 1 changesets with 1 changes to 1 files (+1 heads)
+  pushing 2 markers (171 bytes)
   $ hg push
   pushing to http://localhost:$HGPORT/
   searching for changes
diff --git a/tests/test-tutorial.t b/tests/test-tutorial.t
--- a/tests/test-tutorial.t
+++ b/tests/test-tutorial.t
@@ -402,6 +402,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 1 files
+  pushing 6 markers (487 bytes)
 
 for simplicity sake we get the bathroom change in line again
 
@@ -722,6 +723,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 1 files (+1 heads)
+  pushing 10 markers (803 bytes)
 
 remote get a warning that current working directory is based on an obsolete changeset
 
diff --git a/tests/test-wireproto.t b/tests/test-wireproto.t
--- a/tests/test-wireproto.t
+++ b/tests/test-wireproto.t
@@ -66,6 +66,7 @@
   $ hg push
   pushing to ssh://user@dummy/server
   searching for changes
+  pushing 2 markers (171 bytes)
   remote: adding changesets
   remote: adding manifests
   remote: adding file changes