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