Mercurial > hg
comparison hgext/eol.py @ 20870:6500a2eebee8
merge with stable
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Tue, 01 Apr 2014 15:11:19 -0500 |
parents | 49f2d5644f04 9658a79968c6 |
children | fb3e63c603e8 |
comparison
equal
deleted
inserted
replaced
20864:9a75d2559cff | 20870:6500a2eebee8 |
---|---|
342 # be able to say "** = native" to automatically | 342 # be able to say "** = native" to automatically |
343 # have all non-binary files taken care of. | 343 # have all non-binary files taken care of. |
344 continue | 344 continue |
345 if inconsistenteol(data): | 345 if inconsistenteol(data): |
346 raise util.Abort(_("inconsistent newline style " | 346 raise util.Abort(_("inconsistent newline style " |
347 "in %s\n" % f)) | 347 "in %s\n") % f) |
348 return super(eolrepo, self).commitctx(ctx, error) | 348 return super(eolrepo, self).commitctx(ctx, error) |
349 repo.__class__ = eolrepo | 349 repo.__class__ = eolrepo |
350 repo._hgcleardirstate() | 350 repo._hgcleardirstate() |