Mercurial > hg
view tests/test-rebase-pull @ 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 | 2313dc4d9817 |
children |
line wrap: on
line source
#!/bin/sh . $TESTDIR/helpers.sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } commit () { hg commit -d "${2} 0" -m $1 } rm -rf a hg init a cd a addcommit "C1" 0 addcommit "C2" 1 cd .. hg clone a b # This is needed to test pull --rebase hg clone a c cd b addcommit "L1" 2 cd ../a addcommit "R1" 3 cd ../b echo echo "% Now b has one revision to be pulled from a" hg pull --rebase | hidebackup | sed -e 's/\(pulling from \).*/\1/' hg glog --template '{rev}:{desc}\n' echo echo "% Re-run pull --rebase" hg pull --rebase | sed 's/\(pulling from \).*/\1/' echo echo "% Invoke pull --rebase and nothing to rebase" cd ../c hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' hg glog --template '{rev}\n' -l 1 echo echo "% pull --rebase --update should ignore --update" hg pull --rebase --update 2>&1 | sed 's/\(pulling from \).*/\1/' echo echo "% pull --rebase doesn't update if nothing has been pulled" hg up 1 hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' hg glog --template '{rev}\n' -l 1 exit 0