Mercurial > hg-stable
changeset 26586:d51c658d3f04
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.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 05 Oct 2015 22:49:24 -0700 |
| parents | b38d93735a4f |
| children | 56b2bcea2529 |
| files | hgext/eol.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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()