Re: [PATCH] gcc-changelog: Add libstdc++-v3/testsuite to wildcard prefixes

["Martin Liška" <mliska@suse.cz>]

[-- Attachment #1: Type: text/plain, Size: 2170 bytes --]

On 11/27/20 5:23 PM, Jonathan Wakely wrote:
> This allows using "testsuite/*" in libstdc++-v3/ChangeLog entries, which
> was one of the original motivations for adding wildcard support in the
> first place:
> https://gcc.gnu.org/pipermail/gcc/2020-June/232719.html
> 
> contrib/ChangeLog:
> 
> 	* gcc-changelog/git_commit.py (wildcard_prefixes): Add libstdc++
> 	testsuite directory.
> 
> OK to push?

Hello.

It's fine, please push it.

> 
> This still doesn't actually meet my needs, because I'd like to be able
> to do:
> 
> 	* testsuite/foo/*: Something for foo tests.
> 	* testsuite/bar/baz/*: Something for baz tests.

Fixed by the patch that I've just pushed.

> 
> So it would be nice if wildcards worked for any directory below a
> wildcard prefix (as long as the directory actually exists).

It works for me now:

$ git show c41c8c19dcc17f319c1306424f8e7de4868ce037 --stat
commit c41c8c19dcc17f319c1306424f8e7de4868ce037
Author: Martin Liska <mliska@suse.cz>
Date:   Mon Nov 30 10:35:05 2020 +0100

     Test me.
     
     libstdc++-v3/ChangeLog:
     
             * doc/html/*: All you need is love.

  libstdc++-v3/doc/html/manual/debug.html | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

$ git gcc-verify -p c41c8c19dcc17f319c1306424f8e7de4868ce037
Checking c41c8c19dcc17f319c1306424f8e7de4868ce037: OK
------ libstdc++-v3/ChangeLog ------
2020-11-30  Martin Liska  <mliska@suse.cz>

	* doc/html/*: All you need is love.

Does it also work for you now? Or does it still have a limitation?

Thanks,
Martin

> 
> It also seems that I can't have a commit where all changes are
> described by a wildcard entry. It seems to require a non-wildcard one
> too. But that means I can't make changes to hundreds of tests without
> also making some other change, or doing something like:
> 
> 	* testsuite/foo/foo-1.cc: A specific change.
>          * testsuite/*: Likewise.
> 
> I suppose I can live with the latter, but it would still be nice if
> this worked:
> 
> 	* testsuite/foo/foo-1.cc: A specific change.
>          * testsuite/foo/*: Likewise.
>          * testsuite/bar/baz/*: Likewise.
> 
> i.e. sub-directories below a wildcard prefix.
> 
> 


[-- Attachment #2: 0001-changelog-Allow-wildcard-pattern-only.patch --]
[-- Type: text/x-patch, Size: 1026 bytes --]

From fbbce1c6e98dec378955b1a591d2dff31caa01f5 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Mon, 30 Nov 2020 10:37:57 +0100
Subject: [PATCH] changelog: Allow wildcard pattern only.

contrib/ChangeLog:

	* gcc-changelog/git_commit.py: Allow wildcard pattern only.
---
 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 d0ac23c22aa..5366d95469c 100755
--- a/contrib/gcc-changelog/git_commit.py
+++ b/contrib/gcc-changelog/git_commit.py
@@ -560,7 +560,7 @@ class GitCommit:
         mentioned_patterns = []
         used_patterns = set()
         for entry in self.changelog_entries:
-            if not entry.files:
+            if not entry.files and not entry.file_patterns:
                 msg = 'no files mentioned for ChangeLog in directory'
                 self.errors.append(Error(msg, entry.folder))
             assert not entry.folder.endswith('/')
-- 
2.29.2