hgext/eol.py
branchstable
changeset 32988 4e7352b8325c
parent 32987 74930cf4a10e
child 34117 0f685a229a81
--- a/hgext/eol.py	Fri Jun 23 13:24:45 2017 +0200
+++ b/hgext/eol.py	Fri Jun 23 13:22:04 2017 +0200
@@ -367,7 +367,7 @@
                     if wlock is not None:
                         wlock.release()
 
-        def commitctx(self, ctx, haserror=False):
+        def commitctx(self, ctx, error=False):
             for f in sorted(ctx.added() + ctx.modified()):
                 if not self._eolmatch(f):
                     continue
@@ -383,6 +383,6 @@
                 if inconsistenteol(data):
                     raise errormod.Abort(_("inconsistent newline style "
                                            "in %s\n") % f)
-            return super(eolrepo, self).commitctx(ctx, haserror)
+            return super(eolrepo, self).commitctx(ctx, error)
     repo.__class__ = eolrepo
     repo._hgcleardirstate()