hgext/eol.py
changeset 42620 d98ec36be808
parent 38783 e7aa113b14f7
child 43076 2372284d9457
--- a/hgext/eol.py	Tue Jul 02 12:55:51 2019 -0400
+++ b/hgext/eol.py	Sat Jul 13 23:45:32 2019 -0400
@@ -400,7 +400,7 @@
                     if wlock is not None:
                         wlock.release()
 
-        def commitctx(self, ctx, error=False):
+        def commitctx(self, ctx, error=False, origctx=None):
             for f in sorted(ctx.added() + ctx.modified()):
                 if not self._eolmatch(f):
                     continue
@@ -416,6 +416,6 @@
                 if inconsistenteol(data):
                     raise errormod.Abort(_("inconsistent newline style "
                                            "in %s\n") % f)
-            return super(eolrepo, self).commitctx(ctx, error)
+            return super(eolrepo, self).commitctx(ctx, error, origctx)
     repo.__class__ = eolrepo
     repo._hgcleardirstate()