From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 88209383541C; Fri, 22 Jul 2022 09:41:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 88209383541C MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1796] mklog: fill-up subject prefix only for a single PR X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: d85e5aeb7665ea941ff0ef7c11bfe1d39986b48a X-Git-Newrev: 03c0b06420b7d9331c61d1958834ca0d269ee6f1 Message-Id: <20220722094132.88209383541C@sourceware.org> Date: Fri, 22 Jul 2022 09:41:32 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jul 2022 09:41:32 -0000 https://gcc.gnu.org/g:03c0b06420b7d9331c61d1958834ca0d269ee6f1 commit r13-1796-g03c0b06420b7d9331c61d1958834ca0d269ee6f1 Author: Martin Liska Date: Fri Jul 22 11:39:58 2022 +0200 mklog: fill-up subject prefix only for a single PR contrib/ChangeLog: * mklog.py: Use component: [PR xyz] only when one PR is used. Diff: --- contrib/mklog.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index cd5ef0bcc74..8693767a7f6 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -73,8 +73,6 @@ PATCH must be generated using diff(1)'s -up or -cp options script_folder = os.path.realpath(__file__) root = os.path.dirname(os.path.dirname(script_folder)) -firstpr = '' - def find_changelog(path): folder = os.path.split(path)[0] @@ -157,12 +155,13 @@ def get_rel_path_if_prefixed(path, folder): def generate_changelog(data, no_functions=False, fill_pr_titles=False, additional_prs=None): + global prs + prs = [] + changelogs = {} changelog_list = [] - prs = [] out = '' diff = PatchSet(data) - global firstpr if additional_prs: for apr in additional_prs: @@ -212,9 +211,6 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, if pr not in this_file_prs and pr2 not in prs: prs.append(pr2) - if prs: - firstpr = prs[0] - if fill_pr_titles: out += get_pr_titles(prs) @@ -372,11 +368,12 @@ if __name__ == '__main__': end = lines[len(start):] with open(args.changelog, 'w') as f: if not start or not start[0]: - # initial commit subject line 'component: [PRnnnnn]' - m = prnum_regex.match(firstpr) - if m: - title = f'{m.group("comp")}: [PR{m.group("num")}]' - start.insert(0, title) + if len(prs) == 1: + # initial commit subject line 'component: [PRnnnnn]' + m = prnum_regex.match(prs[0]) + if m: + title = f'{m.group("comp")}: [PR{m.group("num")}]' + start.insert(0, title) if start: # append empty line if start[-1] != '':