annotate tests/test-manifest.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.

% should be empty
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
b/a
l
644   a
755 * b/a
644 @ l
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644   a
b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 755 * b/a
047b75c6d7a3ef6a2243bd0e99f94f6ea6683597 644 @ l
a
l
a
b/a
l
a
b/a
l
% should fail
abort: unknown revision '2'!
abort: please specify just one revision
a
b/a
l