diff options
| author | Martin Liska <mliska@suse.cz> | 2022-12-19 14:34:18 +0100 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2022-12-19 14:39:25 +0100 |
| commit | 7e9ec734f9f942b8068df476f8365440fa9fd410 (patch) | |
| tree | f6b2fce153eab6a3752817716e8233dd2f2b9c47 | |
| parent | ea37e96a37b50dad17b91d46edc518bbb9132d8e (diff) | |
| download | gcc-7e9ec734f9f942b8068df476f8365440fa9fd410.zip gcc-7e9ec734f9f942b8068df476f8365440fa9fd410.tar.gz gcc-7e9ec734f9f942b8068df476f8365440fa9fd410.tar.bz2 | |
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.
| -rwxr-xr-x | contrib/gcc-changelog/git_commit.py | 2 | ||||
| -rwxr-xr-x | contrib/gcc-changelog/test_email.py | 4 | ||||
| -rw-r--r-- | contrib/gcc-changelog/test_patches.txt | 25 |
3 files changed, 30 insertions, 1 deletions
diff --git a/contrib/gcc-changelog/git_commit.py b/contrib/gcc-changelog/git_commit.py index e82fbca..7fde02c 100755 --- a/contrib/gcc-changelog/git_commit.py +++ b/contrib/gcc-changelog/git_commit.py @@ -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'[\[<(:]') diff --git a/contrib/gcc-changelog/test_email.py b/contrib/gcc-changelog/test_email.py index 79f8e0b..3e311d8 100755 --- a/contrib/gcc-changelog/test_email.py +++ b/contrib/gcc-changelog/test_email.py @@ -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 diff --git a/contrib/gcc-changelog/test_patches.txt b/contrib/gcc-changelog/test_patches.txt index 6004608..8bbd341 100644 --- a/contrib/gcc-changelog/test_patches.txt +++ b/contrib/gcc-changelog/test_patches.txt @@ -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 + |