Mercurial > hg > evolve
changeset 1039:b71b563b17de
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.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Tue, 20 May 2014 13:45:52 -0700 |
parents | 5b8d9c2ab480 |
children | cf4dcf49d998 |
files | hgext/evolve.py tests/test-simple4server.t tests/test-wireproto.t |
diffstat | 3 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py +++ b/hgext/evolve.py @@ -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:
--- a/tests/test-simple4server.t +++ b/tests/test-simple4server.t @@ -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/
--- a/tests/test-wireproto.t +++ b/tests/test-wireproto.t @@ -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