Mercurial > hg
comparison hgext/eol.py @ 14866:ad6a58581ecd
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 13 Jul 2011 16:29:28 -0500 |
parents | 5b46c16e7121 abf915f537be |
children | f97e7c378349 |
comparison
equal
deleted
inserted
replaced
14860:67add0f24f83 | 14866:ad6a58581ecd |
---|---|
328 | 328 |
329 def commitctx(self, ctx, error=False): | 329 def commitctx(self, ctx, error=False): |
330 for f in sorted(ctx.added() + ctx.modified()): | 330 for f in sorted(ctx.added() + ctx.modified()): |
331 if not self._eolfile(f): | 331 if not self._eolfile(f): |
332 continue | 332 continue |
333 data = ctx[f].data() | 333 try: |
334 data = ctx[f].data() | |
335 except IOError: | |
336 continue | |
334 if util.binary(data): | 337 if util.binary(data): |
335 # We should not abort here, since the user should | 338 # We should not abort here, since the user should |
336 # be able to say "** = native" to automatically | 339 # be able to say "** = native" to automatically |
337 # have all non-binary files taken care of. | 340 # have all non-binary files taken care of. |
338 continue | 341 continue |