contrib: add git-commit-mklog wrapper
contrib/ChangeLog: * gcc-git-customization.sh: Use the new wrapper. * git-commit-mklog.py: New file. * prepare-commit-msg: Support GCC_MKLOG_ARGS.
This commit is contained in:
parent
47749c43ac
commit
c2124b51a9
|
@ -28,7 +28,7 @@ git config alias.gcc-undescr \!"f() { o=\$(git config --get gcc-config.upstream)
|
||||||
git config alias.gcc-verify '!f() { "`git rev-parse --show-toplevel`/contrib/gcc-changelog/git_check_commit.py" $@; } ; f'
|
git config alias.gcc-verify '!f() { "`git rev-parse --show-toplevel`/contrib/gcc-changelog/git_check_commit.py" $@; } ; f'
|
||||||
git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/git-backport.py" $@; } ; f'
|
git config alias.gcc-backport '!f() { "`git rev-parse --show-toplevel`/contrib/git-backport.py" $@; } ; f'
|
||||||
git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f'
|
git config alias.gcc-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/mklog.py" $@; } ; f'
|
||||||
git config alias.gcc-commit-mklog '!f() { GCC_FORCE_MKLOG=1 git commit "$@"; }; f'
|
git config alias.gcc-commit-mklog '!f() { "`git rev-parse --show-toplevel`/contrib/git-commit-mklog.py" $@; }; f'
|
||||||
|
|
||||||
# Make diff on MD files use "(define" as a function marker.
|
# Make diff on MD files use "(define" as a function marker.
|
||||||
# Use this in conjunction with a .gitattributes file containing
|
# Use this in conjunction with a .gitattributes file containing
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
|
# Copyright (C) 2020 Free Software Foundation, Inc.
|
||||||
|
#
|
||||||
|
# This file is part of GCC.
|
||||||
|
#
|
||||||
|
# GCC is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 3, or (at your option)
|
||||||
|
# any later version.
|
||||||
|
#
|
||||||
|
# GCC is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with GCC; see the file COPYING. If not, write to
|
||||||
|
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
|
||||||
|
# Boston, MA 02110-1301, USA.
|
||||||
|
#
|
||||||
|
# The script is wrapper for git commit-mklog alias where it parses
|
||||||
|
# -b/--pr-numbers argument and passes it via environment variable
|
||||||
|
# to mklog.py script.
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
children_args = []
|
||||||
|
myenv = os.environ.copy()
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(description='git-commit-mklog wrapped')
|
||||||
|
parser.add_argument('-b', '--pr-numbers', action='store',
|
||||||
|
type=lambda arg: arg.split(','), nargs='?',
|
||||||
|
help='Add the specified PRs (comma separated)')
|
||||||
|
parser.add_argument('-p', '--fill-up-bug-titles', action='store_true',
|
||||||
|
help='Download title of mentioned PRs')
|
||||||
|
args, unknown_args = parser.parse_known_args()
|
||||||
|
|
||||||
|
myenv['GCC_FORCE_MKLOG'] = '1'
|
||||||
|
mklog_args = []
|
||||||
|
if args.pr_numbers:
|
||||||
|
mklog_args.append(f'-b {",".join(args.pr_numbers)}')
|
||||||
|
if args.fill_up_bug_titles:
|
||||||
|
mklog_args.append('-p')
|
||||||
|
|
||||||
|
if mklog_args:
|
||||||
|
myenv['GCC_MKLOG_ARGS'] = ' '.join(mklog_args)
|
||||||
|
|
||||||
|
commit_args = ' '.join(unknown_args)
|
||||||
|
subprocess.run(f'git commit {commit_args}', shell=True, env=myenv)
|
|
@ -78,4 +78,4 @@ else
|
||||||
tee="cat"
|
tee="cat"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
git $cmd | $tee | git gcc-mklog -c "$COMMIT_MSG_FILE"
|
git $cmd | $tee | git gcc-mklog $GCC_MKLOG_ARGS -c "$COMMIT_MSG_FILE"
|
||||||
|
|
Loading…
Reference in New Issue