view tests/test-rebase-mq-skip.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.)

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

% "Mainstream" import p1.patch
1 files updated, 0 files merged, 2 files removed, 0 files unresolved
applying p1.patch

% Rebase
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
saved backup bundle to 
@  3 P0 tags: p0.patch qbase qtip tip
|
o  2 P1 tags: qparent
|
o  1 R1 tags:
|
o  0 C1 tags:


% Now with --continue
adding r0
adding r1
adding r2
adding r3
adding r4
adding r5
adding r6
0 files updated, 0 files merged, 6 files removed, 0 files unresolved
adding r1
created new head
adding r3
adding r7
adding r8
adding r4
adding r6
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
abort: fix unresolved conflicts with hg resolve then run hg rebase --continue
saved backup bundle to 
@  9 r5 tags: 5.diff qtip tip
|
o  8 r4 tags: 4.diff
|
o  7 r2 tags: 2.diff qbase
|
o  6 branch2-r6 tags: qparent
|
o  5 branch2-r4 tags:
|
o  4 branch2-r8 tags:
|
o  3 branch2-r7 tags:
|
o  2 branch2-r3 tags:
|
o  1 branch2-r1 tags:
|
o  0 r0 tags: