Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eol: rename 'error' to 'haserror'
authorPierre-Yves David <pierre-yves.david@fb.com>
Mon, 05 Oct 2015 22:49:24 -0700
changeset 26586 d51c658d3f04
parent 26585 b38d93735a4f
child 26587 56b2bcea2529
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.
hgext/eol.py file | annotate | diff | comparison | revisions 
--- a/hgext/eol.py	Mon Oct 05 22:29:57 2015 -0700
+++ b/hgext/eol.py	Mon Oct 05 22:49:24 2015 -0700
@@ -333,7 +333,7 @@
                     # 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 @@
                 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()
Mercurial