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

% prepare repo1
adding a
% share it
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% contents of repo2/.hg
pass: .hg/store does not exist
$HGTMP/test-share/repo1/.hg
% commit in shared clone
% check original
changeset:   1:8af4dc49db9e
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change in shared clone

changeset:   0:d3873e73d99e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     init

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
% commit in original
adding b
% check in shared clone
changeset:   2:c2e0ac586386
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     another file

changeset:   1:8af4dc49db9e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change in shared clone

changeset:   0:d3873e73d99e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     init

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b
% hg serve shared clone
200 Script output follows


-rw-r--r-- 4 a
-rw-r--r-- 2 b