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

hg status in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in repo root:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status in a:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a:
? 1/in_a_1
? in_a
hg status .. in a:
? 1/in_a_1
? in_a
? ../b/1/in_b_1
? ../b/2/in_b_2
? ../b/in_b
? ../in_root
hg status in b:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b:
? 1/in_b_1
? 2/in_b_2
? in_b
hg status .. in b:
? ../a/1/in_a_1
? ../a/in_a
? 1/in_b_1
? 2/in_b_2
? in_b
? ../in_root
hg status in a/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in a/1:
? in_a_1
hg status .. in a/1:
? in_a_1
? ../in_a
hg status in b/1:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/1:
? in_b_1
hg status .. in b/1:
? in_b_1
? ../2/in_b_2
? ../in_b
hg status in b/2:
? a/1/in_a_1
? a/in_a
? b/1/in_b_1
? b/2/in_b_2
? b/in_b
? in_root
hg status . in b/2:
? in_b_2
hg status .. in b/2:
? ../1/in_b_1
? in_b_2
? ../in_b
adding .hgignore
adding deleted
adding modified
adding removed
hg status:
A added
R removed
! deleted
? unknown
hg status modified added removed deleted unknown never-existed ignored:
never-existed: No such file or directory
A added
R removed
! deleted
? unknown
hg status -C:
A added
A copied
  modified
R removed
! deleted
? unknown
hg status -A:
A added
A copied
  modified
R removed
! deleted
? unknown
I ignored
C .hgignore
C modified
hg status ignoreddir/file:
hg status -i ignoreddir/file:
I ignoreddir/file
adding .hgignore
adding deleted
adding modified
adding removed
% test unknown color
ignoring unknown color/effect 'periwinkle' (configured in color.status.modified)
M modified
A added
A copied
R removed
! deleted
? unknown
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
merging a failed!
merging b
warning: conflicts during merge.
merging b failed!
0 files updated, 0 files merged, 0 files removed, 2 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
hg resolve with one unresolved, one resolved:
U a
R b