Skip to content

[gn build] Use shutil.which to find git in write_vcsrevision.py #142570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DavidSpickett merged 1 commit into from
Jul 28, 2025
Merged

[gn build] Use shutil.which to find git in write_vcsrevision.py #142570

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 4 additions & 13 deletions llvm/utils/gn/build/write_vcsrevision.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,13 @@
import os
import subprocess
import sys
import shutil


THIS_DIR = os.path.abspath(os.path.dirname(__file__))
LLVM_DIR = os.path.dirname(os.path.dirname(os.path.dirname(THIS_DIR)))


def which(program):
# distutils.spawn.which() doesn't find .bat files,
# https://bugs.python.org/issue2200
for path in os.environ["PATH"].split(os.pathsep):
candidate = os.path.join(path, program)
if os.path.isfile(candidate) and os.access(candidate, os.X_OK):
return candidate
return None


def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument(
Expand All @@ -46,11 +37,11 @@ def main():

vcsrevision_contents = ""
if args.write_git_rev:
git, use_shell = which("git"), False
git, use_shell = shutil.which("git"), False
if not git:
git = which("git.exe")
git = shutil.which("git.exe")
if not git:
git, use_shell = which("git.bat"), True
git, use_shell = shutil.which("git.bat"), True
git_dir = (
subprocess.check_output(
[git, "rev-parse", "--git-dir"], cwd=LLVM_DIR, shell=use_shell
Expand Down
Loading