Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1693)

Unified Diff: tools/git-sync-deps

Issue 351063003: tools/git-sync-deps is a stand-alone program, not dependent on synced deps. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/git-sync-deps
diff --git a/tools/git-sync-deps b/tools/git-sync-deps
index ac4576ddc7daed7b63521cb324f38cfa9a298d40..22309bd792dde7f67f124d80d5dce2957d44c987 100755
--- a/tools/git-sync-deps
+++ b/tools/git-sync-deps
@@ -11,6 +11,9 @@ Args:
An optional list of deps_os values.
Environment Variables:
+ GIT_EXECUTABLE: path to "git" binary; if unset, will look for one of
+ ['git', 'git.exe', 'git.bat'] in your default path.
+
GIT_SYNC_DEPS_PATH: file to get the dependency list from; if unset,
will use the file ../DEPS relative to this script's directory.
@@ -32,8 +35,25 @@ import subprocess
import sys
import threading
-import fix_pythonpath
-from common.py.utils.git_utils import GIT
+
+def git_executable():
+ """Find the git executable.
+
+ Returns:
+ A string suitable for passing to subprocess functions, or None.
+ """
+ envgit = os.environ.get('GIT_EXECUTABLE')
+ searchlist = ['git', 'git.exe', 'git.bat']
+ if envgit:
+ searchlist.insert(0, envgit)
+ with open(os.devnull, 'w') as devnull:
+ for git in searchlist:
+ try:
+ subprocess.call([git, '--version'], stdout=devnull)
+ except (OSError,):
+ continue
+ return git
+ return None
DEFAULT_DEPS_PATH = os.path.normpath(
@@ -146,6 +166,9 @@ def git_sync_deps(deps_file_path, deps_os_list, verbose):
Raises DepsError exception and git Exceptions.
"""
+ git = git_executable()
+ assert git
+
deps_file_directory = os.path.dirname(deps_file_path)
deps = parse_file_to_dict(deps_file_path)
dependencies = deps['deps'].copy()
@@ -167,7 +190,7 @@ def git_sync_deps(deps_file_path, deps_os_list, verbose):
relative_directory = os.path.join(deps_file_directory, directory)
list_of_arg_lists.append(
- (GIT, repo, checkoutable, relative_directory, verbose))
+ (git, repo, checkoutable, relative_directory, verbose))
multithread(git_checkout_to_directory, list_of_arg_lists)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698