Mercurial > hg
view tests/test-rebase-conflicts @ 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 | 2313dc4d9817 |
children |
line wrap: on
line source
#!/bin/sh . $TESTDIR/helpers.sh echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH hg init a cd a echo 'c1' >common hg add common hg commit -d '0 0' -m "C1" echo 'c2' >>common hg commit -d '1 0' -m "C2" echo 'c3' >>common hg commit -d '2 0' -m "C3" hg update -C 1 echo 'l1' >>extra hg add extra hg commit -d '3 0' -m "L1" sed -e 's/c2/l2/' common > common.new mv common.new common hg commit -d '4 0' -m "L2" echo 'l3' >> extra2 hg add extra2 hg commit -d '5 0' -m "L3" hg glog --template '{rev}: {desc}\n' echo echo '% Try to call --continue' hg rebase --continue echo echo '% Conflicting rebase' hg rebase -s 3 -d 2 echo echo '% Try to continue without solving the conflict' hg rebase --continue echo echo '% Conclude rebase' echo 'resolved merge' >common hg resolve -m common hg rebase --continue | cleanrebase hg glog --template '{rev}: {desc}\n' echo echo '% Check correctness' echo ' - Rev. 0' hg cat -r 0 common echo ' - Rev. 1' hg cat -r 1 common echo ' - Rev. 2' hg cat -r 2 common echo ' - Rev. 3' hg cat -r 3 common echo ' - Rev. 4' hg cat -r 4 common echo ' - Rev. 5' hg cat -r 5 common