# HG changeset patch # User Wagner Bruna <wbruna@softwareexpress.com.br> # Date 1322869137 7200 # Fri Dec 02 21:38:57 2011 -0200 # Branch stable # Node ID 63ff8fe3a8f05dda76e9df66573927b7a6dc2273 # Parent fab28a577a38d0b3313c7ea8407cc5663808387c convert: tolerate trailing spaces on map files A convert run with a branchmap made with echo default namedbranch > branchmap on Windows fails silently and surprisingly; it actually adds a space after 'namedbranch', so it ends up mapping "default namedbranch" to "". This also affects splicemaps, since the same parser is used for both. diff --git a/hgext/convert/common.py b/hgext/convert/common.py --- a/hgext/convert/common.py +++ b/hgext/convert/common.py @@ -384,7 +384,7 @@ return for i, line in enumerate(fp): try: - key, value = line.splitlines()[0].rsplit(' ', 1) + key, value = line.splitlines()[0].rstrip().rsplit(' ', 1) except ValueError: raise util.Abort( _('syntax error in %s(%d): key/value pair expected') diff --git a/tests/test-convert-splicemap.t b/tests/test-convert-splicemap.t --- a/tests/test-convert-splicemap.t +++ b/tests/test-convert-splicemap.t @@ -49,7 +49,7 @@ splice repo2 on repo1 $ cat > splicemap <<EOF - > $CHILDID1 $PARENTID1 + > $CHILDID1 $PARENTID1 > $CHILDID2 $PARENTID2,$CHILDID1 > EOF $ hg clone repo1 target1