view 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.

  $ hg init
  $ touch a
  $ hg add a
  $ hg ci -m "a" -d "1000000 0"

  $ echo 123 > b
  $ hg add b
  $ hg diff --nodates
  diff -r acd8075edac9 b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ hg diff --nodates -r tip
  diff -r acd8075edac9 b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ echo foo > a
  $ hg diff --nodates
  diff -r acd8075edac9 a
  --- a/a
  +++ b/a
  @@ -0,0 +1,1 @@
  +foo
  diff -r acd8075edac9 b
  --- /dev/null
  +++ b/b
  @@ -0,0 +1,1 @@
  +123

  $ hg diff -r ""
  abort: 00changelog.i@: ambiguous identifier!
  $ hg diff -r tip -r ""
  abort: 00changelog.i@: ambiguous identifier!

  $ true