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

%% should show b unknown
? b
%% should show b unknown and c modified
M c
? b
%% should show b added and c modified
M c
A b
%% should show a removed, b added and c modified
M c
A b
R a
%% should show b added, copy saved, and c modified
M c
A b
%% should show b unknown, and c modified
M c
? b
%% should show unknown: b
? b
%% should show b added
A b
%% should show b deleted
! b
forgetting b
%% should not find b
b: No such file or directory
%% should show a c e
a
c
e
%% should verbosely save backup to e.orig
saving current version of e as e.orig
reverting e
%% should say no changes needed
no changes needed to a
%% should say file not managed
file not managed: q
%% should say file not found
notfound: No such file in rev 095eacd0c0d7
A z
? e.orig
%% should add a, remove d, forget z
adding a
removing d
forgetting z
%% should forget a, undelete d
forgetting a
undeleting d
%% should silently add a
A a
R d
%% should silently keep d removed
R d
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
reverting c
%% should print non-executable
non-executable
reverting c
%% should print executable
executable
%% issue 241
adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% should fail - no arguments
abort: no files or directories specified; use --all to revert the whole repo
% should succeed
reverting a
%% issue332
adding b/b
created new head
reverting b/b
forgetting newdir/newfile
reverting b/b
% reverting a rename target should revert the source
? newa
%% 4 ignored files (we will add/commit everything)
I ignored
I ignoreddir/file
I ignoreddir/removed
I removed
%% should revert ignored* and undelete *removed
reverting ignored
reverting ignoreddir/file
undeleting ignoreddir/removed
undeleting removed
%% should silently revert the named files