changeset 214:dddcc8ff7b6e

- FIX: Overwriting commitctx does not work properly here - removed. - FIX: Just replicate all the arguments from the Mercurial "commit" signature - Working on Mercurial version 4.6.1 on Windows: just noting it
author Franz Glasner <f.glasner@feldmann-mg.com>
date Wed, 17 Oct 2018 13:42:54 +0200
parents da2552a8b0ce
children 247698996b36
files extensions/timestamps.py
diffstat 1 files changed, 9 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/extensions/timestamps.py	Wed Oct 17 09:43:52 2018 +0200
+++ b/extensions/timestamps.py	Wed Oct 17 13:42:54 2018 +0200
@@ -77,7 +77,7 @@
 
 command = cmdutil.command(cmdtable)
 
-testedwith = "4.5.2"
+testedwith = "4.5.2 4.6.1"
 
 TIMESTAMPS_CONFIGFILE = ".hgtimestamps"
 TIMESTAMPS_DATABASE = TIMESTAMPS_CONFIGFILE + ".db"
@@ -685,7 +685,7 @@
     class TimestampedRepo(repo.__class__):
 
         def commit(self, text="", user=None, date=None, match=None,
-                   force=False, editor=False, extra=None, *args, **kwargs):
+                   force=False, editor=False, extra=None):
             wctx = self[None]
             tsmatch = gen_matcher(self, wctx)
             if tsmatch is not None:
@@ -759,15 +759,12 @@
             else:
                 self.ui.debug("TimestampedRepo.commit():"
                               " timestamps not activated/configured\n")
-            super(TimestampedRepo, self).commit(
-                *args,
-                text=text, user=user, date=date, match=match, force=force,
-                editor=editor, extra=extra,
-                **kwargs)
-
-        def commitctx(self, ctx, error=False, *args, **kwargs):
-            self.ui.debug("TimestampedRepo.commitctx()")
-            super(TimestampedRepo, self).commitctx(ctx, *args,
-                                                   error=error, **kwargs)
+            super(TimestampedRepo, self).commit(text=text,
+                                                user=user,
+                                                date=date,
+                                                match=match,
+                                                force=force,
+                                                editor=editor,
+                                                extra=extra)
 
     repo.__class__ = TimestampedRepo