gcc-changelog: allow digit in component name

contrib/ChangeLog:

	* gcc-changelog/git_commit.py: Allow digit in component name.

contrib/ChangeLog:

	* gcc-changelog/test_email.py: Add new test.
	* gcc-changelog/test_patches.txt: Add new patch.
This commit is contained in:
Martin Liska 2022-12-19 14:34:18 +01:00
parent ea37e96a37
commit 7e9ec734f9
3 changed files with 30 additions and 1 deletions

View File

@ -165,7 +165,7 @@ additional_author_regex = re.compile(r'^\t(?P<spaces>\ *)?(?P<name>.* <.*>)')
changelog_regex = re.compile(r'^(?:[fF]or +)?([a-z0-9+-/]*)ChangeLog:?')
subject_pr_regex = re.compile(r'(^|\W)PR\s+(?P<component>[a-zA-Z+-]+)/(?P<pr>\d{4,7})')
subject_pr2_regex = re.compile(r'[(\[]PR\s*(?P<pr>\d{4,7})[)\]]')
pr_regex = re.compile(r'\tPR (?P<component>[a-z+-]+\/)?(?P<pr>[0-9]+)$')
pr_regex = re.compile(r'\tPR (?P<component>[a-z0-9+-]+\/)?(?P<pr>[0-9]+)$')
dr_regex = re.compile(r'\tDR ([0-9]+)$')
star_prefix_regex = re.compile(r'\t\*(?P<spaces>\ *)(?P<content>.*)')
end_of_location_regex = re.compile(r'[\[<(:]')

View File

@ -475,3 +475,7 @@ class TestGccChangelog(unittest.TestCase):
assert (len(email.warnings) == 2)
assert (email.warnings[0] == "Auto-added new file 'gcc/doc/gm2.texi'")
assert (email.warnings[1] == "Auto-added 2 new files in 'gcc/m2'")
def test_digit_in_PR_component(self):
email = self.from_patch_glob('modula-PR-component.patch')
assert not email.errors

View File

@ -3732,3 +3732,28 @@ index 00000000000..649af5e573a
+GCC RUNTIME LIBRARY EXCEPTION
--
2.25.1
=== modula-PR-component.patch ===
From 1052d89a0b9769453561e18da32b1558d059b320 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 19 Dec 2022 14:34:18 +0100
Subject: [PATCH] gcc-changelog: allow digit in component name
PR modula2/123456
contrib/ChangeLog:
* gcc-changelog/git_commit.py: Allow digit in component name.
---
contrib/gcc-changelog/git_commit.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py
index e82fbcacd3e..7fde02cba85 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -0,0 +1,1 @@
+ GNU Free Documentation License
--
2.39.0