view tests/test-convert-bzr-114 @ 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

"$TESTDIR/hghave" bzr114 || exit 80

. "$TESTDIR/bzr-definitions"

# The file/directory replacement can only be reproduced on
# bzr >= 1.4. Merge it back in test-convert-bzr-directories once
# this version becomes mainstream.
echo % replace file with dir
mkdir test-replace-file-with-dir
cd test-replace-file-with-dir
bzr init -q source
cd source
echo d > d
bzr add -q d
bzr commit -q -m 'add d file'
rm d
mkdir d
bzr add -q d
bzr commit -q -m 'replace with d dir'
echo a > d/a
bzr add -q d/a
bzr commit -q -m 'add d/a'
cd ..
hg convert source source-hg
manifest source-hg tip
cd source-hg
hg update
cd ../..