diff options
| author | David Bradford <david.bradford@mongodb.com> | 2021-08-20 14:59:53 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-09-20 18:04:40 +0000 |
| commit | fc1151a689cc171b5c5cfec0052bedbefcdf0e25 (patch) | |
| tree | 6a74af20c5991b320012d3ea0eb292c1c115ed3c /buildscripts | |
| parent | b589595b1a0f9decf4473cb516a98725f2a60439 (diff) | |
| download | mongo-fc1151a689cc171b5c5cfec0052bedbefcdf0e25.tar.gz | |
SERVER-59476: Allow for commit messages reverting wiredtiger imports
(cherry picked from commit 44ecd94334b1bde9e5f39cdc0b115cbb62f414a9)
(cherry picked from commit 305a7571c88b2172665e079ec26a51cbd7af58f1)
Diffstat (limited to 'buildscripts')
| -rw-r--r-- | buildscripts/tests/test_validate_commit_message.py | 3 | ||||
| -rwxr-xr-x | buildscripts/validate_commit_message.py | 7 |
2 files changed, 9 insertions, 1 deletions
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.""" |