view tests/test-mq-qdelete @ 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.

#!/bin/sh

echo "[extensions]" >> $HGRCPATH
echo "mq=" >> $HGRCPATH

hg init a
cd a

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew -d '1 0' c

hg qdel

hg qdel c
hg qpop
hg qdel c
hg qseries
ls .hg/patches
hg qpop
hg qdel -k 1
ls .hg/patches
hg qdel -r a
hg qapplied
hg log --template '{rev} {desc}\n'

hg qnew d
hg qnew e
hg qnew f

hg qdel -r e
hg qdel -r qbase:e
hg qapplied
hg log --template '{rev} {desc}\n'

cd ..
hg init b
cd b

echo 'base' > base
hg ci -Ambase -d '1 0'

hg qfinish
hg qfinish -a

hg qnew -d '1 0' a
hg qnew -d '1 0' b
hg qnew c # XXX fails to apply by /usr/bin/patch if we put a date

hg qfinish 0
hg qfinish b

hg qpop
hg qfinish -a c
hg qpush

hg qfinish qbase:b
hg qapplied
hg log --template '{rev} {desc}\n'

hg qfinish -a c
hg qapplied
hg log --template '{rev} {desc}\n'
ls .hg/patches