On May 25, 2020, Martin Liška <mli...@suse.cz> wrote:
> On 5/21/20 5:14 PM, Rainer Orth wrote:
>> * In changelog_location, you allow only (among others) "a/b/c/" and
>> "\ta/b/c/". Please also accept the "a/b/c:" and "\ta/b/c:" forms
>> here: especially the second seems quite common.
> Ok, I believe these formats are supported as well. Feel free to mention
> some git revisions that are not recognized.
I've long used the following syntax to start ChangeLog entries:
for <some/dir>/ChangeLog
It was introduced over 20 years ago, with the (so far never formally
released) GNU CVS-Utilities. Among other goodies, there were scripts to
turn diffs for ChangeLog files into the above format, and vice-versa,
that I've used to this day. It went through cvs, svn and git. It would
be quite nice if I could keep on using it with GCC.
The patch below seems to be enough to pass gcc-verify, and to recognize
and print the expected ChangeLog files. I suppose I'll have to adjust
the formatting to be able to push it, but, aside from that, is it ok to
install?
Do any hooks need to be adjusted to match?
I'm also a little concerned about '*/ChangeLog.*' files. Are we no
longer supposed to introduce them, or new ChangeLog entries to them? Or
should the scripts be extended to cover them?
for contrib/ChangeLog
* gcc-changelog/git_commit.py (changelog_regex): Accept optional
'for' prefix.
diff --git a/contrib/gcc-changelog/git_commit.py
b/contrib/gcc-changelog/git_commit.py
index 2cfdbc8..b8362c1 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -144,7 +144,7 @@ misc_files = [
author_line_regex = \
re.compile(r'^(?P<datetime>\d{4}-\d{2}-\d{2})\ {2}(?P<name>.* <.*>)')
additional_author_regex = re.compile(r'^\t(?P<spaces>\ *)?(?P<name>.* <.*>)')
-changelog_regex = re.compile(r'^([a-z0-9+-/]*)/ChangeLog:?')
+changelog_regex = re.compile(r'^(?:[fF]or +)([a-z0-9+-/]*)/ChangeLog:?')
pr_regex = re.compile(r'\tPR (?P<component>[a-z+-]+\/)?([0-9]+)$')
dr_regex = re.compile(r'\tDR ([0-9]+)$')
star_prefix_regex = re.compile(r'\t\*(?P<spaces>\ *)(?P<content>.*)')
--
Alexandre Oliva, freedom fighter he/him https://FSFLA.org/blogs/lxo/
Free Software Evangelist Stallman was right, but he's left :(
GNU Toolchain Engineer Live long and free, and prosper ethically
