From 12ade4c49d6a72292c80688c840071d972924e56 Mon Sep 17 00:00:00 2001
From: Alex Vandiver <alexmv@zulip.com>
Date: Tue, 23 Feb 2021 14:21:45 -0800
Subject: [PATCH] lint: Rely on core gitlint skipping of revert commits.

gitlint 0.13.0 and above skip revert commits[1].  This obviates the
need for a custom rule.

[1] https://jorisroovers.com/gitlint/configuration/#ignore-revert-commits
---
 .gitlint                   |  2 +-
 requirements/dev.in        |  2 +-
 tools/lib/gitlint-rules.py | 25 +------------------------
 3 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/.gitlint b/.gitlint
index 0afb421327..9f31197ee2 100644
--- a/.gitlint
+++ b/.gitlint
@@ -3,7 +3,7 @@ ignore=title-trailing-punctuation, body-min-length, body-is-missing, title-imper
 
 extra-path=tools/lib/gitlint-rules.py
 
-[title-match-regex-allow-exception]
+[title-match-regex]
 regex=^(.+:\ )?[A-Z].+\.$
 
 [title-max-length]
diff --git a/requirements/dev.in b/requirements/dev.in
index cfc2c19b08..a500064aa8 100644
--- a/requirements/dev.in
+++ b/requirements/dev.in
@@ -45,7 +45,7 @@ pyinotify
 tblib
 
 # Needed to lint Git commit messages
-gitlint
+gitlint>=0.13.0
 
 # Needed for visualising cprofile reports
 snakeviz
diff --git a/tools/lib/gitlint-rules.py b/tools/lib/gitlint-rules.py
index 6b516ecc30..1ffc7c27db 100644
--- a/tools/lib/gitlint-rules.py
+++ b/tools/lib/gitlint-rules.py
@@ -1,8 +1,6 @@
-import re
 from typing import List
 
 from gitlint.git import GitCommit
-from gitlint.options import StrOption
 from gitlint.rules import CommitMessageTitle, LineRule, RuleViolation
 
 # Word list from https://github.com/m1foley/fit-commit
@@ -307,31 +305,10 @@ class ImperativeMood(LineRule):
             violation = RuleViolation(
                 self.id,
                 self.error_msg.format(
-                    word=first_word,
-                    imperative=imperative,
-                    title=commit.message.title,
+                    word=first_word, imperative=imperative, title=commit.message.title,
                 ),
             )
 
             violations.append(violation)
 
         return violations
-
-
-class TitleMatchRegexAllowException(LineRule):
-    """Allows revert commits contrary to the built-in title-match-regex rule"""
-
-    name = "title-match-regex-allow-exception"
-    id = "Z2"
-    target = CommitMessageTitle
-    options_spec = [StrOption("regex", ".*", "Regex the title should match")]
-
-    def validate(self, title: str, commit: GitCommit) -> List[RuleViolation]:
-
-        regex = self.options["regex"].value
-        pattern = re.compile(regex, re.UNICODE)
-        if not pattern.search(title) and not title.startswith('Revert "'):
-            violation_msg = f"Title does not match regex ({regex})"
-            return [RuleViolation(self.id, violation_msg, title)]
-
-        return []