Skip to content
Snippets Groups Projects
Commit 63ff8fe3 authored by Wagner Bruna's avatar Wagner Bruna
Browse files

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.
parent fab28a57
No related branches found
No related tags found
No related merge requests found
......@@ -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')
......
......@@ -49,7 +49,7 @@
splice repo2 on repo1
$ cat > splicemap <<EOF
> $CHILDID1 $PARENTID1
> $CHILDID1 $PARENTID1
> $CHILDID2 $PARENTID2,$CHILDID1
> EOF
$ hg clone repo1 target1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment