Mercurial > hg
view tests/test-mq-git @ 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 | 8cb81d75730c |
children |
line wrap: on
line source
#!/bin/sh # Test the plumbing of mq.git option # Automatic upgrade itself is tested elsewhere. echo "[extensions]" >> $HGRCPATH echo "mq=" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "nodates=1" >> $HGRCPATH hg init repo-auto cd repo-auto echo '% git=auto: regular patch creation' echo a > a hg add a hg qnew -d '0 0' -f adda cat .hg/patches/adda echo '% git=auto: git patch creation with copy' hg cp a b hg qnew -d '0 0' -f copy cat .hg/patches/copy echo '% git=auto: git patch when using --git' echo regular > regular hg add regular hg qnew -d '0 0' --git -f git cat .hg/patches/git echo '% git=auto: regular patch after qrefresh without --git' hg qrefresh -d '0 0' cat .hg/patches/git cd .. hg init repo-keep cd repo-keep echo '[mq]' > .hg/hgrc echo 'git = KEEP' >> .hg/hgrc echo '% git=keep: git patch with --git' echo a > a hg add a hg qnew -d '0 0' -f --git git cat .hg/patches/git echo '% git=keep: git patch after qrefresh without --git' echo a >> a hg qrefresh -d '0 0' cat .hg/patches/git cd .. hg init repo-yes cd repo-yes echo '[mq]' > .hg/hgrc echo 'git = yes' >> .hg/hgrc echo '% git=yes: git patch' echo a > a hg add a hg qnew -d '0 0' -f git cat .hg/patches/git echo '% git=yes: git patch after qrefresh' echo a >> a hg qrefresh -d '0 0' cat .hg/patches/git cd .. hg init repo-no cd repo-no echo '[diff]' > .hg/hgrc echo 'git = True' >> .hg/hgrc echo '[mq]' > .hg/hgrc echo 'git = False' >> .hg/hgrc echo '% git=no: regular patch with copy' echo a > a hg add a hg qnew -d '0 0' -f adda hg cp a b hg qnew -d '0 0' -f regular cat .hg/patches/regular echo '% git=no: regular patch after qrefresh with copy' hg cp a c hg qrefresh -d '0 0' cat .hg/patches/regular cd ..