Mercurial > hg
annotate tests/test-permissions.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 | c1b11ee12fe7 |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
1 % hg init t |
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
2 % hg add a |
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
3 % hg commit |
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
4 % hg verify |
1497 | 5 checking changesets |
6 checking manifests | |
7 crosschecking files in changesets and manifests | |
8 checking files | |
9 1 files, 1 changesets, 1 total revisions | |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
10 % hg verify |
1497 | 11 checking changesets |
12 checking manifests | |
13 crosschecking files in changesets and manifests | |
14 checking files | |
15 verify failed | |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
16 % hg verify |
1497 | 17 checking changesets |
18 checking manifests | |
19 crosschecking files in changesets and manifests | |
20 checking files | |
21 1 files, 1 changesets, 1 total revisions | |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
22 % hg commit |
1497 | 23 commit failed |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
24 % hg diff |
5215
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
25 diff -r c1fab96507ef a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
26 --- a/a |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
27 +++ b/a |
5863
3d1f9dcecdea
diff: don't show function name by default
Matt Mackall <mpm@selenic.com>
parents:
5215
diff
changeset
|
28 @@ -1,1 +1,1 @@ |
5215
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
29 -foo |
74723744d8e0
fix test-permissions output
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
2152
diff
changeset
|
30 +barber |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
31 % hg status |
7099
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5863
diff
changeset
|
32 M a |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5863
diff
changeset
|
33 ? dir/a |
11663
c1b11ee12fe7
test-permissions: echo commands to make output readable
Martin Geisler <mg@aragost.com>
parents:
7099
diff
changeset
|
34 % hg status |
7099
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5863
diff
changeset
|
35 dir: Permission denied |
6f750e76fb46
dirstate.walk: skip unreadable directories (issue1213)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
5863
diff
changeset
|
36 M a |