mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-05 23:44:53 +00:00
Code Issues Projects Releases Wiki Activity

make format.py clean up extra whitespace, also in .h files (#1991)

Browse source 
* make format.py clean up extra whitespace, also in .h files

* fixup

* cleanup whitespace msg

* Update check_format.py to also check non-src files touched by format.py

* format
This commit is contained in:
Dragorn421 2024-07-18 01:32:55 +02:00 • committed by GitHub
parent aaad2e1caf
commit a1c7937dba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 74 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

29
tools/check_format.py
View file

@ -23,14 +23,15 @@ def get_modified_files_to_format(compare_to):
modified_files_str = subprocess.check_output(
["git", "diff", "--name-only", compare_to], text=True
)
modified_files = modified_files_str.splitlines()
modified_c_files = [
f
for f in modified_files
if f.startswith("src" + os.path.sep) and f.endswith(".c")
]
modified_c_files_existing = [f for f in modified_c_files if os.path.exists(f)]
return modified_c_files_existing
modified_files = set(modified_files_str.splitlines())
all_src_files, all_extra_files = format.list_files_to_format()
# Split modified_files between source files and extra files (see format.py)
# This also filters out deleted files that no logner exist
modified_src_files_existing = list(modified_files.intersection(all_src_files))
modified_extra_files_existing = list(modified_files.intersection(all_extra_files))
return modified_src_files_existing, modified_extra_files_existing
def main():
@ -40,21 +41,23 @@ def main():
args = parser.parse_args()
if args.compare_to:
src_files = get_modified_files_to_format(args.compare_to)
src_files, extra_files = get_modified_files_to_format(args.compare_to)
if args.verbose:
print("Formatting specific files:", len(src_files), src_files)
if not src_files:
print("Formatting specific files:")
print(len(src_files), src_files)
print(len(extra_files), extra_files)
if not src_files and not extra_files:
if args.verbose:
print("Nothing to format")
exit(0)
else:
src_files = glob.glob("src/**/*.c", recursive=True)
src_files, extra_files = format.list_files_to_format()
nb_jobs = multiprocessing.cpu_count()
git_status_pre = get_git_status()
format.format_files(src_files, [], nb_jobs)
format.format_files(src_files, extra_files, nb_jobs)
git_status_post = get_git_status()