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

#!/bin/sh
rm -rf a
hg init a
cd a
touch a
hg ci -Am0
hg mv a a1
hg ci -m1
hg co 0
hg mv a a2
hg up
hg ci -m2

touch a
hg ci -Am3
hg mv a b
hg ci -Am4 a
hg ci --debug --traceback -Am5 b
hg verify
hg export --git tip