Mercurial > hg
annotate tests/test-revlog-group-emptyiter.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 | f21ecd091970 |
children | b63f6422d2a7 |
rev | line source |
---|---|
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
1 # issue 1678 |
11918
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
2 setting up base repo |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
3 $ hg init a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
4 $ cd a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
5 $ touch a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
6 $ hg ci -Am a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
7 adding a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
8 $ cd .. |
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
9 |
11918
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
10 cloning base repo |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
11 $ hg clone a b |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
12 updating to branch default |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
13 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
14 $ cd b |
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
15 |
11918
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
16 setting up cset to push |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
17 $ hg up null |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
18 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
19 $ touch a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
20 different msg so we get a clog new entry |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
21 $ hg ci -Am b |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
22 adding a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
23 created new head |
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
24 |
11918
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
25 pushing |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
26 $ hg push -f ../a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
27 pushing to ../a |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
28 searching for changes |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
29 adding changesets |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
30 adding manifests |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
31 adding file changes |
f21ecd091970
tests: unify test-revlog-group-emptyiter
Pradeepkumar Gayam <in3xes@gmail.com>
parents:
8635
diff
changeset
|
32 added 1 changesets with 0 changes to 0 files (+1 heads) |
8635
aaaf4af1c173
revlog: add test for 7659eecd9da2 (issue1678)
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff
changeset
|
33 |