1 [hooks] |
1 [hooks] |
2 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
2 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
3 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
3 pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf |
4 |
4 |
5 |
5 commit should succeed |
|
6 |
|
7 updating working directory |
|
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 commit should fail |
6 Attempt to commit or push text file(s) using CRLF line endings |
10 Attempt to commit or push text file(s) using CRLF line endings |
7 in b1aa5cde7ff4: f |
11 in f583ea08d42a: f |
8 transaction abort! |
12 transaction abort! |
9 rollback completed |
13 rollback completed |
10 abort: pretxncommit.crlf hook failed |
14 abort: pretxncommit.crlf hook failed |
11 reverting f |
15 |
12 |
16 commits should succeed |
|
17 |
|
18 push should fail |
|
19 pushing to ../zoz |
|
20 searching for changes |
|
21 adding changesets |
|
22 adding manifests |
|
23 adding file changes |
|
24 added 2 changesets with 2 changes to 2 files |
13 Attempt to commit or push text file(s) using CRLF line endings |
25 Attempt to commit or push text file(s) using CRLF line endings |
14 in 88b17af74937: d/f2 |
26 in b94ebd309a6d: g |
|
27 in b1aa5cde7ff4: f |
|
28 |
|
29 To prevent this mistake in your local repository, |
|
30 add to Mercurial.ini or .hg/hgrc: |
|
31 |
|
32 [hooks] |
|
33 pretxncommit.crlf = python:hgext.win32text.forbidcrlf |
|
34 |
|
35 and also consider adding: |
|
36 |
|
37 [extensions] |
|
38 hgext.win32text = |
|
39 [encode] |
|
40 ** = cleverencode: |
|
41 [decode] |
|
42 ** = cleverdecode: |
|
43 transaction abort! |
|
44 rollback completed |
|
45 abort: pretxnchangegroup.crlf hook failed |
|
46 |
|
47 commit should succeed |
|
48 |
|
49 push should succeed |
|
50 pushing to ../zoz |
|
51 searching for changes |
|
52 adding changesets |
|
53 adding manifests |
|
54 adding file changes |
|
55 added 3 changesets with 3 changes to 2 files |
|
56 |
|
57 and now for something completely different |
|
58 Attempt to commit or push text file(s) using CRLF line endings |
|
59 in cefdb8d0b741: d/f2 |
15 transaction abort! |
60 transaction abort! |
16 rollback completed |
61 rollback completed |
17 abort: pretxncommit.crlf hook failed |
62 abort: pretxncommit.crlf hook failed |
18 forgetting d/f2 |
63 forgetting d/f2 |
19 |
64 |
20 |
65 |
21 changeset: 2:b67b2dae057a |
66 changeset: 5:d4ea9ae21be3 |
22 tag: tip |
67 tag: tip |
23 user: test |
68 user: test |
24 date: Thu Jan 01 00:00:00 1970 +0000 |
69 date: Thu Jan 01 00:00:00 1970 +0000 |
25 files: bin |
70 files: bin |
26 description: |
71 description: |
27 5 |
72 5 |
28 |
73 |
29 |
74 |
30 changeset: 1:c72a7d1d0907 |
75 changeset: 4:6ba409927d51 |
31 user: test |
76 user: test |
32 date: Thu Jan 01 00:00:00 1970 +0000 |
77 date: Thu Jan 01 00:00:00 1970 +0000 |
33 files: f |
78 files: f |
34 description: |
79 description: |
35 4 |
80 4 |
|
81 |
|
82 |
|
83 changeset: 3:788a4e595187 |
|
84 user: test |
|
85 date: Thu Jan 01 00:00:00 1970 +0000 |
|
86 files: f g |
|
87 description: |
|
88 2.3 |
|
89 |
|
90 |
|
91 changeset: 2:b94ebd309a6d |
|
92 user: test |
|
93 date: Thu Jan 01 00:00:00 1970 +0000 |
|
94 files: g |
|
95 description: |
|
96 2.2 |
|
97 |
|
98 |
|
99 changeset: 1:b1aa5cde7ff4 |
|
100 user: test |
|
101 date: Thu Jan 01 00:00:00 1970 +0000 |
|
102 files: f |
|
103 description: |
|
104 2 |
36 |
105 |
37 |
106 |
38 changeset: 0:fcf06d5c4e1d |
107 changeset: 0:fcf06d5c4e1d |
39 user: test |
108 user: test |
40 date: Thu Jan 01 00:00:00 1970 +0000 |
109 date: Thu Jan 01 00:00:00 1970 +0000 |
49 |
118 |
50 adding dupe/a |
119 adding dupe/a |
51 adding dupe/b |
120 adding dupe/b |
52 adding dupe/c |
121 adding dupe/c |
53 adding dupe/d |
122 adding dupe/d |
54 changeset: 5:6e8a7629ff5b |
123 changeset: 8:7654104f33c3 |
55 tag: tip |
124 tag: tip |
56 user: test |
125 user: test |
57 date: Thu Jan 01 00:00:00 1970 +0000 |
126 date: Thu Jan 01 00:00:00 1970 +0000 |
58 files: d |
127 files: d |
59 description: |
128 description: |
60 d |
129 d |
61 |
130 |
62 |
131 |
63 changeset: 4:ac30a42ce8bc |
132 changeset: 7:9be4c2808cc9 |
64 user: test |
133 user: test |
65 date: Thu Jan 01 00:00:00 1970 +0000 |
134 date: Thu Jan 01 00:00:00 1970 +0000 |
66 files: b c |
135 files: b c |
67 description: |
136 description: |
68 b/c |
137 b/c |
69 |
138 |
70 |
139 |
71 changeset: 3:a73b85ef1fb7 |
140 changeset: 6:aa4367ed325a |
72 user: test |
141 user: test |
73 date: Thu Jan 01 00:00:00 1970 +0000 |
142 date: Thu Jan 01 00:00:00 1970 +0000 |
74 files: a |
143 files: a |
75 description: |
144 description: |
76 a |
145 a |
77 |
146 |
78 |
147 |
79 changeset: 2:b67b2dae057a |
148 changeset: 5:d4ea9ae21be3 |
80 user: test |
149 user: test |
81 date: Thu Jan 01 00:00:00 1970 +0000 |
150 date: Thu Jan 01 00:00:00 1970 +0000 |
82 files: bin |
151 files: bin |
83 description: |
152 description: |
84 5 |
153 5 |
85 |
154 |
86 |
155 |
87 changeset: 1:c72a7d1d0907 |
156 changeset: 4:6ba409927d51 |
88 user: test |
157 user: test |
89 date: Thu Jan 01 00:00:00 1970 +0000 |
158 date: Thu Jan 01 00:00:00 1970 +0000 |
90 files: f |
159 files: f |
91 description: |
160 description: |
92 4 |
161 4 |
|
162 |
|
163 |
|
164 changeset: 3:788a4e595187 |
|
165 user: test |
|
166 date: Thu Jan 01 00:00:00 1970 +0000 |
|
167 files: f g |
|
168 description: |
|
169 2.3 |
|
170 |
|
171 |
|
172 changeset: 2:b94ebd309a6d |
|
173 user: test |
|
174 date: Thu Jan 01 00:00:00 1970 +0000 |
|
175 files: g |
|
176 description: |
|
177 2.2 |
|
178 |
|
179 |
|
180 changeset: 1:b1aa5cde7ff4 |
|
181 user: test |
|
182 date: Thu Jan 01 00:00:00 1970 +0000 |
|
183 files: f |
|
184 description: |
|
185 2 |
93 |
186 |
94 |
187 |
95 changeset: 0:fcf06d5c4e1d |
188 changeset: 0:fcf06d5c4e1d |
96 user: test |
189 user: test |
97 date: Thu Jan 01 00:00:00 1970 +0000 |
190 date: Thu Jan 01 00:00:00 1970 +0000 |
128 ** = cleverdecode: |
221 ** = cleverdecode: |
129 transaction abort! |
222 transaction abort! |
130 rollback completed |
223 rollback completed |
131 abort: pretxnchangegroup.crlf hook failed |
224 abort: pretxnchangegroup.crlf hook failed |
132 |
225 |
133 changeset: 2:b67b2dae057a |
226 changeset: 5:d4ea9ae21be3 |
134 tag: tip |
227 tag: tip |
135 user: test |
228 user: test |
136 date: Thu Jan 01 00:00:00 1970 +0000 |
229 date: Thu Jan 01 00:00:00 1970 +0000 |
137 files: bin |
230 files: bin |
138 description: |
231 description: |
139 5 |
232 5 |
140 |
233 |
141 |
234 |
142 changeset: 1:c72a7d1d0907 |
235 changeset: 4:6ba409927d51 |
143 user: test |
236 user: test |
144 date: Thu Jan 01 00:00:00 1970 +0000 |
237 date: Thu Jan 01 00:00:00 1970 +0000 |
145 files: f |
238 files: f |
146 description: |
239 description: |
147 4 |
240 4 |
|
241 |
|
242 |
|
243 changeset: 3:788a4e595187 |
|
244 user: test |
|
245 date: Thu Jan 01 00:00:00 1970 +0000 |
|
246 files: f g |
|
247 description: |
|
248 2.3 |
|
249 |
|
250 |
|
251 changeset: 2:b94ebd309a6d |
|
252 user: test |
|
253 date: Thu Jan 01 00:00:00 1970 +0000 |
|
254 files: g |
|
255 description: |
|
256 2.2 |
|
257 |
|
258 |
|
259 changeset: 1:b1aa5cde7ff4 |
|
260 user: test |
|
261 date: Thu Jan 01 00:00:00 1970 +0000 |
|
262 files: f |
|
263 description: |
|
264 2 |
148 |
265 |
149 |
266 |
150 changeset: 0:fcf06d5c4e1d |
267 changeset: 0:fcf06d5c4e1d |
151 user: test |
268 user: test |
152 date: Thu Jan 01 00:00:00 1970 +0000 |
269 date: Thu Jan 01 00:00:00 1970 +0000 |