view tests/test-diff-hashes @ 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 c2d0ed7f4af8
children
line wrap: on
line source

#!/bin/sh

hg init a
cd a
hg diff not found
echo bar > foo
hg add foo
hg ci -m 'add foo' -d '1000000 0'

echo foobar > foo
hg ci -m 'change foo' -d '1000001 0'

echo 'quiet:'
hg --quiet diff -r 0 -r 1
echo

echo 'normal:'
hg diff -r 0 -r 1
echo

echo 'verbose:'
hg --verbose diff -r 0 -r 1
echo

echo 'debug:'
hg --debug diff -r 0 -r 1
echo