From: "Martin Liška" <mliska@suse.cz>
To: Jakub Jelinek <jakub@redhat.com>
Cc: GCC Mailing List <gcc@gcc.gnu.org>,
Martin Jambor <mjambor@suse.cz>,
GCC Patches <gcc-patches@gcc.gnu.org>,
gfortran <fortran@gcc.gnu.org>
Subject: [PATCH] git-backport: support renamed .cc files in commit message.
Date: Wed, 12 Jan 2022 16:54:46 +0100 [thread overview]
Message-ID: <486de71c-d1fc-5ca7-4036-59462a75f116@suse.cz> (raw)
In-Reply-To: <78c91bbb-34d7-36f6-0d69-d8a4e7f446f5@suse.cz>
[-- Attachment #1: Type: text/plain, Size: 1231 bytes --]
Hi.
There's a patch that enhances git-backport so that it updates commit
messages for files which name ends now with .cc and is still .c on a branch.
Example usage:
$ git show test
commit 8ed4b2cb9aa158c0ef418fd1ac66271664904604 (test)
Author: Martin Liska <mliska@suse.cz>
Date: Wed Jan 12 16:08:13 2022 +0100
Fix file.
gcc/ChangeLog:
* ipa-icf.cc: Test me.
gcc/ada/ChangeLog:
* cal.c: aaa.
libcpp/ChangeLog:
* expr.cc: aaa.
$ git gcc-backport test
Auto-merging gcc/ada/cal.c
Auto-merging gcc/ipa-icf.c
Auto-merging libcpp/expr.c
[test2 ee40feb077e] Fix file.
Date: Wed Jan 12 16:08:13 2022 +0100
3 files changed, 3 insertions(+)
Commit message updated: 2 .cc file(s) changed.
$ git show test2
commit f59a1e736c1b68f07d83388a994df8d043e8aa6e (test2)
Author: Martin Liska <mliska@suse.cz>
Date: Wed Jan 12 16:08:13 2022 +0100
Fix file.
gcc/ChangeLog:
* ipa-icf.c: Test me.
gcc/ada/ChangeLog:
* cal.c: aaa.
libcpp/ChangeLog:
* expr.c: aaa.
(cherry picked from commit 8ed4b2cb9aa158c0ef418fd1ac66271664904604)
Martin
[-- Attachment #2: 0001-git-backport-support-renamed-.cc-files-in-commit-mes.patch --]
[-- Type: text/x-patch, Size: 2987 bytes --]
From 647a6dbaf8cde4ee07b95c4530a03f7774500914 Mon Sep 17 00:00:00 2001
From: Martin Liska <mliska@suse.cz>
Date: Wed, 12 Jan 2022 16:35:41 +0100
Subject: [PATCH] git-backport: support renamed .cc files in commit message.
The change can automatically update names for *.cc files that
are part of a backport.
contrib/ChangeLog:
* git-backport.py: Support renaming of .cc files.
---
contrib/git-backport.py | 50 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/contrib/git-backport.py b/contrib/git-backport.py
index 2b8e4686719..627bbd9ee66 100755
--- a/contrib/git-backport.py
+++ b/contrib/git-backport.py
@@ -20,7 +20,32 @@
# Boston, MA 02110-1301, USA.
import argparse
+import os
import subprocess
+import sys
+import tempfile
+
+script_folder = os.path.dirname(os.path.abspath(__file__))
+verify_script = os.path.join(script_folder,
+ 'gcc-changelog/git_check_commit.py')
+
+
+def replace_file_in_changelog(lines, filename):
+ if not filename.endswith('.cc'):
+ return
+
+ # consider all componenets of a path: gcc/ipa-icf.cc
+ while filename:
+ for i, line in enumerate(lines):
+ if filename in line:
+ line = line.replace(filename, filename[:-1])
+ lines[i] = line
+ return
+ parts = filename.split('/')
+ if len(parts) == 1:
+ return
+ filename = '/'.join(parts[1:])
+
if __name__ == '__main__':
parser = argparse.ArgumentParser(description='Backport a git revision and '
@@ -63,3 +88,28 @@ if __name__ == '__main__':
subprocess.check_output(cmd, shell=True)
else:
print('Please resolve all remaining file conflicts.')
+ sys.exit(1)
+
+ # Update commit message if change for a .cc file was taken
+ r = subprocess.run(f'{verify_script} HEAD', shell=True, encoding='utf8',
+ stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ if r.returncode != 0:
+ lines = r.stdout.splitlines()
+ cmd = 'git show -s --format=%B'
+ commit_message = subprocess.check_output(cmd, shell=True,
+ encoding='utf8').strip()
+ commit_message = commit_message.splitlines()
+
+ todo = [line for line in lines if 'unchanged file mentioned' in line]
+ for item in todo:
+ filename = item.split()[-1].strip('"')
+ replace_file_in_changelog(commit_message, filename)
+
+ with tempfile.NamedTemporaryFile('w', encoding='utf8',
+ delete=False) as w:
+ w.write('\n'.join(commit_message))
+ w.close()
+ subprocess.check_output(f'git commit --amend -F {w.name}',
+ shell=True, encoding='utf8')
+ os.unlink(w.name)
+ print(f'Commit message updated: {len(todo)} .cc file(s) changed.')
--
2.34.1
next prev parent reply other threads:[~2022-01-12 15:54 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-07 10:25 Mass rename of C++ .c files to .cc suffix? Martin Jambor
2022-01-07 10:33 ` Richard Sandiford
2022-01-07 10:44 ` Andrew Pinski
2022-01-07 10:51 ` Jonathan Wakely
2022-01-07 10:51 ` Jakub Jelinek
2022-01-07 11:05 ` Jonathan Wakely
2022-01-07 12:55 ` Martin Liška
2022-01-07 14:42 ` Iain Sandoe
2022-01-07 14:49 ` Jeff Law
2022-01-07 15:45 ` Jeff Law
2022-01-07 15:59 ` David Malcolm
2022-01-07 17:31 ` Jonathan Wakely
2022-01-10 9:11 ` Martin Liška
2022-01-07 18:33 ` Alexandre Oliva
2022-01-07 19:01 ` Jakub Jelinek
2022-01-11 12:56 ` [PATCH] Mass rename of C++ .c files to .cc suffix Martin Liška
2022-01-11 15:48 ` Toon Moene
2022-01-11 15:50 ` Martin Liška
2022-01-11 15:56 ` Jakub Jelinek
2022-01-11 16:03 ` Martin Liška
2022-01-11 16:16 ` Jakub Jelinek
2022-01-12 8:58 ` Martin Liška
2022-01-12 15:54 ` Martin Liška [this message]
2022-01-14 7:44 ` [PATCH] git-backport: support renamed .cc files in commit message Bernhard Reutner-Fischer
2022-01-14 15:26 ` Martin Liška
2022-01-17 21:26 ` Martin Liška
2022-01-18 19:10 ` Harald Anlauf
2022-01-19 8:07 ` Martin Liška
2022-01-11 18:00 ` [PATCH] Mass rename of C++ .c files to .cc suffix Harald Anlauf
2022-01-11 18:00 ` Harald Anlauf
2022-01-11 18:23 ` Jonathan Wakely
2022-01-11 18:36 ` Jakub Jelinek
2022-01-13 11:01 ` [ANNOUNCEMENT] Mass rename of C++ .c files to .cc suffix is going to happen on Jan 17 evening UTC TZ Martin Liška
2022-01-17 21:41 ` Martin Liška
2022-01-18 8:36 ` Eric Botcazou
2022-01-18 8:39 ` Martin Liška
2022-01-18 8:46 ` Eric Botcazou
2022-01-18 8:53 ` Richard Biener
2022-01-18 9:08 ` Martin Liška
2022-01-18 9:13 ` Jakub Jelinek
2022-01-18 9:43 ` Martin Liška
2022-01-18 13:10 ` Richard Earnshaw
2022-01-18 13:16 ` Martin Liška
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=486de71c-d1fc-5ca7-4036-59462a75f116@suse.cz \
--to=mliska@suse.cz \
--cc=fortran@gcc.gnu.org \
--cc=gcc-patches@gcc.gnu.org \
--cc=gcc@gcc.gnu.org \
--cc=jakub@redhat.com \
--cc=mjambor@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).