view tests/test-convert-bzr-directories.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.

% empty directory
initializing destination source-hg repository
scanning source...
sorting...
converting...
2 Initial add
1 Empty directory added
0 Added file into directory
% manifest of 1
644   a
% manifest of tip
644   a
644   empty/something
% directory renames
tpyo => typo
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added directory
0 Oops, typo
% manifest of 0
644   tpyo/something
% manifest of tip
644   typo/something
% nested directory renames
firstlevel/secondlevel => secondlevel
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added nested directories
0 Moved secondlevel one level up
% manifest of tip
644   secondlevel/file
644   secondlevel/thirdlevel/stuff
% directory remove
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Added directory
0 Removed directory
% manifest of 0
644   src/sourcecode
% manifest of tip
% directory replace
first/file => second/file
first => third
initializing destination source-hg repository
scanning source...
sorting...
converting...
1 Initial layout
0 Some conflicting moves
% manifest of tip
644   second/file
644   second/something
644   third/dummy