view tests/test-rebase-issue-noparam-single-rev.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.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head
@  4:r2
|
o  3:r1
|
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in source branch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
saved backup bundle to 
@  4:l1
|
o  3:r2
|
o  2:r1
|
o  1:c2
|
o  0:c1

0 files updated, 0 files merged, 2 files removed, 0 files unresolved
created new head
@  4:r1
|
| o  3:l2
| |
| o  2:l1
|/
o  1:c2
|
o  0:c1


% Rebase with no arguments - single revision in target branch
2 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to 
@  4:l2
|
o  3:l1
|
o  2:r1
|
o  1:c2
|
o  0:c1