Show More
@@ -130,7 +130,7 b' def forbidnewline(ui, repo, hooktype, no' | |||
|
130 | 130 | data = c[f].data() |
|
131 | 131 | if not util.binary(data) and newline in data: |
|
132 | 132 | if not halt: |
|
133 |
ui.warn(_(' |
|
|
133 | ui.warn(_('attempt to commit or push text file(s) ' | |
|
134 | 134 | 'using %s line endings\n') % |
|
135 | 135 | newlinestr[newline]) |
|
136 | 136 | ui.warn(_('in %s: %s\n') % (short(c.node()), f)) |
@@ -26,7 +26,7 b'' | |||
|
26 | 26 | |
|
27 | 27 | $ python unix2mac.py f |
|
28 | 28 | $ hg ci -m 2 |
|
29 |
|
|
|
29 | attempt to commit or push text file(s) using CR line endings | |
|
30 | 30 | in dea860dc51ec: f |
|
31 | 31 | transaction abort! |
|
32 | 32 | rollback completed |
@@ -33,7 +33,7 b' commit should succeed' | |||
|
33 | 33 | commit should fail |
|
34 | 34 | |
|
35 | 35 | $ hg ci -m 2.1 |
|
36 |
|
|
|
36 | attempt to commit or push text file(s) using CRLF line endings | |
|
37 | 37 | in f583ea08d42a: f |
|
38 | 38 | transaction abort! |
|
39 | 39 | rollback completed |
@@ -57,7 +57,7 b' push should fail' | |||
|
57 | 57 | adding manifests |
|
58 | 58 | adding file changes |
|
59 | 59 | added 2 changesets with 2 changes to 2 files |
|
60 |
|
|
|
60 | attempt to commit or push text file(s) using CRLF line endings | |
|
61 | 61 | in bc2d09796734: g |
|
62 | 62 | in b1aa5cde7ff4: f |
|
63 | 63 | |
@@ -105,7 +105,7 b' and now for something completely differe' | |||
|
105 | 105 | $ python unix2dos.py d/f2 |
|
106 | 106 | $ hg add d/f2 |
|
107 | 107 | $ hg ci -m 3 |
|
108 |
|
|
|
108 | attempt to commit or push text file(s) using CRLF line endings | |
|
109 | 109 | in 053ba1a3035a: d/f2 |
|
110 | 110 | transaction abort! |
|
111 | 111 | rollback completed |
@@ -266,7 +266,7 b' and now for something completely differe' | |||
|
266 | 266 | adding manifests |
|
267 | 267 | adding file changes |
|
268 | 268 | added 3 changesets with 4 changes to 4 files |
|
269 |
|
|
|
269 | attempt to commit or push text file(s) using CRLF line endings | |
|
270 | 270 | in 67ac5962ab43: d |
|
271 | 271 | in 68c127d1834e: b |
|
272 | 272 | in 68c127d1834e: c |
General Comments 0
You need to be logged in to leave comments.
Login now