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.
% test default params, display nothing because of delay
% test with delay=0, refresh=0
loop [ ] 0/3
loop [=====================> ] 1/3
loop [============================================> ] 2/3
% test refresh is taken in account
% test format options 1
0/2 loop lo
1/2 loop lo
% test format options 2
0/2 p.0 [ ]
1/2 p.1 [=================================> ]
% test format options and indeterminate progress
0 loop.0 [ <=> ]
1 loop.1 [ <=> ]
% make sure things don't fall over if count > total
loop [ ] 0/4
loop [================> ] 1/4
loop [=================================> ] 2/4
loop [==================================================> ] 3/4
loop [===================================================================>] 4/4
loop [ <=> ] 5/4
% test immediate progress completion