Show More
@@ -165,7 +165,7 b' def tocrlf(s, params, ui, **kwargs):' | |||||
165 | return util.tocrlf(s) |
|
165 | return util.tocrlf(s) | |
166 |
|
166 | |||
167 |
|
167 | |||
168 | def isbinary(s, params): |
|
168 | def isbinary(s, params, ui, **kwargs): | |
169 | """Filter to do nothing with the file.""" |
|
169 | """Filter to do nothing with the file.""" | |
170 | return s |
|
170 | return s | |
171 |
|
171 |
@@ -187,7 +187,7 b' from tip ... which evidently is wrong:' | |||||
187 | calling hook preupdate.eol: hgext.eol.preupdate |
|
187 | calling hook preupdate.eol: hgext.eol.preupdate | |
188 | .hgeol: remote created -> g |
|
188 | .hgeol: remote created -> g | |
189 | getting .hgeol |
|
189 | getting .hgeol | |
190 |
filtering .hgeol through |
|
190 | filtering .hgeol through isbinary | |
191 | a.txt: remote created -> g |
|
191 | a.txt: remote created -> g | |
192 | getting a.txt |
|
192 | getting a.txt | |
193 | filtering a.txt through tolf |
|
193 | filtering a.txt through tolf | |
@@ -200,7 +200,7 b' from tip ... which evidently is wrong:' | |||||
200 | $ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate |
|
200 | $ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate | |
201 | $ hg up -C -r 0 -v --debug |
|
201 | $ hg up -C -r 0 -v --debug | |
202 | eol: detected change in .hgeol |
|
202 | eol: detected change in .hgeol | |
203 |
filtering .hgeol through |
|
203 | filtering .hgeol through isbinary | |
204 | filtering a.txt through tolf |
|
204 | filtering a.txt through tolf | |
205 | resolving manifests |
|
205 | resolving manifests | |
206 | branchmerge: False, force: True, partial: False |
|
206 | branchmerge: False, force: True, partial: False | |
@@ -263,7 +263,7 b' for f in revision 0, and it thus ends up' | |||||
263 | calling hook preupdate.eol: hgext.eol.preupdate |
|
263 | calling hook preupdate.eol: hgext.eol.preupdate | |
264 | .hgeol: remote is newer -> g |
|
264 | .hgeol: remote is newer -> g | |
265 | getting .hgeol |
|
265 | getting .hgeol | |
266 |
filtering .hgeol through |
|
266 | filtering .hgeol through isbinary | |
267 | a.txt: remote is newer -> g |
|
267 | a.txt: remote is newer -> g | |
268 | getting a.txt |
|
268 | getting a.txt | |
269 | filtering a.txt through tolf |
|
269 | filtering a.txt through tolf | |
@@ -275,7 +275,7 b' for f in revision 0, and it thus ends up' | |||||
275 | $ touch .hgeol * |
|
275 | $ touch .hgeol * | |
276 | $ hg st --debug |
|
276 | $ hg st --debug | |
277 | eol: detected change in .hgeol |
|
277 | eol: detected change in .hgeol | |
278 |
filtering .hgeol through |
|
278 | filtering .hgeol through isbinary | |
279 | filtering a.txt through tolf |
|
279 | filtering a.txt through tolf | |
280 | M f |
|
280 | M f | |
281 | $ hg diff |
|
281 | $ hg diff | |
@@ -291,7 +291,7 b' Workaround: Update again - this will rea' | |||||
291 | $ touch .hgeol * |
|
291 | $ touch .hgeol * | |
292 | $ hg up -C -r 0 -v --debug |
|
292 | $ hg up -C -r 0 -v --debug | |
293 | eol: detected change in .hgeol |
|
293 | eol: detected change in .hgeol | |
294 |
filtering .hgeol through |
|
294 | filtering .hgeol through isbinary | |
295 | filtering a.txt through tolf |
|
295 | filtering a.txt through tolf | |
296 | resolving manifests |
|
296 | resolving manifests | |
297 | branchmerge: False, force: True, partial: False |
|
297 | branchmerge: False, force: True, partial: False | |
@@ -304,7 +304,7 b' Workaround: Update again - this will rea' | |||||
304 | $ touch .hgeol * |
|
304 | $ touch .hgeol * | |
305 | $ hg st --debug |
|
305 | $ hg st --debug | |
306 | eol: detected change in .hgeol |
|
306 | eol: detected change in .hgeol | |
307 |
filtering .hgeol through |
|
307 | filtering .hgeol through isbinary | |
308 | filtering a.txt through tolf |
|
308 | filtering a.txt through tolf | |
309 |
|
309 | |||
310 | $ cd .. |
|
310 | $ cd .. |
General Comments 0
You need to be logged in to leave comments.
Login now