Show More
@@ -1,61 +1,62 b'' | |||||
1 | #!/bin/sh |
|
1 | #!/bin/sh | |
2 |
|
2 | |||
3 | hg init t |
|
3 | hg init t | |
4 | cd t |
|
4 | cd t | |
5 |
|
5 | |||
6 | # we need a repo with some legacy latin-1 changesets |
|
6 | # we need a repo with some legacy latin-1 changesets | |
7 | hg unbundle $TESTDIR/legacy-encoding.hg |
|
7 | hg unbundle $TESTDIR/legacy-encoding.hg | |
8 | hg co |
|
8 | hg co | |
9 |
|
9 | |||
10 | python << EOF |
|
10 | python << EOF | |
11 | f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close() |
|
11 | f = file('latin-1', 'w'); f.write("latin-1 e' encoded: \xe9"); f.close() | |
12 | f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close() |
|
12 | f = file('utf-8', 'w'); f.write("utf-8 e' encoded: \xc3\xa9"); f.close() | |
13 | f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close() |
|
13 | f = file('latin-1-tag', 'w'); f.write("\xe9"); f.close() | |
14 | EOF |
|
14 | EOF | |
15 |
|
15 | |||
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 "1000000 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 "1000000 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 "1000000 0" |
|
25 | HGENCODING=utf-8 hg ci -l utf-8 -d "1000000 0" | |
26 |
|
26 | |||
27 | HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag` |
|
27 | HGENCODING=latin-1 hg tag -d "1000000 0" `cat latin-1-tag` | |
28 | HGENCODING=latin-1 hg branch `cat latin-1-tag` |
|
28 | HGENCODING=latin-1 hg branch `cat latin-1-tag` | |
29 | HGENCODING=latin-1 hg ci -d "1000000 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 "% hg log (ascii)" | |
33 | hg --encoding ascii log |
|
33 | hg --encoding ascii log | |
34 | echo % latin-1 |
|
34 | echo "% hg log (latin-1)" | |
35 | hg --encoding latin-1 log |
|
35 | hg --encoding latin-1 log | |
36 | echo % utf-8 |
|
36 | echo "% hg log (utf-8)" | |
37 | hg --encoding utf-8 log |
|
37 | hg --encoding utf-8 log | |
38 | echo % ascii |
|
38 | echo "% hg tags (ascii)" | |
39 | HGENCODING=ascii hg tags |
|
39 | HGENCODING=ascii hg tags | |
40 | echo % latin-1 |
|
40 | echo "% hg tags (latin-1)" | |
41 | HGENCODING=latin-1 hg tags |
|
41 | HGENCODING=latin-1 hg tags | |
42 | echo % utf-8 |
|
42 | echo "% hg tags (utf-8)" | |
43 | HGENCODING=utf-8 hg tags |
|
43 | HGENCODING=utf-8 hg tags | |
44 | echo % ascii |
|
44 | echo "% hg branches (ascii)" | |
45 | HGENCODING=ascii hg branches |
|
45 | HGENCODING=ascii hg branches | |
46 | echo % latin-1 |
|
46 | echo "% hg branches (latin-1)" | |
47 | HGENCODING=latin-1 hg branches |
|
47 | HGENCODING=latin-1 hg branches | |
48 | echo % utf-8 |
|
48 | echo "% hg branches (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 = koi8-r' >> .hg/hgrc |
|
52 | echo 'fallbackencoding = koi8-r' >> .hg/hgrc | |
53 | echo % utf-8 |
|
53 | echo "% hg log (utf-8)" | |
54 | HGENCODING=utf-8 hg log |
|
54 | HGENCODING=utf-8 hg log | |
55 |
|
55 | |||
|
56 | echo "% hg log (dolphin)" | |||
56 | HGENCODING=dolphin hg log |
|
57 | HGENCODING=dolphin hg log | |
57 |
|
58 | |||
58 | HGENCODING=ascii hg branch `cat latin-1-tag` |
|
59 | HGENCODING=ascii hg branch `cat latin-1-tag` | |
59 | cp latin-1-tag .hg/branch |
|
60 | cp latin-1-tag .hg/branch | |
60 | HGENCODING=latin-1 hg ci -d "1000000 0" -m 'should fail' |
|
61 | HGENCODING=latin-1 hg ci -d "1000000 0" -m 'should fail' | |
61 | exit 0 |
|
62 | exit 0 |
@@ -1,173 +1,174 b'' | |||||
1 | adding changesets |
|
1 | adding changesets | |
2 | adding manifests |
|
2 | adding manifests | |
3 | adding file changes |
|
3 | adding file changes | |
4 | added 2 changesets with 2 changes to 1 files |
|
4 | added 2 changesets with 2 changes to 1 files | |
5 | (run 'hg update' to get a working copy) |
|
5 | (run 'hg update' to get a working copy) | |
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
6 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
7 | % should fail with encoding error |
|
7 | % should fail with encoding error | |
8 | M a |
|
8 | M a | |
9 | ? latin-1 |
|
9 | ? latin-1 | |
10 | ? latin-1-tag |
|
10 | ? latin-1-tag | |
11 | ? utf-8 |
|
11 | ? utf-8 | |
12 | transaction abort! |
|
12 | transaction abort! | |
13 | rollback completed |
|
13 | rollback completed | |
14 | abort: decoding near ' encoded: �': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! |
|
14 | abort: decoding near ' encoded: �': 'ascii' codec can't decode byte 0xe9 in position 20: ordinal not in range(128)! | |
15 | % these should work |
|
15 | % these should work | |
16 | marked working directory as branch � |
|
16 | marked working directory as branch � | |
17 | % ascii |
|
17 | % hg log (ascii) | |
18 | changeset: 5:db5520b4645f |
|
18 | changeset: 5:db5520b4645f | |
19 | branch: ? |
|
19 | branch: ? | |
20 | tag: tip |
|
20 | tag: tip | |
21 | user: test |
|
21 | user: test | |
22 | date: Mon Jan 12 13:46:40 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:9cff3c980b58 |
|
25 | changeset: 4:9cff3c980b58 | |
26 | user: test |
|
26 | user: test | |
27 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
27 | date: Mon Jan 12 13:46:40 1970 +0000 | |
28 | summary: Added tag ? for changeset 770b9b11621d |
|
28 | summary: Added tag ? for changeset 770b9b11621d | |
29 |
|
29 | |||
30 | changeset: 3:770b9b11621d |
|
30 | changeset: 3:770b9b11621d | |
31 | tag: ? |
|
31 | tag: ? | |
32 | user: test |
|
32 | user: test | |
33 | date: Mon Jan 12 13:46:40 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:0572af48b948 |
|
36 | changeset: 2:0572af48b948 | |
37 | user: test |
|
37 | user: test | |
38 | date: Mon Jan 12 13:46:40 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:0e5b7e3f9c4a |
|
41 | changeset: 1:0e5b7e3f9c4a | |
42 | user: test |
|
42 | user: test | |
43 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
43 | date: Mon Jan 12 13:46:40 1970 +0000 | |
44 | summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' |
|
44 | summary: koi8-r: ????? = u'\u0440\u0442\u0443\u0442\u044c' | |
45 |
|
45 | |||
46 | changeset: 0:1e78a93102a3 |
|
46 | changeset: 0:1e78a93102a3 | |
47 | user: test |
|
47 | user: test | |
48 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
48 | date: Mon Jan 12 13:46:40 1970 +0000 | |
49 | summary: latin-1 e': ? = u'\xe9' |
|
49 | summary: latin-1 e': ? = u'\xe9' | |
50 |
|
50 | |||
51 | % latin-1 |
|
51 | % hg log (latin-1) | |
52 | changeset: 5:db5520b4645f |
|
52 | changeset: 5:db5520b4645f | |
53 | branch: � |
|
53 | branch: � | |
54 | tag: tip |
|
54 | tag: tip | |
55 | user: test |
|
55 | user: test | |
56 | date: Mon Jan 12 13:46:40 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:9cff3c980b58 |
|
59 | changeset: 4:9cff3c980b58 | |
60 | user: test |
|
60 | user: test | |
61 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
61 | date: Mon Jan 12 13:46:40 1970 +0000 | |
62 | summary: Added tag � for changeset 770b9b11621d |
|
62 | summary: Added tag � for changeset 770b9b11621d | |
63 |
|
63 | |||
64 | changeset: 3:770b9b11621d |
|
64 | changeset: 3:770b9b11621d | |
65 | tag: � |
|
65 | tag: � | |
66 | user: test |
|
66 | user: test | |
67 | date: Mon Jan 12 13:46:40 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:0572af48b948 |
|
70 | changeset: 2:0572af48b948 | |
71 | user: test |
|
71 | user: test | |
72 | date: Mon Jan 12 13:46:40 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:0e5b7e3f9c4a |
|
75 | changeset: 1:0e5b7e3f9c4a | |
76 | user: test |
|
76 | user: test | |
77 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
77 | date: Mon Jan 12 13:46:40 1970 +0000 | |
78 | summary: koi8-r: ����� = u'\u0440\u0442\u0443\u0442\u044c' |
|
78 | summary: koi8-r: ����� = u'\u0440\u0442\u0443\u0442\u044c' | |
79 |
|
79 | |||
80 | changeset: 0:1e78a93102a3 |
|
80 | changeset: 0:1e78a93102a3 | |
81 | user: test |
|
81 | user: test | |
82 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
82 | date: Mon Jan 12 13:46:40 1970 +0000 | |
83 | summary: latin-1 e': � = u'\xe9' |
|
83 | summary: latin-1 e': � = u'\xe9' | |
84 |
|
84 | |||
85 | % utf-8 |
|
85 | % hg log (utf-8) | |
86 | changeset: 5:db5520b4645f |
|
86 | changeset: 5:db5520b4645f | |
87 | branch: é |
|
87 | branch: é | |
88 | tag: tip |
|
88 | tag: tip | |
89 | user: test |
|
89 | user: test | |
90 | date: Mon Jan 12 13:46:40 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:9cff3c980b58 |
|
93 | changeset: 4:9cff3c980b58 | |
94 | user: test |
|
94 | user: test | |
95 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
95 | date: Mon Jan 12 13:46:40 1970 +0000 | |
96 | summary: Added tag é for changeset 770b9b11621d |
|
96 | summary: Added tag é for changeset 770b9b11621d | |
97 |
|
97 | |||
98 | changeset: 3:770b9b11621d |
|
98 | changeset: 3:770b9b11621d | |
99 | tag: é |
|
99 | tag: é | |
100 | user: test |
|
100 | user: test | |
101 | date: Mon Jan 12 13:46:40 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:0572af48b948 |
|
104 | changeset: 2:0572af48b948 | |
105 | user: test |
|
105 | user: test | |
106 | date: Mon Jan 12 13:46:40 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:0e5b7e3f9c4a |
|
109 | changeset: 1:0e5b7e3f9c4a | |
110 | user: test |
|
110 | user: test | |
111 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
111 | date: Mon Jan 12 13:46:40 1970 +0000 | |
112 | summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' |
|
112 | summary: koi8-r: ÒÔÕÔØ = u'\u0440\u0442\u0443\u0442\u044c' | |
113 |
|
113 | |||
114 | changeset: 0:1e78a93102a3 |
|
114 | changeset: 0:1e78a93102a3 | |
115 | user: test |
|
115 | user: test | |
116 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
116 | date: Mon Jan 12 13:46:40 1970 +0000 | |
117 | summary: latin-1 e': é = u'\xe9' |
|
117 | summary: latin-1 e': é = u'\xe9' | |
118 |
|
118 | |||
119 | % ascii |
|
119 | % hg tags (ascii) | |
120 | tip 5:db5520b4645f |
|
120 | tip 5:db5520b4645f | |
121 | ? 3:770b9b11621d |
|
121 | ? 3:770b9b11621d | |
122 | % latin-1 |
|
122 | % hg tags (latin-1) | |
123 | tip 5:db5520b4645f |
|
123 | tip 5:db5520b4645f | |
124 | � 3:770b9b11621d |
|
124 | � 3:770b9b11621d | |
125 | % utf-8 |
|
125 | % hg tags (utf-8) | |
126 | tip 5:db5520b4645f |
|
126 | tip 5:db5520b4645f | |
127 | é 3:770b9b11621d |
|
127 | é 3:770b9b11621d | |
128 | % ascii |
|
128 | % hg branches (ascii) | |
129 | ? 5:db5520b4645f |
|
129 | ? 5:db5520b4645f | |
130 | default 4:9cff3c980b58 (inactive) |
|
130 | default 4:9cff3c980b58 (inactive) | |
131 | % latin-1 |
|
131 | % hg branches (latin-1) | |
132 | � 5:db5520b4645f |
|
132 | � 5:db5520b4645f | |
133 | default 4:9cff3c980b58 (inactive) |
|
133 | default 4:9cff3c980b58 (inactive) | |
134 | % utf-8 |
|
134 | % hg branches (utf-8) | |
135 | é 5:db5520b4645f |
|
135 | é 5:db5520b4645f | |
136 | default 4:9cff3c980b58 (inactive) |
|
136 | default 4:9cff3c980b58 (inactive) | |
137 | % utf-8 |
|
137 | % hg log (utf-8) | |
138 | changeset: 5:db5520b4645f |
|
138 | changeset: 5:db5520b4645f | |
139 | branch: é |
|
139 | branch: é | |
140 | tag: tip |
|
140 | tag: tip | |
141 | user: test |
|
141 | user: test | |
142 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
142 | date: Mon Jan 12 13:46:40 1970 +0000 | |
143 | summary: latin1 branch |
|
143 | summary: latin1 branch | |
144 |
|
144 | |||
145 | changeset: 4:9cff3c980b58 |
|
145 | changeset: 4:9cff3c980b58 | |
146 | user: test |
|
146 | user: test | |
147 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
147 | date: Mon Jan 12 13:46:40 1970 +0000 | |
148 | summary: Added tag é for changeset 770b9b11621d |
|
148 | summary: Added tag é for changeset 770b9b11621d | |
149 |
|
149 | |||
150 | changeset: 3:770b9b11621d |
|
150 | changeset: 3:770b9b11621d | |
151 | tag: é |
|
151 | tag: é | |
152 | user: test |
|
152 | user: test | |
153 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
153 | date: Mon Jan 12 13:46:40 1970 +0000 | |
154 | summary: utf-8 e' encoded: é |
|
154 | summary: utf-8 e' encoded: é | |
155 |
|
155 | |||
156 | changeset: 2:0572af48b948 |
|
156 | changeset: 2:0572af48b948 | |
157 | user: test |
|
157 | user: test | |
158 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
158 | date: Mon Jan 12 13:46:40 1970 +0000 | |
159 | summary: latin-1 e' encoded: é |
|
159 | summary: latin-1 e' encoded: é | |
160 |
|
160 | |||
161 | changeset: 1:0e5b7e3f9c4a |
|
161 | changeset: 1:0e5b7e3f9c4a | |
162 | user: test |
|
162 | user: test | |
163 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
163 | date: Mon Jan 12 13:46:40 1970 +0000 | |
164 | summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' |
|
164 | summary: koi8-r: ртуть = u'\u0440\u0442\u0443\u0442\u044c' | |
165 |
|
165 | |||
166 | changeset: 0:1e78a93102a3 |
|
166 | changeset: 0:1e78a93102a3 | |
167 | user: test |
|
167 | user: test | |
168 | date: Mon Jan 12 13:46:40 1970 +0000 |
|
168 | date: Mon Jan 12 13:46:40 1970 +0000 | |
169 | summary: latin-1 e': И = u'\xe9' |
|
169 | summary: latin-1 e': И = u'\xe9' | |
170 |
|
170 | |||
|
171 | % hg log (dolphin) | |||
171 | abort: unknown encoding: dolphin, please check your locale settings |
|
172 | abort: unknown encoding: dolphin, please check your locale settings | |
172 | abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! |
|
173 | abort: decoding near '�': 'ascii' codec can't decode byte 0xe9 in position 0: ordinal not in range(128)! | |
173 | abort: branch name not in UTF-8! |
|
174 | abort: branch name not in UTF-8! |
General Comments 0
You need to be logged in to leave comments.
Login now