# HG changeset patch # User Pierre-Yves David # Date 1498216924 -7200 # Node ID 4e7352b8325c7266d6dbcbc81bfcfba13b95ed27 # Parent 74930cf4a10e837e380287645bf932e659a30621 eol: fix 'error' parameter name in the commitctx wrapper Since its introduction in 9dfee83c93c8, the parameter has always been name "error". Yet the eol extension have been using 'haserror' as the argument name, breaking extensions with subclass passing 'error' as a keyword argument. diff --git a/hgext/eol.py b/hgext/eol.py --- a/hgext/eol.py +++ b/hgext/eol.py @@ -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()