Mercurial > hg
annotate tests/test-convert-mtn-rename-directory.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 | 88a2687fbd38 |
children |
rev | line source |
---|---|
7957
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
1 % tedious monotone keys configuration |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
2 % create monotone repository |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
3 mtn: adding dir1 to workspace manifest |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
4 mtn: adding dir1/subdir1 to workspace manifest |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
5 mtn: adding dir1/subdir1/file1 to workspace manifest |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
6 mtn: beginning commit on branch 'com.selenic.test' |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
7 mtn: committed revision 5ed13ff5582d8d1e319f079b694a37d2b45edfc8 |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
8 % rename directory |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
9 mtn: skipping dir1, already accounted for in workspace |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
10 mtn: renaming dir1/subdir1 to dir1/subdir2 in workspace manifest |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
11 mtn: beginning commit on branch 'com.selenic.test' |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
12 mtn: committed revision 985204142a822b22ee86b509d61f3c5ab6857d2b |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
13 % convert |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
14 assuming destination repo.mtn-hg |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
15 initializing destination repo.mtn-hg repository |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
16 scanning source... |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
17 sorting... |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
18 converting... |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
19 1 initialize |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
20 0 rename |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
21 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
22 % manifest |
88a2687fbd38
right way to check if file was in renamed directory, fixes import monotone
Pavel Volkovitskiy <int@mtx.ru>
parents:
diff
changeset
|
23 dir1/subdir2/file1 |