From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 0FC253858006; Mon, 17 Jan 2022 21:32:49 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 0FC253858006 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 r12-6653] git-backport: support renamed .cc files in commit message. X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: cd9912b5930961ffb2832f67a4d18a7b92c06e51 X-Git-Newrev: 938ea06c5e9e06a4c81965fcabc36d2da5e2f868 Message-Id: <20220117213249.0FC253858006@sourceware.org> Date: Mon, 17 Jan 2022 21:32:49 +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: Mon, 17 Jan 2022 21:32:49 -0000 https://gcc.gnu.org/g:938ea06c5e9e06a4c81965fcabc36d2da5e2f868 commit r12-6653-g938ea06c5e9e06a4c81965fcabc36d2da5e2f868 Author: Martin Liska Date: Wed Jan 12 16:35:41 2022 +0100 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. Diff: --- contrib/git-backport.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/contrib/git-backport.py b/contrib/git-backport.py index bc2907a14ed..83189a2b5c7 100755 --- a/contrib/git-backport.py +++ b/contrib/git-backport.py @@ -20,7 +20,31 @@ # Boston, MA 02110-1301, USA. import argparse +import os import subprocess +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.') @@ -28,3 +52,27 @@ if __name__ == '__main__': args = parser.parse_args() subprocess.run('git cherry-pick -x %s' % args.revision, shell=True) + + # 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.')