From fc1151a689cc171b5c5cfec0052bedbefcdf0e25 Mon Sep 17 00:00:00 2001
From: David Bradford <david.bradford@mongodb.com>
Date: Fri, 20 Aug 2021 14:59:53 -0400
Subject: [PATCH] SERVER-59476: Allow for commit messages reverting wiredtiger
 imports

(cherry picked from commit 44ecd94334b1bde9e5f39cdc0b115cbb62f414a9)
(cherry picked from commit 305a7571c88b2172665e079ec26a51cbd7af58f1)
---
 buildscripts/tests/test_validate_commit_message.py | 3 ++-
 buildscripts/validate_commit_message.py            | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/buildscripts/tests/test_validate_commit_message.py b/buildscripts/tests/test_validate_commit_message.py
index 0539776fd71..a1b6cc26a8d 100644
--- a/buildscripts/tests/test_validate_commit_message.py
+++ b/buildscripts/tests/test_validate_commit_message.py
@@ -46,7 +46,8 @@ class ValidateCommitMessageTest(unittest.TestCase):
             "Revert 'SERVER-8000",
             'Revert "SERVER-90000',
             "Import wiredtiger: 58115abb6fbb3c1cc7bfd087d41a47347bce9a69 from branch mongodb-4.4",
-            "Import tools: 58115abb6fbb3c1cc7bfd087d41a47347bce9a69 from branch mongodb-4.4"
+            "Import tools: 58115abb6fbb3c1cc7bfd087d41a47347bce9a69 from branch mongodb-4.4",
+            'Revert "Import wiredtiger: 58115abb6fbb3c1cc7bfd087d41a47347bce9a69 from branch mongodb-4.4"',
         ]
 
         self.assertTrue(
diff --git a/buildscripts/validate_commit_message.py b/buildscripts/validate_commit_message.py
index e9e186dd25c..733f8903686 100755
--- a/buildscripts/validate_commit_message.py
+++ b/buildscripts/validate_commit_message.py
@@ -47,6 +47,9 @@ COMMON_LINT_PATTERN = r'(?P<lint>Fix\slint)'
 COMMON_IMPORT_PATTERN = r'(?P<imported>Import\s(wiredtiger|tools):\s.*)'
 """Common Import pattern format."""
 
+COMMON_REVERT_IMPORT_PATTERN = r'Revert\s+[\"\']?(?P<imported>Import\s(wiredtiger|tools):\s.*)'
+"""Common revert Import pattern format."""
+
 COMMON_PRIVATE_PATTERN = r'''
     ((?P<revert>Revert)\s+[\"\']?)?                                     # Revert (optional)
     ((?P<ticket>[A-Z]+-[0-9]+)[\"\']?\s*)                               # ticket identifier
@@ -100,6 +103,10 @@ VALID_PATTERNS = [
     re.compile(old_patch_description(COMMON_LINT_PATTERN), re.MULTILINE | re.DOTALL | re.VERBOSE),
     re.compile(new_patch_description(COMMON_IMPORT_PATTERN), re.MULTILINE | re.DOTALL | re.VERBOSE),
     re.compile(old_patch_description(COMMON_IMPORT_PATTERN), re.MULTILINE | re.DOTALL | re.VERBOSE),
+    re.compile(
+        new_patch_description(COMMON_REVERT_IMPORT_PATTERN), re.MULTILINE | re.DOTALL | re.VERBOSE),
+    re.compile(
+        old_patch_description(COMMON_REVERT_IMPORT_PATTERN), re.MULTILINE | re.DOTALL | re.VERBOSE),
 ]
 """valid public patterns."""