Mercurial > hg
annotate tests/test-eolfilename.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 | b66388f6adfa |
children |
rev | line source |
---|---|
10475
2253715fde97
color: don't crash on invalid status codes (issue2036)
Brodie Rao <me+hg@dackz.net>
parents:
6138
diff
changeset
|
1 % test issue352 |
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
2 adding he llo |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
3 abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
4 adding he llo |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
5 abort: '\n' and '\r' disallowed in filenames: 'he\rllo' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
6 adding hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
7 o |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
8 abort: '\n' and '\r' disallowed in filenames: 'hell\no' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
9 adding hell |
3607
f4c9bb4ad7b1
issue352: disallow '\n' and '\r' in filenames (dirstate and manifest)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
diff
changeset
|
10 o |
6138
09847b90beae
Report filenames with disallowed characters as suggested by Mika Eloranta
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4186
diff
changeset
|
11 abort: '\n' and '\r' disallowed in filenames: 'hell\no' |
4186
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
12 f he llo he llo |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
13 f hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
14 o hell |
08d31e43592a
Leave normalization of patterns to util._matcher
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3607
diff
changeset
|
15 o |
10475
2253715fde97
color: don't crash on invalid status codes (issue2036)
Brodie Rao <me+hg@dackz.net>
parents:
6138
diff
changeset
|
16 % test issue2039 |
10827
b66388f6adfa
color: don't split colors across lines (which confuses less -R)
Brodie Rao <brodie@bitheap.org>
parents:
10826
diff
changeset
|
17 [0;35;1;4m? foo[0m |
b66388f6adfa
color: don't split colors across lines (which confuses less -R)
Brodie Rao <brodie@bitheap.org>
parents:
10826
diff
changeset
|
18 [0;35;1;4mbar[0m |
b66388f6adfa
color: don't split colors across lines (which confuses less -R)
Brodie Rao <brodie@bitheap.org>
parents:
10826
diff
changeset
|
19 [0;35;1;4m? foo[0m |
b66388f6adfa
color: don't split colors across lines (which confuses less -R)
Brodie Rao <brodie@bitheap.org>
parents:
10826
diff
changeset
|
20 [0;35;1;4mbar.baz[0m |