##// END OF EJS Templates
Fixes test-encoding for python2.3 and minor cleanups:...
Thomas Arendsen Hein -
r3839:3820385f default
parent child Browse files
Show More
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
@@ -16,17 +16,17 b' EOF'
16 echo % should fail with encoding error
16 echo % should fail with encoding error
17 echo "plain old ascii" > a
17 echo "plain old ascii" > a
18 hg st
18 hg st
19 HGENCODING=ascii hg ci -l latin-1 -d "0 0"
19 HGENCODING=ascii hg ci -l latin-1 -d "1000000 0"
20
20
21 echo % these should work
21 echo % these should work
22 echo "latin-1" > a
22 echo "latin-1" > a
23 HGENCODING=latin-1 hg ci -l latin-1 -d "0 0"
23 HGENCODING=latin-1 hg ci -l latin-1 -d "1000000 0"
24 echo "utf-8" > a
24 echo "utf-8" > a
25 HGENCODING=utf-8 hg ci -l utf-8 -d "0 0"
25 HGENCODING=utf-8 hg ci -l utf-8 -d "1000000 0"
26
26
27 HGENCODING=latin-1 hg tag -d "0 0" `cat latin-1-tag`
27 HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag`
28 cp latin-1-tag .hg/branch
28 cp latin-1-tag .hg/branch
29 HGENCODING=latin-1 hg ci -d "0 0" -m 'latin1 branch'
29 HGENCODING=latin-1 hg ci -d "1000000 0" -m 'latin1 branch'
30 rm .hg/branch
30 rm .hg/branch
31
31
32 echo % ascii
32 echo % ascii
@@ -49,6 +49,6 b' echo % utf-8'
49 HGENCODING=utf-8 hg branches
49 HGENCODING=utf-8 hg branches
50
50
51 echo '[ui]' >> .hg/hgrc
51 echo '[ui]' >> .hg/hgrc
52 echo 'fallbackencoding = euc-jp' >> .hg/hgrc
52 echo 'fallbackencoding = koi8-r' >> .hg/hgrc
53 echo % utf-8
53 echo % utf-8
54 HGENCODING=utf-8 hg log
54 HGENCODING=utf-8 hg log
@@ -15,153 +15,153 b' transaction abort!'
15 rollback completed
15 rollback completed
16 % these should work
16 % these should work
17 % ascii
17 % ascii
18 changeset: 5:e4ed49b8a8f0
18 changeset: 5:db5520b4645f
19 branch: ?
19 branch: ?
20 tag: tip
20 tag: tip
21 user: test
21 user: test
22 date: Thu Jan 01 00:00:00 1970 +0000
22 date: Mon Jan 12 13:46:40 1970 +0000
23 summary: latin1 branch
23 summary: latin1 branch
24
24
25 changeset: 4:a02ca5a58e99
25 changeset: 4:9cff3c980b58
26 user: test
26 user: test
27 date: Thu Jan 01 00:00:00 1970 +0000
27 date: Mon Jan 12 13:46:40 1970 +0000
28 summary: Added tag ? for changeset d47908dab82f
28 summary: Added tag ? for changeset 770b9b11621d
29
29
30 changeset: 3:d47908dab82f
30 changeset: 3:770b9b11621d
31 tag: ?
31 tag: ?
32 user: test
32 user: test
33 date: Thu Jan 01 00:00:00 1970 +0000
33 date: Mon Jan 12 13:46:40 1970 +0000
34 summary: utf-8 e' encoded: ?
34 summary: utf-8 e' encoded: ?
35
35
36 changeset: 2:9db1985f3097
36 changeset: 2:0572af48b948
37 user: test
37 user: test
38 date: Thu Jan 01 00:00:00 1970 +0000
38 date: Mon Jan 12 13:46:40 1970 +0000
39 summary: latin-1 e' encoded: ?
39 summary: latin-1 e' encoded: ?
40
40
41 changeset: 1:af6e0db4427c
41 changeset: 1:0e5b7e3f9c4a
42 user: test
42 user: test
43 date: Thu Jan 01 00:00:00 1970 +0000
43 date: Mon Jan 12 13:46:40 1970 +0000
44 summary: euc-jp: ?????? = u'\u65e5\u672c\u8a9e'
44 summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c'
45
45
46 changeset: 0:60aad1dd20a9
46 changeset: 0:1e78a93102a3
47 user: test
47 user: test
48 date: Thu Jan 01 00:00:00 1970 +0000
48 date: Mon Jan 12 13:46:40 1970 +0000
49 summary: latin-1 e': ?
49 summary: latin-1 e': ? = u'\xe9'
50
50
51 % latin-1
51 % latin-1
52 changeset: 5:e4ed49b8a8f0
52 changeset: 5:db5520b4645f
53 branch: �
53 branch: �
54 tag: tip
54 tag: tip
55 user: test
55 user: test
56 date: Thu Jan 01 00:00:00 1970 +0000
56 date: Mon Jan 12 13:46:40 1970 +0000
57 summary: latin1 branch
57 summary: latin1 branch
58
58
59 changeset: 4:a02ca5a58e99
59 changeset: 4:9cff3c980b58
60 user: test
60 user: test
61 date: Thu Jan 01 00:00:00 1970 +0000
61 date: Mon Jan 12 13:46:40 1970 +0000
62 summary: Added tag � for changeset d47908dab82f
62 summary: Added tag � for changeset 770b9b11621d
63
63
64 changeset: 3:d47908dab82f
64 changeset: 3:770b9b11621d
65 tag: �
65 tag: �
66 user: test
66 user: test
67 date: Thu Jan 01 00:00:00 1970 +0000
67 date: Mon Jan 12 13:46:40 1970 +0000
68 summary: utf-8 e' encoded: �
68 summary: utf-8 e' encoded: �
69
69
70 changeset: 2:9db1985f3097
70 changeset: 2:0572af48b948
71 user: test
71 user: test
72 date: Thu Jan 01 00:00:00 1970 +0000
72 date: Mon Jan 12 13:46:40 1970 +0000
73 summary: latin-1 e' encoded: �
73 summary: latin-1 e' encoded: �
74
74
75 changeset: 1:af6e0db4427c
75 changeset: 1:0e5b7e3f9c4a
76 user: test
76 user: test
77 date: Thu Jan 01 00:00:00 1970 +0000
77 date: Mon Jan 12 13:46:40 1970 +0000
78 summary: euc-jp: ���ܸ� = u'\u65e5\u672c\u8a9e'
78 summary: koi8-r: ����� = u'\u0440\u0442\u0443\u0442\u044c'
79
79
80 changeset: 0:60aad1dd20a9
80 changeset: 0:1e78a93102a3
81 user: test
81 user: test
82 date: Thu Jan 01 00:00:00 1970 +0000
82 date: Mon Jan 12 13:46:40 1970 +0000
83 summary: latin-1 e': �
83 summary: latin-1 e': � = u'\xe9'
84
84
85 % utf-8
85 % utf-8
86 changeset: 5:e4ed49b8a8f0
86 changeset: 5:db5520b4645f
87 branch: é
87 branch: é
88 tag: tip
88 tag: tip
89 user: test
89 user: test
90 date: Thu Jan 01 00:00:00 1970 +0000
90 date: Mon Jan 12 13:46:40 1970 +0000
91 summary: latin1 branch
91 summary: latin1 branch
92
92
93 changeset: 4:a02ca5a58e99
93 changeset: 4:9cff3c980b58
94 user: test
94 user: test
95 date: Thu Jan 01 00:00:00 1970 +0000
95 date: Mon Jan 12 13:46:40 1970 +0000
96 summary: Added tag é for changeset d47908dab82f
96 summary: Added tag é for changeset 770b9b11621d
97
97
98 changeset: 3:d47908dab82f
98 changeset: 3:770b9b11621d
99 tag: é
99 tag: é
100 user: test
100 user: test
101 date: Thu Jan 01 00:00:00 1970 +0000
101 date: Mon Jan 12 13:46:40 1970 +0000
102 summary: utf-8 e' encoded: é
102 summary: utf-8 e' encoded: é
103
103
104 changeset: 2:9db1985f3097
104 changeset: 2:0572af48b948
105 user: test
105 user: test
106 date: Thu Jan 01 00:00:00 1970 +0000
106 date: Mon Jan 12 13:46:40 1970 +0000
107 summary: latin-1 e' encoded: é
107 summary: latin-1 e' encoded: é
108
108
109 changeset: 1:af6e0db4427c
109 changeset: 1:0e5b7e3f9c4a
110 user: test
110 user: test
111 date: Thu Jan 01 00:00:00 1970 +0000
111 date: Mon Jan 12 13:46:40 1970 +0000
112 summary: euc-jp: ÆüËܸì = u'\u65e5\u672c\u8a9e'
112 summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c'
113
113
114 changeset: 0:60aad1dd20a9
114 changeset: 0:1e78a93102a3
115 user: test
115 user: test
116 date: Thu Jan 01 00:00:00 1970 +0000
116 date: Mon Jan 12 13:46:40 1970 +0000
117 summary: latin-1 e': é
117 summary: latin-1 e': é = u'\xe9'
118
118
119 % ascii
119 % ascii
120 tip 5:e4ed49b8a8f0
120 tip 5:db5520b4645f
121 ? 3:d47908dab82f
121 ? 3:770b9b11621d
122 % latin-1
122 % latin-1
123 tip 5:e4ed49b8a8f0
123 tip 5:db5520b4645f
124 � 3:d47908dab82f
124 � 3:770b9b11621d
125 % utf-8
125 % utf-8
126 tip 5:e4ed49b8a8f0
126 tip 5:db5520b4645f
127 é 3:d47908dab82f
127 é 3:770b9b11621d
128 % ascii
128 % ascii
129 ? 5:e4ed49b8a8f0
129 ? 5:db5520b4645f
130 % latin-1
130 % latin-1
131 � 5:e4ed49b8a8f0
131 � 5:db5520b4645f
132 % utf-8
132 % utf-8
133 é 5:e4ed49b8a8f0
133 é 5:db5520b4645f
134 % utf-8
134 % utf-8
135 changeset: 5:e4ed49b8a8f0
135 changeset: 5:db5520b4645f
136 branch: é
136 branch: é
137 tag: tip
137 tag: tip
138 user: test
138 user: test
139 date: Thu Jan 01 00:00:00 1970 +0000
139 date: Mon Jan 12 13:46:40 1970 +0000
140 summary: latin1 branch
140 summary: latin1 branch
141
141
142 changeset: 4:a02ca5a58e99
142 changeset: 4:9cff3c980b58
143 user: test
143 user: test
144 date: Thu Jan 01 00:00:00 1970 +0000
144 date: Mon Jan 12 13:46:40 1970 +0000
145 summary: Added tag é for changeset d47908dab82f
145 summary: Added tag é for changeset 770b9b11621d
146
146
147 changeset: 3:d47908dab82f
147 changeset: 3:770b9b11621d
148 tag: é
148 tag: é
149 user: test
149 user: test
150 date: Thu Jan 01 00:00:00 1970 +0000
150 date: Mon Jan 12 13:46:40 1970 +0000
151 summary: utf-8 e' encoded: é
151 summary: utf-8 e' encoded: é
152
152
153 changeset: 2:9db1985f3097
153 changeset: 2:0572af48b948
154 user: test
154 user: test
155 date: Thu Jan 01 00:00:00 1970 +0000
155 date: Mon Jan 12 13:46:40 1970 +0000
156 summary: latin-1 e' encoded: é
156 summary: latin-1 e' encoded: é
157
157
158 changeset: 1:af6e0db4427c
158 changeset: 1:0e5b7e3f9c4a
159 user: test
159 user: test
160 date: Thu Jan 01 00:00:00 1970 +0000
160 date: Mon Jan 12 13:46:40 1970 +0000
161 summary: euc-jp: 日本語 = u'\u65e5\u672c\u8a9e'
161 summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c'
162
162
163 changeset: 0:60aad1dd20a9
163 changeset: 0:1e78a93102a3
164 user: test
164 user: test
165 date: Thu Jan 01 00:00:00 1970 +0000
165 date: Mon Jan 12 13:46:40 1970 +0000
166 summary: latin-1 e':
166 summary: latin-1 e': И = u'\xe9'
167
167
General Comments 0
You need to be logged in to leave comments. Login now