# HG changeset patch # User Franz Glasner # Date 1551052096 -3600 # Node ID 4aa43c79fbf81e22f55ba89d34122fcdd95be869 # Parent 663a09a4cb9856ad4d7abe88d9c2a8058a84c323 FIX: Do nothing special when repo.commit gets called with "match == None". When calling :hg:`histedit` the histedit extension code calles repo.commit() directly without setting a `match` argument. Don't fiddle around with timestamps in histedit mode. BUGS: After histedit a :hg:`timestamps --restore` is needed to correct file timestamps. diff -r 663a09a4cb98 -r 4aa43c79fbf8 extensions/timestamps.py --- a/extensions/timestamps.py Tue Feb 19 08:33:23 2019 +0100 +++ b/extensions/timestamps.py Mon Feb 25 00:48:16 2019 +0100 @@ -287,6 +287,13 @@ **kwds) def _ts_commit(self, match): + # + # histedit commits directly without setting a match -> + # cannot amend and/or leave alone + # + if match is None: + return None + wctx = self[None] tsconfmatch = _gen_matcher_from_tsconfig(wctx) if tsconfmatch is not None: