Mercurial > hg
view tests/test-rebase-conflicts.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 | 7a9cf012dddc |
children |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head @ 5: L3 | o 4: L2 | o 3: L1 | | o 2: C3 |/ o 1: C2 | o 0: C1 % Try to call --continue abort: no rebase in progress % Conflicting rebase merging common warning: conflicts during merge. merging common failed! abort: fix unresolved conflicts with hg resolve then run hg rebase --continue % Try to continue without solving the conflict abort: unresolved merge conflicts (see hg resolve) % Conclude rebase saved backup bundle to @ 5: L3 | o 4: L2 | o 3: L1 | o 2: C3 | o 1: C2 | o 0: C1 % Check correctness - Rev. 0 c1 - Rev. 1 c1 c2 - Rev. 2 c1 c2 c3 - Rev. 3 c1 c2 c3 - Rev. 4 resolved merge - Rev. 5 resolved merge