annotate tests/test-mq-qclone-http.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 662b0f9eb148
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
6205
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
1 adding a
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
2 adding b
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
3 [mq]: b.patch
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
4 a
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
5 b.patch
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
6 % test with recursive collection
6205
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
7 200 Script output follows
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
8
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
9
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
10 /a/
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
11 /a/.hg/patches/
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
12
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
13 requesting all changes
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
14 adding changesets
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
15 adding manifests
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
16 adding file changes
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
17 added 2 changesets with 2 changes to 2 files
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
18 requesting all changes
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
19 adding changesets
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
20 adding manifests
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
21 adding file changes
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
22 added 1 changesets with 3 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 7627
diff changeset
23 updating to branch default
6205
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
24 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
26 a
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
27 applying b.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7525
diff changeset
28 now at: b.patch
6205
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
29 imported patch b.patch
b193a6e59131 mq: test for qclone of http repo+queue
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
diff changeset
30 a
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
31 % test with normal collection
7524
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
32 200 Script output follows
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
33
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
34
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
35 /a/
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
36 /a/.hg/patches/
7524
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
37
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
38 requesting all changes
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
39 adding changesets
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
40 adding manifests
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
41 adding file changes
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
42 added 2 changesets with 2 changes to 2 files
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
43 requesting all changes
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
44 adding changesets
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
45 adding manifests
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
46 adding file changes
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
47 added 1 changesets with 3 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 7627
diff changeset
48 updating to branch default
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
49 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
7524
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
50 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
51 a
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
52 applying b.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7525
diff changeset
53 now at: b.patch
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
54 imported patch b.patch
7524
7fc19b12cb6b tests: fix test-mq-qclone-http (broken by e60aaae83323)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 6338
diff changeset
55 a
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
56 % test with old-style collection
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
57 200 Script output follows
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
58
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
59
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
60 /a/
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
61 /a/.hg/patches/
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
62
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
63 requesting all changes
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
64 adding changesets
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
65 adding manifests
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
66 adding file changes
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
67 added 2 changesets with 2 changes to 2 files
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
68 requesting all changes
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
69 adding changesets
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
70 adding manifests
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
71 adding file changes
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
72 added 1 changesets with 3 changes to 3 files
9611
a3d73b3e1f8a hg.clone: report branch name on update
Adrian Buehlmann <adrian@cadifra.com>
parents: 7627
diff changeset
73 updating to branch default
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
74 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
76 a
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
77 applying b.patch
7627
fb32ae9c76e7 mq: lowercase output
Martin Geisler <mg@daimi.au.dk>
parents: 7525
diff changeset
78 now at: b.patch
7525
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
79 imported patch b.patch
6a49fa7674c1 hgweb: mq repos should be in non-recursive collections, too
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 7524
diff changeset
80 a
10427
400ffd5f2f14 test-mq-qclone: test --mq option
Patrick Mezard <pmezard@gmail.com>
parents: 9611
diff changeset
81 % test --mq works and uses correct repository config
10442
662b0f9eb148 test-mq-qclone-http: hide port number
Martin Geisler <mg@lazybytes.net>
parents: 10427
diff changeset
82 comparing with http://localhost:$HGPORT2/a/.hg/patches
10427
400ffd5f2f14 test-mq-qclone: test --mq option
Patrick Mezard <pmezard@gmail.com>
parents: 9611
diff changeset
83 searching for changes
400ffd5f2f14 test-mq-qclone: test --mq option
Patrick Mezard <pmezard@gmail.com>
parents: 9611
diff changeset
84 no changes found
400ffd5f2f14 test-mq-qclone: test --mq option
Patrick Mezard <pmezard@gmail.com>
parents: 9611
diff changeset
85 0 b.patch