view tests/test-rebase-newancestor.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.

adding a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
@  3:AD 1d4e82ed3c2a
|
| o  2:C 7e1afe9214b2
| |
| o  1:B 0a6620c3c26a
|/
o  0:A 1e635d440a73

@  3:C 0c5887756284
|
o  2:B 4f208f4a1507
|
o  1:AD 1d4e82ed3c2a
|
o  0:A 1e635d440a73