Mercurial > hg
view tests/test-rebase-keep-branch @ 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 | b345b1cc124f |
children |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH addcommit () { echo $1 > $1 hg add $1 hg commit -d "${2} 0" -m $1 } hg init a cd a addcommit "c1" 0 addcommit "c2" 1 addcommit "l1" 2 addcommit "l2" 3 hg update -C 1 hg branch 'notdefault' addcommit "r1" 4 hg glog --template '{rev}:{desc}:{branches}\n' echo echo '% Rebase a branch while preserving the branch name' hg update -C 3 hg rebase -b 4 -d 3 --keepbranches -q hg glog --template '{rev}:{desc}:{branches}\n' echo '% dirstate branch should be "notdefault"' hg branch