Mercurial > hg
annotate tests/test-diffdir.t @ 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 | 650d8a023249 |
children | 4c94b6d0fb1c |
rev | line source |
---|---|
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
1 $ hg init |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
2 $ touch a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
3 $ hg add a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
4 $ hg ci -m "a" -d "1000000 0" |
536 | 5 |
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
6 $ echo 123 > b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
7 $ hg add b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
8 $ hg diff --nodates |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
9 diff -r acd8075edac9 b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
10 --- /dev/null |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
11 +++ b/b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
12 @@ -0,0 +1,1 @@ |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
13 +123 |
536 | 14 |
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
15 $ hg diff --nodates -r tip |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
16 diff -r acd8075edac9 b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
17 --- /dev/null |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
18 +++ b/b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
19 @@ -0,0 +1,1 @@ |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
20 +123 |
1723
fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
981
diff
changeset
|
21 |
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
22 $ echo foo > a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
23 $ hg diff --nodates |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
24 diff -r acd8075edac9 a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
25 --- a/a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
26 +++ b/a |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
27 @@ -0,0 +1,1 @@ |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
28 +foo |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
29 diff -r acd8075edac9 b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
30 --- /dev/null |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
31 +++ b/b |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
32 @@ -0,0 +1,1 @@ |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
33 +123 |
3825
000d122071b5
fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3199
diff
changeset
|
34 |
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
35 $ hg diff -r "" |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
36 abort: 00changelog.i@: ambiguous identifier! |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
37 $ hg diff -r tip -r "" |
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
38 abort: 00changelog.i@: ambiguous identifier! |
3825
000d122071b5
fix hg diff -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3199
diff
changeset
|
39 |
11921
650d8a023249
tests: unify test-diffdir
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
4180
diff
changeset
|
40 $ true |