view tests/test-mq-qimport-fail-cleanup @ 11715:4f9dfb54c8b5 stable

qpush --move: move the right patch even with comment lines

88fc876a4833 caused that we find the index of the moving patch in self.series
but look it up in self.full_series. The difference between these is that
full_series also contains comment lines, and we thus moved the wrong patch.

Use back self.full_series to find the moving patch, but take care of striping
the patch guard markers before comparing the patch name. Test cases have been
added for comments and empty lines in self.full_series, and for the case of
guarded patches.

Original patch contributed by Mads Kiilerich <[e-mail]>

#!/bin/sh
#failed qimport of patches from files should cleanup by recording successfully
#imported patches in series file.

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg init repo
cd repo

echo a > a
hg ci -Am'add a'

cat >b.patch<<EOF
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,2 @@
 a
+b
EOF

echo
echo '#empty series'
hg qseries

echo
echo '#qimport valid patch followed by invalid patch'
hg qimport b.patch fakepatch

echo
echo '#valid patches before fail added to series'
hg qseries