view tests/test-share.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.

% prepare repo1
adding a
% share it
updating working directory
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
% contents of repo2/.hg
pass: .hg/store does not exist
$HGTMP/test-share/repo1/.hg
% commit in shared clone
% check original
changeset:   1:8af4dc49db9e
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change in shared clone

changeset:   0:d3873e73d99e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     init

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a
a
% commit in original
adding b
% check in shared clone
changeset:   2:c2e0ac586386
tag:         tip
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     another file

changeset:   1:8af4dc49db9e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     change in shared clone

changeset:   0:d3873e73d99e
user:        test
date:        Thu Jan 01 00:00:00 1970 +0000
summary:     init

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b
% hg serve shared clone
200 Script output follows


-rw-r--r-- 4 a
-rw-r--r-- 2 b