view tests/test-convert-datesort.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
marked working directory as branch brancha
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
marked working directory as branch branchb
adding b
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% convert with datesort
initializing destination t-datesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 a4
3 b0
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
o |  5 "b0"
| |
| o  4 "a4"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"

% convert with datesort (default mode)
initializing destination t-sourcesort repository
scanning source...
sorting...
converting...
8 a0
7 a1
6 a2
5 a3
4 b0
3 a4
2 a5
1 a6
0 b1
% graph converted repo
o  8 "b1"
|
| o  7 "a6"
| |
| o  6 "a5"
| |
| o  5 "a4"
| |
o |  4 "b0"
| |
| o  3 "a3"
| |
| o  2 "a2"
| |
| o  1 "a1"
|/
o  0 "a0"