# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1564909308 -7200
# Node ID b61ceb9d86cdab524b8530a823816b4fc9fef2d7
# Parent  2a9c055c560d9e3d61e99da383b72c8334c82cb5
FIX: Remove syntax errors from the previous commit: a bogus free-standing return and a call to a not yet renamed method

diff -r 2a9c055c560d -r b61ceb9d86cd extensions/timestamps.py
--- a/extensions/timestamps.py	Sun Aug 04 09:41:03 2019 +0200
+++ b/extensions/timestamps.py	Sun Aug 04 11:01:48 2019 +0200
@@ -226,7 +226,7 @@
 
         def commit(self, text=b"", user=None, date=None, match=None,
                    force=False, editor=False, extra=None, **kwds):
-            match = self._tss_commit(match)
+            match = self._ts_commit(match)
             return super(TimestampedRepo, self).commit(text=text,
                                                        user=user,
                                                        date=date,
@@ -342,7 +342,6 @@
             """Called on :hg:`hg update` and :hg:`hg merge`
 
             """
-                return
             if not self.__hooktype \
                    or self.__hooktype not in (b"pre-update",
                                               b"pre-merge"):