view tests/test-mq-qdelete.out @ 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 561ff8d9e4f0
children
line wrap: on
line source

adding base
abort: qdelete requires at least one revision or patch name
abort: cannot delete applied patch c
popping c
now at: b
a
b
a
b
series
status
popping b
now at: a
a
b
series
status
patch a finalized without changeset message
1 [mq]: a
0 base
abort: cannot delete revision 3 above applied patches
patch d finalized without changeset message
patch e finalized without changeset message
f
4 [mq]: f
3 [mq]: e
2 [mq]: d
1 [mq]: a
0 base
adding base
abort: no revisions specified
no patches applied
abort: revision 0 is not managed
abort: cannot delete revision 2 above applied patches
popping c
now at: b
abort: unknown revision 'c'!
applying c
patch c is empty
now at: c
patch a finalized without changeset message
patch b finalized without changeset message
c
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
patch c finalized without changeset message
3 imported patch c
2 [mq]: b
1 [mq]: a
0 base
series
status