Mercurial > hg
view tests/test-mq-qimport-fail-cleanup @ 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 | 1b82a26635d7 |
children |
line wrap: on
line source
#!/bin/sh #failed qimport of patches from files should cleanup by recording successfully #imported patches in series file. echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH hg init repo cd repo echo a > a hg ci -Am'add a' cat >b.patch<<EOF diff --git a/a b/a --- a/a +++ b/a @@ -1,1 +1,2 @@ a +b EOF echo echo '#empty series' hg qseries echo echo '#qimport valid patch followed by invalid patch' hg qimport b.patch fakepatch echo echo '#valid patches before fail added to series' hg qseries