##// END OF EJS Templates
eol: rename 'error' to 'haserror'...
Pierre-Yves David -
r26586:d51c658d default
parent child Browse files
Show More
@@ -333,7 +333,7 b' def reposetup(ui, repo):'
333 # so ignore the error.
333 # so ignore the error.
334 pass
334 pass
335
335
336 def commitctx(self, ctx, error=False):
336 def commitctx(self, ctx, haserror=False):
337 for f in sorted(ctx.added() + ctx.modified()):
337 for f in sorted(ctx.added() + ctx.modified()):
338 if not self._eolfile(f):
338 if not self._eolfile(f):
339 continue
339 continue
@@ -349,6 +349,6 b' def reposetup(ui, repo):'
349 if inconsistenteol(data):
349 if inconsistenteol(data):
350 raise util.Abort(_("inconsistent newline style "
350 raise util.Abort(_("inconsistent newline style "
351 "in %s\n") % f)
351 "in %s\n") % f)
352 return super(eolrepo, self).commitctx(ctx, error)
352 return super(eolrepo, self).commitctx(ctx, haserror)
353 repo.__class__ = eolrepo
353 repo.__class__ = eolrepo
354 repo._hgcleardirstate()
354 repo._hgcleardirstate()
General Comments 0
You need to be logged in to leave comments. Login now