Mercurial > hg
annotate tests/test-convert-svn-move.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.)
author | Brodie Rao <brodie@bitheap.org> |
---|---|
date | Fri, 10 Sep 2010 09:30:50 -0500 |
parents | 87dcf758309d |
children |
rev | line source |
---|---|
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
1 % convert trunk and branches |
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
2 initializing destination A-hg repository |
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
3 scanning source... |
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
4 sorting... |
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
5 converting... |
11124
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
6 13 createtrunk |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
7 12 moved1 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
8 11 moved1 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
9 10 moved2 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
10 9 changeb and rm d2 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
11 8 changeb and rm d2 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
12 7 moved1again |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
13 6 moved1again |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
14 5 copyfilefrompast |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
15 4 copydirfrompast |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
16 3 add d3 |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
17 2 copy dir and remove subdir |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
18 1 add d4old |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
19 0 rename d4old into d4new |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
20 o 13 rename d4old into d4new files: d4new/g d4old/g |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
21 | |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
22 o 12 add d4old files: d4old/g |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
23 | |
8884
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
7475
diff
changeset
|
24 o 11 copy dir and remove subdir files: d3/d31/e d4/d31/e d4/f |
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
7475
diff
changeset
|
25 | |
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
7475
diff
changeset
|
26 o 10 add d3 files: d3/d31/e d3/f |
8b603c7c808e
convert/svn: remove dead code from entry deletion code path
Patrick Mezard <pmezard@gmail.com>
parents:
7475
diff
changeset
|
27 | |
6546
075b2c9aed37
convert: fix svn file copy detection code
Patrick Mezard <pmezard@gmail.com>
parents:
6543
diff
changeset
|
28 o 9 copydirfrompast files: d2/d |
075b2c9aed37
convert: fix svn file copy detection code
Patrick Mezard <pmezard@gmail.com>
parents:
6543
diff
changeset
|
29 | |
075b2c9aed37
convert: fix svn file copy detection code
Patrick Mezard <pmezard@gmail.com>
parents:
6543
diff
changeset
|
30 o 8 copyfilefrompast files: d |
6543
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
31 | |
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
32 o 7 moved1again files: d1/b d1/c |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
33 | |
6543
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
34 | o 6 moved1again files: |
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
35 | | |
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
36 o | 5 changeb and rm d2 files: d1/b d2/d |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
37 | | |
6543
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
38 | o 4 changeb and rm d2 files: b |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
39 | | |
6543
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
40 o | 3 moved2 files: d2/d |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
41 | | |
5957
971a17af5982
convert: prevent svn branches to leave the root module tree
Patrick Mezard <pmezard@gmail.com>
parents:
5955
diff
changeset
|
42 o | 2 moved1 files: d1/b d1/c |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
43 | | |
5957
971a17af5982
convert: prevent svn branches to leave the root module tree
Patrick Mezard <pmezard@gmail.com>
parents:
5955
diff
changeset
|
44 | o 1 moved1 files: b c |
971a17af5982
convert: prevent svn branches to leave the root module tree
Patrick Mezard <pmezard@gmail.com>
parents:
5955
diff
changeset
|
45 | |
971a17af5982
convert: prevent svn branches to leave the root module tree
Patrick Mezard <pmezard@gmail.com>
parents:
5955
diff
changeset
|
46 o 0 createtrunk files: |
5955
c4496b7c10ce
convert: fix svn_source.latest()
Patrick Mezard <pmezard@gmail.com>
parents:
diff
changeset
|
47 |
11124
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
48 % check move copy records |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
49 A d4new/g |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
50 d4old/g |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
51 R d4old/g |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
52 % check branches |
55abde5cba43
test-convert-svn-move: test moved dirs copy records
Patrick Mezard <pmezard@gmail.com>
parents:
8884
diff
changeset
|
53 default 13: |
6543
a6e2e60b34d0
convert: handle past or foreign partial svn copies
Patrick Mezard <pmezard@gmail.com>
parents:
5957
diff
changeset
|
54 d1 6: |
11128
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
55 % convert files being replaced by directories |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
56 initializing destination hg-repo repository |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
57 scanning source... |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
58 sorting... |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
59 converting... |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
60 3 initial |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
61 2 clobber symlink |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
62 1 clobber1 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
63 0 clobber2 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
64 % manifest before |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
65 644 a |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
66 644 d/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
67 644 @ dlink |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
68 644 @ dlink2 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
69 644 dlink3 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
70 % manifest after clobber1 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
71 644 a/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
72 644 d/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
73 644 dlink/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
74 644 @ dlink2 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
75 644 dlink3 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
76 % manifest after clobber2 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
77 644 a/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
78 644 d/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
79 644 dlink/b |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
80 644 @ dlink2 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
81 644 @ dlink3 |
a9b427b5821e
convert/svn: handle files/links replaced by dirs (issue2166)
Patrick Mezard <pmezard@gmail.com>
parents:
11124
diff
changeset
|
82 % try updating |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
83 % test convert progress bar |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
84 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
85 scanning [ <=> ] 1 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
86 scanning [ <=> ] 2 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
87 scanning [ <=> ] 3 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
88 scanning [ <=> ] 4 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
89 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
90 converting [ ] 0/4 |
11731
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
91 getting files [==========> ] 1/5 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
92 getting files [======================> ] 2/5 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
93 getting files [==================================> ] 3/5 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
94 getting files [==============================================> ] 4/5 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
95 getting files [==========================================================>] 5/5 |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
96 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
97 converting [==============> ] 1/4 |
11137
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
98 scanning paths [ ] 0/1 |
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
99 |
11731
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
100 getting files [==========================================================>] 1/1 |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
101 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
102 converting [==============================> ] 2/4 |
11137
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
103 scanning paths [ ] 0/2 |
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
104 scanning paths [============================> ] 1/2 |
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
105 |
11731
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
106 getting files [=============> ] 1/4 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
107 getting files [============================> ] 2/4 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
108 getting files [===========================================> ] 3/4 |
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
109 getting files [==========================================================>] 4/4 |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
110 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
111 converting [=============================================> ] 3/4 |
11137
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
112 scanning paths [ ] 0/1 |
94afe7bc87a9
convert/svn: report path discovery progress
Patrick Mezard <pmezard@gmail.com>
parents:
11136
diff
changeset
|
113 |
11731
87dcf758309d
convert/progress: use plural and avoid retrieving
timeless <timeless@gmail.com>
parents:
11137
diff
changeset
|
114 getting files [==========================================================>] 1/1 |
11135
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
115 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
116 initializing destination hg-progress repository |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
117 scanning source... |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
118 sorting... |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
119 converting... |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
120 3 initial |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
121 2 clobber symlink |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
122 1 clobber1 |
73a4ed3bfef8
convert: add progress support
Patrick Mezard <pmezard@gmail.com>
parents:
11128
diff
changeset
|
123 0 clobber2 |