view tests/test-mq-qdelete.out @ 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]>

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
popping c
now at: b
a
b
a
b
series
status
popping b
now at: a
a
b
series
status
patch a finalized without changeset message
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
patch d finalized without changeset message
patch e finalized without changeset message
f
4 [mq]: f
3 [mq]: e
2 [mq]: d
1 [mq]: a
0 base
adding base
abort: no revisions specified
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
popping c
now at: b
abort: unknown revision 'c'!
applying c
patch c is empty
now at: c
patch a finalized without changeset message
patch b finalized without changeset message
c
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
patch c finalized without changeset message
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
series
status