diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-07-27 10:15:41 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-07-27 10:15:41 -0700 |
| commit | 9f62ed218fa656607740b386c0caa03e65dcd283 (patch) | |
| tree | 6bde49bc5e4c4241266b108e4277baef4b85535d /contrib/git-commit-mklog.py | |
| parent | 71e955da39cea0ebffcfee3432effa622d14ca99 (diff) | |
| parent | 5eb9f117a361538834b9740d59219911680717d1 (diff) | |
| download | gcc-9f62ed218fa656607740b386c0caa03e65dcd283.zip gcc-9f62ed218fa656607740b386c0caa03e65dcd283.tar.gz gcc-9f62ed218fa656607740b386c0caa03e65dcd283.tar.bz2 | |
Merge from trunk revision 5eb9f117a361538834b9740d59219911680717d1.
Diffstat (limited to 'contrib/git-commit-mklog.py')
| -rwxr-xr-x | contrib/git-commit-mklog.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/contrib/git-commit-mklog.py b/contrib/git-commit-mklog.py index eda3fc4..c7e90c8 100755 --- a/contrib/git-commit-mklog.py +++ b/contrib/git-commit-mklog.py @@ -24,6 +24,7 @@ # to mklog.py script. import argparse +import json import os import subprocess @@ -32,8 +33,7 @@ if __name__ == '__main__': 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='?', + parser.add_argument('-b', '--pr-numbers', help='Add the specified PRs (comma separated)') parser.add_argument('-p', '--fill-up-bug-titles', action='store_true', help='Download title of mentioned PRs') @@ -44,12 +44,13 @@ if __name__ == '__main__': myenv['GCC_FORCE_MKLOG'] = '1' mklog_args = [] if args.pr_numbers: - mklog_args.append(f'-b {",".join(args.pr_numbers)}') + mklog_args += ['-b', args.pr_numbers] if args.fill_up_bug_titles: mklog_args.append('-p') if mklog_args: - myenv['GCC_MKLOG_ARGS'] = ' '.join(mklog_args) + # wrap mklog arguments with JSON + myenv['GCC_MKLOG_ARGS'] = json.dumps(mklog_args) if args.co: for author in args.co.split(','): |