# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 2015-10-06 05:49:24
# Node ID d51c658d3f0488419ca0364c96caf34b2fd78f83
# Parent  b38d93735a4fc8a4597199e21ca6c7f81bdabf81

eol: rename 'error' to 'haserror'

The variable 'error' conflict with the module name that we would like to import
and use in a coming changeset.

diff --git a/hgext/eol.py b/hgext/eol.py
--- a/hgext/eol.py
+++ b/hgext/eol.py
@@ -333,7 +333,7 @@ def reposetup(ui, repo):
                     # so ignore the error.
                     pass
 
-        def commitctx(self, ctx, error=False):
+        def commitctx(self, ctx, haserror=False):
             for f in sorted(ctx.added() + ctx.modified()):
                 if not self._eolfile(f):
                     continue
@@ -349,6 +349,6 @@ def reposetup(ui, repo):
                 if inconsistenteol(data):
                     raise util.Abort(_("inconsistent newline style "
                                        "in %s\n") % f)
-            return super(eolrepo, self).commitctx(ctx, error)
+            return super(eolrepo, self).commitctx(ctx, haserror)
     repo.__class__ = eolrepo
     repo._hgcleardirstate()