view tests/test-notify-changegroup.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]>

% clone
updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
% commit
adding a
% commit
% push
pushing to ../a
searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Date:
Subject: test-notify-changegroup/a: 2 new changesets
From: test
X-Hg-Notification: changeset cb9a9f314b8b
Message-Id:
To: baz, foo@bar

changeset cb9a9f314b8b in test-notify-changegroup/a
details: test-notify-changegroup/a?cmd=changeset;node=cb9a9f314b8b
summary: a

changeset ba677d0156c1 in test-notify-changegroup/a
details: test-notify-changegroup/a?cmd=changeset;node=ba677d0156c1
summary: b

diffs (6 lines):

diff -r 000000000000 -r ba677d0156c1 a
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/a	Thu Jan 01 00:00:00 1970 +0000
@@ -0,0 +1,2 @@
+a
+a