Mercurial > hg
view tests/test-diff-upgrade @ 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 | e451e599fbcf |
children | 4484a7b661f2 9b3913baba0c |
line wrap: on
line source
#!/bin/sh echo "[extensions]" >> $HGRCPATH echo "autodiff=$TESTDIR/autodiff.py" >> $HGRCPATH echo "[diff]" >> $HGRCPATH echo "nodates=1" >> $HGRCPATH hg init repo cd repo echo '% make a combination of new, changed and deleted file' echo regular > regular echo rmregular > rmregular touch rmempty echo exec > exec chmod +x exec echo rmexec > rmexec chmod +x rmexec echo setexec > setexec echo unsetexec > unsetexec chmod +x unsetexec echo binary > binary python -c "file('rmbinary', 'wb').write('\0')" hg ci -Am addfiles echo regular >> regular echo newregular >> newregular rm rmempty touch newempty rm rmregular echo exec >> exec echo newexec > newexec chmod +x newexec rm rmexec chmod +x setexec chmod -x unsetexec python -c "file('binary', 'wb').write('\0\0')" python -c "file('newbinary', 'wb').write('\0')" rm rmbinary hg addremove echo '% git=no: regular diff for all files' hg autodiff --git=no echo '% git=no: git diff for single regular file' hg autodiff --git=yes regular echo '% git=auto: regular diff for regular files and removals' hg autodiff --git=auto regular newregular rmregular rmbinary rmexec for f in exec newexec setexec unsetexec binary newbinary newempty rmempty; do echo '% git=auto: git diff for' $f hg autodiff --git=auto $f done echo '% git=warn: regular diff with data loss warnings' hg autodiff --git=warn echo '% git=abort: fail on execute bit change' hg autodiff --git=abort regular setexec echo '% git=abort: succeed on regular file' hg autodiff --git=abort regular cd ..