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

% check alignment of option descriptions in help
hg showoptlist 

dummy command to show option descriptions

options:

 -s --opt1 短名          short width
 -m --opt2 MIDDLE_       middle width
 -l --opt3 長い長い名前  long width

use "hg -v help showoptlist" to show global options
% check alignment of user names in annotate
        短名: first line(2)
     MIDDLE_: second line(2)
長い長い名前: third line(2)
% check alignment of filenames in diffstat
 MIDDLE_      |  1 +
 短名         |  1 +
 長い長い名前 |  1 +
 3 files changed, 3 insertions(+), 0 deletions(-)
marked working directory as branch 短名
marked working directory as branch MIDDLE_
marked working directory as branch 長い長い名前
% check alignment of branches
tip                                5:afc60d8eed19
長い長い名前                       4:19fe74d09ba0
MIDDLE_                            3:8a20997d2281
短名                               2:0cc06ffa3461
% check alignment of tags
tip                                5:afc60d8eed19
長い長い名前                       4:19fe74d09ba0
MIDDLE_                            3:8a20997d2281
短名                               2:0cc06ffa3461