Mercurial > hg
view tests/test-rebase-rename.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 | 4bb4895e1693 |
children |
line wrap: on
line source
adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Rename is tracked 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed % Rebase the revision containing the rename % Rename is not lost 2:rename A diff --git a/a b/a-renamed rename from a rename to a-renamed adding a adding b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head % Copy is tracked 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied % Rebase the revision containing the copy % Copy is not lost 2:copy A diff --git a/a b/a-copied copy from a copy to a-copied