annotate tests/test-diff-copy-depth.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.
author |
Steve Losh <steve@stevelosh.com> |
date |
Wed, 18 Aug 2010 18:18:26 -0400 |
parents |
d8f44384c3ee |
children |
|
rev |
line source |
6424
|
1 -- With aaa
|
|
2 Status:
|
|
3 A somename
|
|
4 other-file
|
|
5
|
|
6 Diff:
|
|
7 diff --git a/other-file b/somename
|
|
8 copy from other-file
|
|
9 copy to somename
|
|
10
|
|
11 -- With zzz
|
|
12 Status:
|
|
13 A somename
|
|
14 other-file
|
|
15
|
|
16 Diff:
|
|
17 diff --git a/other-file b/somename
|
|
18 copy from other-file
|
|
19 copy to somename
|
|
20
|