Mercurial > hg
annotate tests/test-remove-new @ 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 | e740f36cfb4b |
children |
rev | line source |
---|---|
800
ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
749
diff
changeset
|
1 #!/bin/sh |
402 | 2 |
11346
e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents:
11177
diff
changeset
|
3 # test that 'hg commit' does not crash if the user removes a |
e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents:
11177
diff
changeset
|
4 # newly added file |
e740f36cfb4b
tests: rename test-merge3 to test-add-remove.
Greg Ward <greg-hg@gerg.ca>
parents:
11177
diff
changeset
|
5 |
402 | 6 hg init |
7 echo This is file a1 > a | |
8 hg add a | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
9 hg commit -m "commit #0" -d "1000000 0" |
402 | 10 touch b |
11 hg add b | |
12 rm b | |
1933
7544700fd931
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
814
diff
changeset
|
13 hg commit -A -m"comment #1" -d "1000000 0" |
11177
6a64813276ed
commands: initial audit of exit codes
Matt Mackall <mpm@selenic.com>
parents:
1933
diff
changeset
|
14 exit 0 |