view tests/test-strip-cross.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.)

crossed/.hg/store/00manifest.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0     112      0       0 6f105cbb914d 000000000000 000000000000
     1       112      56      1       3 1b55917b3699 000000000000 000000000000
     2       168     123      1       1 8f3d04e263e5 000000000000 000000000000
     3       291     122      1       2 f0ef8726ac4f 000000000000 000000000000
     4       413      87      4       4 0b76e38b4070 000000000000 000000000000

crossed/.hg/store/data/012.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 b8e02f643373 000000000000 000000000000
     1         3       3      1       1 5d9299349fc0 000000000000 000000000000
     2         6       3      2       2 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/021.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       0 b8e02f643373 000000000000 000000000000
     1         3       3      1       2 5d9299349fc0 000000000000 000000000000
     2         6       3      2       1 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/102.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       1 b8e02f643373 000000000000 000000000000
     1         3       3      1       0 5d9299349fc0 000000000000 000000000000
     2         6       3      2       2 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/120.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       1 b8e02f643373 000000000000 000000000000
     1         3       3      1       2 5d9299349fc0 000000000000 000000000000
     2         6       3      2       0 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/201.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       2 b8e02f643373 000000000000 000000000000
     1         3       3      1       0 5d9299349fc0 000000000000 000000000000
     2         6       3      2       1 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/210.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       2 b8e02f643373 000000000000 000000000000
     1         3       3      1       1 5d9299349fc0 000000000000 000000000000
     2         6       3      2       0 2661d26c6496 000000000000 000000000000

crossed/.hg/store/data/manifest-file.i
   rev    offset  length   base linkrev nodeid       p1           p2
     0         0       3      0       3 b8e02f643373 000000000000 000000000000
     1         3       3      1       4 5d9299349fc0 000000000000 000000000000

% Trying to strip revision 0
saved backup bundle to 
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 15 total revisions

% Trying to strip revision 1
saved backup bundle to 
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 14 total revisions

% Trying to strip revision 2
saved backup bundle to 
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 14 total revisions

% Trying to strip revision 3
saved backup bundle to 
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 19 total revisions

% Trying to strip revision 4
saved backup bundle to 
% Verifying
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
7 files, 4 changesets, 19 total revisions