Mercurial > hg

comparison tests/test-convert-darcs.out @ 12252:4481f8a93c7a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f2618cacb485
children 84ceedcfeb6a
comparison
equal deleted inserted replaced
12247:bf2afc4bbbeb 12252:4481f8a93c7a
10 ./a 10 ./a
11 Finished pulling and applying. 11 Finished pulling and applying.
12 Finished recording patch 'p2' 12 Finished recording patch 'p2'
13 % test file and directory move 13 % test file and directory move
14 Finished recording patch 'p3' 14 Finished recording patch 'p3'
15 % test utf-8 commit message and author
16 Finished recording patch 'p4: desc ñ'
15 initializing destination darcs-repo-hg repository 17 initializing destination darcs-repo-hg repository
16 scanning source... 18 scanning source...
17 sorting... 19 sorting...
18 converting... 20 converting...
19 4 p0 21 5 p0
20 3 p1.2 22 4 p1.2
21 2 p1.1 23 3 p1.1
22 1 p2 24 2 p2
23 0 p3 25 1 p3
24 o 4 "p3" files: dir/d dir/d2 dir2/d f ff 26 0 p4: desc ?
27 o 5 "p4: desc ñ" (author ñ) files: g
25 | 28 |
26 o 3 "p2" files: a dir/d dir/d2 f 29 o 4 "p3" (test@example.org) files: dir/d dir/d2 dir2/d f ff
27 | 30 |
28 o 2 "p1.1" files: 31 o 3 "p2" (test@example.org) files: a dir/d dir/d2 f
29 | 32 |
30 o 1 "p1.2" files: a b 33 o 2 "p1.1" (test@example.org) files:
31 | 34 |
32 o 0 "p0" files: a 35 o 1 "p1.2" (test@example.org) files: a b
36 |
37 o 0 "p0" (test@example.org) files: a
33 38
34 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a 39 7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
35 1e88685f5ddec574a34c70af492f95b6debc8741 644 b 40 1e88685f5ddec574a34c70af492f95b6debc8741 644 b
36 37406831adc447ec2385014019599dfec953c806 644 dir2/d 41 37406831adc447ec2385014019599dfec953c806 644 dir2/d
37 b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff 42 b783a337463792a5c7d548ad85a7d3253c16ba8c 644 ff
43 0973eb1b2ecc4de7fafe7447ce1b7462108b4848 644 g