mq: strip extra whitespace from node ids in header (
issue2790)
This makes `hg qpush --exact` work with patches created by `hg export`.
--- a/hgext/mq.py Sun May 01 05:58:04 2011 -0500
+++ b/hgext/mq.py Tue May 03 11:46:02 2011 -0500
@@ -107,7 +107,7 @@
elif line.startswith("# Date "):
date = line[7:]
elif line.startswith("# Parent "):
- parent = line[9:]
+ parent = line[9:].lstrip()
elif line.startswith("# Branch "):
branch = line[9:]
elif line.startswith("# Node ID "):
--- a/tests/test-mq-qpush-exact.t Sun May 01 05:58:04 2011 -0500
+++ b/tests/test-mq-qpush-exact.t Tue May 03 11:46:02 2011 -0500
@@ -26,7 +26,14 @@
$ echo cp0 >> fp0
$ hg add fp0
- $ hg qnew p0 -d "0 0"
+ $ hg ci -m p0 -d "0 0"
+ $ hg export -r. > p0
+ $ hg strip -qn .
+ $ hg qimport p0
+ adding p0 to series file
+ $ hg qpush
+ applying p0
+ now at: p0
$ echo cp1 >> fp1
$ hg add fp1
@@ -63,15 +70,6 @@
$ hg qpop -aq
patch queue now empty
- $ hg qpush -ea
- applying p0
- applying p1
- now at: p1
- $ hg parents -qr qbase
- 1:d7fe2034f71b
- $ hg qpop -aq
- patch queue now empty
-
qpush --exact when at another rev
$ hg update 0 -q