Mercurial > hg
view tests/test-mq-strip @ 12252:4481f8a93c7a stable
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.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | 64f284da1278 |
children | e2bce1c717fa |
line wrap: on
line source
#!/bin/sh . $TESTDIR/helpers.sh echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH teststrip() { hg up -C $1 echo % before update $1, strip $2 hg parents hg strip $2 | hidebackup echo % after update $1, strip $2 hg parents hg unbundle -q .hg/strip-backup/* rm .hg/strip-backup/* } hg init test cd test echo foo > bar hg ci -Ama echo more >> bar hg ci -Amb echo blah >> bar hg ci -Amc hg up 1 echo blah >> bar hg ci -Amd echo final >> bar hg ci -Ame hg log teststrip 4 4 teststrip 4 3 teststrip 1 4 teststrip 4 2 teststrip 4 1 teststrip null 4 hg log hg up -C 2 hg merge 4 echo % before strip of merge parent hg parents hg strip 4 2>&1 | hidebackup echo % after strip of merge parent hg parents #strip of applied mq should cleanup status file hg up -C 3 echo fooagain >> bar hg ci -mf hg qimport -r tip:2 echo % applied patches before strip hg qapplied echo % stripping revision in queue hg strip 3 | hidebackup echo % applied patches after stripping rev in queue hg qapplied echo % stripping ancestor of queue hg strip 1 | hidebackup echo % applied patches after stripping ancestor of queue hg qapplied