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

Unified Diff: toolchain_build/command.py

Issue 355883002: The toolchain_build git cache is now referenced as a git-alternate. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: rebase 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 | « pynacl/repo_tools.py ('k') | toolchain_build/substituter.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: toolchain_build/command.py
diff --git a/toolchain_build/command.py b/toolchain_build/command.py
index abab1c0d8adb2a880a79d773ec288da927b6ac0d..f1eab97b5b060dec85286ef7a4110603b8f7a0c6 100755
--- a/toolchain_build/command.py
+++ b/toolchain_build/command.py
@@ -374,21 +374,14 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
pynacl.repo_tools.GitSetRemoteRepo(updated_fetch_url, abs_dir,
push_url=updated_push_url)
-
def populate_cache(subst, git_cache, url):
if git_cache:
abs_git_cache = subst.SubstituteAbsPaths(git_cache)
if abs_git_cache:
pynacl.repo_tools.PopulateGitCache(abs_git_cache, [url])
- def validate(subst, url, directory, git_cache):
- expected_url = url
- if git_cache:
- abs_git_cache = subst.SubstituteAbsPaths(git_cache)
- if abs_git_cache:
- expected_url = pynacl.repo_tools.GetGitCacheURL(abs_git_cache, url)
-
- pynacl.repo_tools.ValidateGitRepo(expected_url,
+ def validate(subst, url, directory):
+ pynacl.repo_tools.ValidateGitRepo(url,
subst.SubstituteAbsPaths(directory),
clobber_mismatch=True)
@@ -433,7 +426,7 @@ def SyncGitRepoCmds(url, destination, revision, clobber_invalid_repo=False,
commands.extend([Runnable(run_cond, update_valid_mirrors, url, push_url,
destination, known_mirrors, push_mirrors),
Runnable(ClobberInvalidRepoCondition, validate, url,
- destination, git_cache),
+ destination),
Runnable(run_cond, sync, url, destination, revision, reclone,
clean, pathspec, git_cache, push_url)])
return commands
« no previous file with comments | « pynacl/repo_tools.py ('k') | toolchain_build/substituter.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698