view tests/test-nested-repo @ 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

hg init a
cd a
hg init b
echo x > b/x

echo '# should print nothing'
hg add b
hg st

echo '# should fail'
hg st b/x
hg add b/x

echo '# should fail'
hg add b b/x
hg st

echo '# should arguably print nothing'
hg st b

echo a > a
hg ci -Ama a

echo '# should fail'
hg mv a b
hg st