Adrian Buehlmann <adrian@cadifra.com> [Sun, 12 Sep 2010 11:52:13 +0200] rev 12259
tests: unify test-merge-prompt
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 21:19:12 +0200] rev 12258
tests: unify test-merge-local
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 20:04:35 +0200] rev 12257
tests: unify test-merge-internal-tools-pattern
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 17:58:37 +0200] rev 12256
tests: unify test-merge-force
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 11:44:53 +0200] rev 12255
tests: unify test-merge-default
Adrian Buehlmann <adrian@cadifra.com> [Sat, 11 Sep 2010 11:18:47 +0200] rev 12254
tests: unify test-merge-commit
Adrian Buehlmann <adrian@cadifra.com> [Fri, 10 Sep 2010 23:13:59 +0200] rev 12253
tests: unify test-manifest*
Brodie Rao <brodie@bitheap.org> [Fri, 10 Sep 2010 09:30:50 -0500] rev 12252
convert/darcs: handle non-ASCII metadata in darcs changelog (issue2354)
Given a commit author or message with non-ASCII characters in a darcs
repo, convert would raise a UnicodeEncodeError when adding changesets
to the hg changelog.
This happened because etree returns back unicode objects for any text
it can't encode into ASCII. convert was passing these objects to
changelog.add(), which would then attempt encoding.fromlocal() on
them.
This patch ensures converter_source.recode() is called on each piece
of commit data returned by etree.
(Also note that darcs is currently encoding agnostic and will print
out whatever is in a patch's metadata byte-for-byte, even in the XML
changelog.)
Matt Mackall <mpm@selenic.com> [Sat, 11 Sep 2010 16:17:43 -0500] rev 12251
merge with crew
Dirkjan Ochtman <dirkjan@ochtman.nl> [Sat, 11 Sep 2010 10:57:35 +0200] rev 12250
tests: fix incompatibility with python-2.4 in test-hgweb
Thanks to lcantey for catching it.