view tests/test-merge-remove.out @ 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.)

created new head
merging foo1 and foo to foo1
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
% removing foo1 and bar
r   0         -2 bar
r   0         -1 foo1
copy: foo -> foo1
R bar
R foo1
% readding foo1 and bar
adding bar
adding foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo
% reverting foo1 and bar
saving current version of bar as bar.orig
reverting bar
saving current version of foo1 as foo1.orig
reverting foo1
n   0         -2 bar
m 644         14 foo1
copy: foo -> foo1
M bar
M foo1
  foo