annotate tests/test-encoding-align.out @ 11988:8380ed691df8

util: add an interpolate() function to for replacing multiple values

util.interpolate can be used to replace multiple items in a string all at once
(and optionally apply a function to the replacement), without worrying about
recursing:

    >>> import util
    >>> s = '$foo, $spam'
    >>> util.interpolate(r'\$', { 'foo': 'bar', 'spam': 'eggs' }, s)
    'bar, eggs'
    >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s)
    'spam, foo'
    >>> util.interpolate(r'\$', { 'foo': 'spam', 'spam': 'foo' }, s, lambda s: s.upper())
    'SPAM, FOO'

The patch also changes filemerge.py to use this new function.

% 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