Matt Mackall <mpm@selenic.com> [Wed, 14 Mar 2012 14:45:41 -0500] rev 16257
merge: accept missing revisions in symlink flag merge (issue3316)
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 16:29:13 -0500] rev 16256
merge with stable
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 16:28:08 -0500] rev 16255
merge: handle linear update to symlink correctly (issue3316)
This fixes a regression introduced by fcf66193b186. If no file-level
merge is needed, we can update flags directly, otherwise we have a
conflict to resolve in filemerge.
Matt Mackall <mpm@selenic.com> [Tue, 13 Mar 2012 15:12:26 -0500] rev 16254
filemerge: restore default prompt for binary/symlink lost in 83925d3a4559
This could result in a traceback.
Matt Mackall <mpm@selenic.com> [Mon, 12 Mar 2012 17:05:42 -0500] rev 16253
merge with stable
Wagner Bruna <wbruna@softwareexpress.com.br> [Mon, 12 Mar 2012 17:02:45 -0300] rev 16252
strip: enhance repair.strip to receive a list of nodes (issue3299)
Originally, mq.strip called repair.strip a single rev at a time.
repair.strip stores in a backup bundle any revision greater than
the revision being stripped, strips, then restores the backup with
repo.addchangegroup. So, when stripping revisions on more than one
topological branch, some could end up being restored from the backup
bundle, only to be later removed by a subsequent repair.strip call.
But repo.addchangegroup calls hooks for all those restore operations.
And 9df9444e96ec changed it to delay all hook calls until the
repository lock were released - by mq.strip, after stripping all
revisions. Thus, the hooks could be called over revisions already
removed from the repository at that point.
By generating the revision lists at once inside repo.strip, we avoid
calling addchangegroup for temporary restores. Incidentally, this
also avoids creating many backup files for a single strip command.
"Yann E. MORIN" <yann.morin.1998@free.fr> [Wed, 07 Mar 2012 01:02:12 +0100] rev 16251
templates/filters: add doctest to the 'person' filter
Add a doctest with an hopefuly-comprehensive list of combinations
we can expect in real-life situations.
This does not cover corner cases, for example when a CR or LF is
embedded in the name (allowed by RFC 5322!).
Code in tests/test-doctest.py contributed by:
Martin Geisler <mg@aragost.com>
Thanks!
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
"Yann E. MORIN" <yann.morin.1998@free.fr> [Fri, 09 Mar 2012 22:54:17 +0100] rev 16250
help: strip doctest from dochelp
When a dochelp string contains doctest code, the doctest
code is not stripped, so the help also displays the doctest.
Just stop parsing dochelp at the first hint of a doctest
section (starting with >>>).
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Matt Mackall <mpm@selenic.com> [Mon, 12 Mar 2012 13:37:39 -0500] rev 16249
pvec: introduce pvecs
Na'Tosha Bard <natosha@unity3d.com> [Fri, 09 Mar 2012 17:11:07 +0100] rev 16248
largefiles: fix check-code errors.