Merge pull request #9597 from Harry-Ramsey/code-style-framework-submodule-support

Improve support for submodules in code_style.py
This commit is contained in:
Janos Follath 2024-10-15 14:18:16 +00:00 committed by GitHub
commit c1cb3dcc0f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -103,8 +103,10 @@ def get_src_files(since: Optional[str]) -> List[str]:
"--name-only", "--pretty=", "--"] + src_files
output = subprocess.check_output(cmd, universal_newlines=True)
committed_changed_files = output.split()
# ... the framework submodule
cmd = ["git", "-C", "framework", "log", since + "..HEAD",
framework_since = get_submodule_hash(since, "framework")
cmd = ["git", "-C", "framework", "log", framework_since + "..HEAD",
"--name-only", "--pretty=", "--"] + framework_src_files
output = subprocess.check_output(cmd, universal_newlines=True,
env=framework_env)
@ -137,6 +139,12 @@ def get_src_files(since: Optional[str]) -> List[str]:
is_file_autogenerated(filename))]
return src_files
def get_submodule_hash(commit: str, submodule: str) -> str:
"""Get the commit hash of a submodule at a given commit in the Git repository."""
cmd = ["git", "ls-tree", commit, submodule]
output = subprocess.check_output(cmd, universal_newlines=True)
return output.split()[2]
def get_uncrustify_version() -> str:
"""
Get the version string from Uncrustify