[PATCH 2 of 3 main-line-of-works (35 more patches to go)] bundle2: prefix all bundling debug messages with 'bundle2-ouput:'
Pierre-Yves David
pierre-yves.david at ens-lyon.org
Wed May 27 23:37:27 CDT 2015
# HG changeset patch
# User Pierre-Yves David <pierre-yves.david at fb.com>
# Date 1432706255 25200
# Tue May 26 22:57:35 2015 -0700
# Node ID b300c6a755d23d5b4b4f6df677ebfb3a92bd90d2
# Parent 03ca83e664e181f3c83a6c40779100822291675d
bundle2: prefix all bundling debug messages with 'bundle2-ouput:'
This make the origin of the message more explicit.
diff --git a/mercurial/bundle2.py b/mercurial/bundle2.py
--- a/mercurial/bundle2.py
+++ b/mercurial/bundle2.py
@@ -173,11 +173,11 @@ preferedchunksize = 4096
_parttypeforbidden = re.compile('[^a-zA-Z0-9_:-]')
def outdebug(ui, message):
"""debug regarding output stream (bundling)"""
- ui.debug(message)
+ ui.debug('bundle2-output: %s' % message)
def validateparttype(parttype):
"""raise ValueError if a parttype contains invalid character"""
if _parttypeforbidden.search(parttype):
raise ValueError(parttype)
diff --git a/tests/test-bundle2-format.t b/tests/test-bundle2-format.t
--- a/tests/test-bundle2-format.t
+++ b/tests/test-bundle2-format.t
@@ -335,14 +335,14 @@ Test debug output
---------------------------------------------------
bundling debug
$ hg bundle2 --debug --param 'e|! 7/=babar%#==tutu' --param simple ../out.hg2 --config progress.debug=true
- start emission of HG20 stream
- bundle parameter: e%7C%21%207/=babar%25%23%3D%3Dtutu simple
- start of parts
- end of bundle
+ bundle2-output: start emission of HG20 stream
+ bundle2-output: bundle parameter: e%7C%21%207/=babar%25%23%3D%3Dtutu simple
+ bundle2-output: start of parts
+ bundle2-output: end of bundle
file content is ok
$ cat ../out.hg2
HG20\x00\x00\x00)e%7C%21%207/=babar%25%23%3D%3Dtutu simple\x00\x00\x00\x00 (no-eol) (esc)
@@ -382,21 +382,21 @@ bad parameter name
Test part
=================
$ hg bundle2 --parts ../parts.hg2 --debug --config progress.debug=true
- start emission of HG20 stream
- bundle parameter:
- start of parts
- bundle part: "test:empty"
- bundle part: "test:empty"
- bundle part: "test:song"
- bundle part: "test:debugreply"
- bundle part: "test:math"
- bundle part: "test:song"
- bundle part: "test:ping"
- end of bundle
+ bundle2-output: start emission of HG20 stream
+ bundle2-output: bundle parameter:
+ bundle2-output: start of parts
+ bundle2-output: bundle part: "test:empty"
+ bundle2-output: bundle part: "test:empty"
+ bundle2-output: bundle part: "test:song"
+ bundle2-output: bundle part: "test:debugreply"
+ bundle2-output: bundle part: "test:math"
+ bundle2-output: bundle part: "test:song"
+ bundle2-output: bundle part: "test:ping"
+ bundle2-output: end of bundle
$ cat ../parts.hg2
HG20\x00\x00\x00\x00\x00\x00\x00\x11 (esc)
test:empty\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x11 (esc)
test:empty\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x10 test:song\x00\x00\x00\x02\x00\x00\x00\x00\x00\xb2Patali Dirapata, Cromda Cromda Ripalo, Pata Pata, Ko Ko Ko (esc)
@@ -709,14 +709,14 @@ Support for changegroup
list of changesets:
32af7686d403cf45b5d95f2d70cebea587ac806a
9520eea781bcca16c1e15acc0ba14335a0e8e5ba
eea13746799a9e0bfd88f29d3c2e9dc9389f524f
02de42196ebee42ef284b6780a87cdc96e8eaab6
- start emission of HG20 stream
- bundle parameter:
- start of parts
- bundle part: "changegroup"
+ bundle2-output: start emission of HG20 stream
+ bundle2-output: bundle parameter:
+ bundle2-output: start of parts
+ bundle2-output: bundle part: "changegroup"
bundling: 1/4 changesets (25.00%)
bundling: 2/4 changesets (50.00%)
bundling: 3/4 changesets (75.00%)
bundling: 4/4 changesets (100.00%)
bundling: 1/4 manifests (25.00%)
@@ -724,11 +724,11 @@ Support for changegroup
bundling: 3/4 manifests (75.00%)
bundling: 4/4 manifests (100.00%)
bundling: D 1/3 files (33.33%)
bundling: E 2/3 files (66.67%)
bundling: H 3/3 files (100.00%)
- end of bundle
+ bundle2-output: end of bundle
$ cat ../rev.hg2
HG20\x00\x00\x00\x00\x00\x00\x00\x12\x0bchangegroup\x00\x00\x00\x00\x00\x00\x00\x00\x06\x13\x00\x00\x00\xa42\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j_\xdd\xd9\x89W\xc8\xa5JMCm\xfe\x1d\xa9\xd8\x7f!\xa1\xb9{\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x002\xafv\x86\xd4\x03\xcfE\xb5\xd9_-p\xce\xbe\xa5\x87\xac\x80j\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)6e1f4c47ecb533ffd0c8e52cdc88afb6cd39e20c (esc)
\x00\x00\x00f\x00\x00\x00h\x00\x00\x00\x02D (esc)
\x00\x00\x00i\x00\x00\x00j\x00\x00\x00\x01D\x00\x00\x00\xa4\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\xcd\x01\x0b\x8c\xd9\x98\xf3\x98\x1aZ\x81\x15\xf9O\x8d\xa4\xabP`\x89\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x95 \xee\xa7\x81\xbc\xca\x16\xc1\xe1Z\xcc\x0b\xa1C5\xa0\xe8\xe5\xba\x00\x00\x00\x00\x00\x00\x00)\x00\x00\x00)4dece9c826f69490507b98c6383a3009b295837d (esc)
More information about the Mercurial-devel
mailing list