Merge pull request #6834 from gilles-peskine-arm/code-style-files

code_style.py: Support restyling only the specified files
This commit is contained in:
Gilles Peskine 2023-01-19 12:26:01 +01:00 committed by GitHub
commit 52a7aeebf3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -171,18 +171,32 @@ def main() -> int:
"""
uncrustify_version = get_uncrustify_version().strip()
if UNCRUSTIFY_SUPPORTED_VERSION not in uncrustify_version:
print("Warning: Using unsupported Uncrustify version '" \
+ uncrustify_version + "' (Note: The only supported version" \
"is " + UNCRUSTIFY_SUPPORTED_VERSION + ")", file=STDOUT_UTF8)
src_files = get_src_files()
print("Warning: Using unsupported Uncrustify version '" +
uncrustify_version + "'", file=STDOUT_UTF8)
print("Note: The only supported version is " +
UNCRUSTIFY_SUPPORTED_VERSION, file=STDOUT_UTF8)
parser = argparse.ArgumentParser()
parser.add_argument('-f', '--fix', action='store_true', \
help='modify source files to fix the code style')
parser.add_argument('-f', '--fix', action='store_true',
help=('modify source files to fix the code style '
'(default: print diff, do not modify files)'))
# --files is almost useless: it only matters if there are no files
# ('code_style.py' without arguments checks all files known to Git,
# 'code_style.py --files' does nothing). In particular,
# 'code_style.py --fix --files ...' is intended as a stable ("porcelain")
# way to restyle a possibly empty set of files.
parser.add_argument('--files', action='store_true',
help='only check the specified files (default with non-option arguments)')
parser.add_argument('operands', nargs='*', metavar='FILE',
help='files to check (if none: check files that are known to git)')
args = parser.parse_args()
if args.files or args.operands:
src_files = args.operands
else:
src_files = get_src_files()
if args.fix:
# Fix mode
return fix_style(src_files)