annotate tests/test-mq-safety @ 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.)

#!/bin/sh

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

hg init repo
cd repo

echo foo > foo
hg ci -qAm 'add a file'

hg qinit

hg qnew foo
echo foo >> foo
hg qrefresh -m 'append foo'

hg qnew bar
echo bar >> foo
hg qrefresh -m 'append bar'

echo '% try to commit on top of a patch'
echo quux >> foo
hg ci -m 'append quux'

# cheat a bit...
mv .hg/patches .hg/patches2
hg ci -m 'append quux'
mv .hg/patches2 .hg/patches

echo '% qpop/qrefresh on the wrong revision'
hg qpop
hg qpop -n patches 2>&1 | sed -e 's/\(using patch queue:\).*/\1/'
hg qrefresh

hg up -C qtip
echo '% qpop'
hg qpop

echo '% qrefresh'
hg qrefresh

echo '% tip:'
hg tip --template '{rev} {desc}\n'

echo '% qpush warning branchheads'
cd ..
hg init branchy
cd branchy
echo q > q
hg add q
hg qnew -f qp
hg qpop
echo a > a
hg ci -Ama
hg up null
hg branch b
echo c > c
hg ci -Amc
hg merge default
hg ci -mmerge
hg up default
hg log
hg qpush