Mercurial > hg
view tests/test-custom-filters @ 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 | a964ab624385 |
children |
line wrap: on
line source
#!/bin/sh hg init cat > .hg/hgrc <<EOF [extensions] prefixfilter = prefix.py [encode] *.txt = stripprefix: Copyright 2046, The Masters [decode] *.txt = insertprefix: Copyright 2046, The Masters EOF cat > prefix.py <<EOF from mercurial import util def stripprefix(s, cmd, filename, **kwargs): header = '%s\n' % cmd if s[:len(header)] != header: raise util.Abort('missing header "%s" in %s' % (cmd, filename)) return s[len(header):] def insertprefix(s, cmd): return '%s\n%s' % (cmd, s) def reposetup(ui, repo): repo.adddatafilter('stripprefix:', stripprefix) repo.adddatafilter('insertprefix:', insertprefix) EOF cat > .hgignore <<EOF .hgignore prefix.py prefix.pyc EOF cat > stuff.txt <<EOF Copyright 2046, The Masters Some stuff to ponder very carefully. EOF hg add stuff.txt hg ci -m stuff echo '% Repository data:' hg cat stuff.txt echo '% Fresh checkout:' rm stuff.txt hg up -C cat stuff.txt echo >> stuff.txt <<EOF Very very carefully. EOF hg stat cat > morestuff.txt <<EOF Unauthorized material subject to destruction. EOF echo '% Problem encoding:' hg add morestuff.txt hg ci -m morestuff hg stat