Use gclient's git_cache setting in bot_update/api.py

BUG=589140
R=agable@chromium.org

Review URL: https://codereview.chromium.org/1762513002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@299120 0039d316-1c4b-4281-b951-d872f2087c98

recipe_modules/bot_update/api.py

@@ -143,7 +143,7 @@ class BotUpdateApi(recipe_api.RecipeApi):
         ['--spec', spec_string],
         ['--root', root],
         ['--revision_mapping_file', self.m.json.input(rev_map)],
-        ['--git-cache-dir', self.m.path['git_cache']],
+        ['--git-cache-dir', cfg.cache_dir],
 
         # 3. How to find the patch, if any (issue/patchset/patch_url).
         ['--issue', issue],

recipe_modules/bot_update/example.expected/basic.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-m1",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/basic_output_manifest.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-m1",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/basic_with_branch_heads.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-m1",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/clobber.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/forced.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/no_shallow.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/off.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/reset_root_solution_revision.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/svn_mode.json

@@ -11,7 +11,7 @@
       "--slave",
       "somehost",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/trychange.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/trychange_oauth2.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/tryjob.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/tryjob_fail.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/tryjob_fail_patch.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src",
       "--revision_mapping_file",

recipe_modules/bot_update/example.expected/tryjob_v8.json

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
       "--root",
       "src/v8",
       "--revision_mapping_file",

recipe_modules/bot_update/example.py

@@ -12,7 +12,7 @@ DEPS = [
 def RunSteps(api):
   api.gclient.use_mirror = True
 
-  src_cfg = api.gclient.make_config()
+  src_cfg = api.gclient.make_config(GIT_MODE=True, CACHE_DIR='[GIT_CACHE]')
   soln = src_cfg.solutions.add()
   soln.name = 'src'
   soln.url = 'svn://svn.chromium.org/chrome/trunk/src'

recipe_modules/gclient/example.py

@@ -58,7 +58,7 @@ def RunSteps(api):
   for config_name in TEST_CONFIGS:
     api.gclient.make_config(config_name)
 
-  src_cfg = api.gclient.make_config(GIT_MODE=True)
+  src_cfg = api.gclient.make_config(GIT_MODE=True, CACHE_DIR='[ROOT]/git_cache')
   soln = src_cfg.solutions.add()
   soln.name = 'src'
   soln.url = 'https://chromium.googlesource.com/chromium/src.git'