Mercurial > hg
view tests/test-update-branches.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 | 68a1b9d0663e |
children |
line wrap: on
line source
% initial repo state @ 5:e1bb631146ca b1 | o 4:a4fdb3b883c4 0:b608b9236435 b1 | | o 3:4b57d2520816 1:44592833ba9f | | | | o 2:063f31070f65 | |/ | o 1:44592833ba9f |/ o 0:b608b9236435 % norevtest none clean linear 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=5 % norevtest none clean same 2 abort: crosses branches (use 'hg merge' or use 'hg update -c') parent=2 % revtest none clean linear 1 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 % revtest none clean same 2 3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=3 % revtest none clean cross 3 4 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=4 % revtest none dirty linear 1 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 M foo % revtest none dirty same 2 3 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) parent=2 M foo % revtest none dirty cross 3 4 abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) parent=3 M foo % revtest -C dirty linear 1 2 2 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=2 % revtest -c dirty linear 1 2 abort: uncommitted local changes parent=1 M foo % norevtest -c clean same 2 1 files updated, 0 files merged, 0 files removed, 0 files unresolved parent=3 % revtest -cC dirty linear 1 2 abort: cannot specify both -c/--check and -C/--clean parent=1 M foo