##// END OF EJS Templates
eol: fix 'error' parameter name in the commitctx wrapper...
marmoute -
r32996:4e7352b8 stable
parent child Browse files
Show More
@@ -367,7 +367,7 b' def reposetup(ui, repo):'
367 if wlock is not None:
367 if wlock is not None:
368 wlock.release()
368 wlock.release()
369
369
370 def commitctx(self, ctx, haserror=False):
370 def commitctx(self, ctx, error=False):
371 for f in sorted(ctx.added() + ctx.modified()):
371 for f in sorted(ctx.added() + ctx.modified()):
372 if not self._eolmatch(f):
372 if not self._eolmatch(f):
373 continue
373 continue
@@ -383,6 +383,6 b' def reposetup(ui, repo):'
383 if inconsistenteol(data):
383 if inconsistenteol(data):
384 raise errormod.Abort(_("inconsistent newline style "
384 raise errormod.Abort(_("inconsistent newline style "
385 "in %s\n") % f)
385 "in %s\n") % f)
386 return super(eolrepo, self).commitctx(ctx, haserror)
386 return super(eolrepo, self).commitctx(ctx, error)
387 repo.__class__ = eolrepo
387 repo.__class__ = eolrepo
388 repo._hgcleardirstate()
388 repo._hgcleardirstate()
General Comments 0
You need to be logged in to leave comments. Login now