Skip syncing V8_bleeding_edge unless bisecting V8.

tools/bisect_utils.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Set of operations/utilities related to checking out the depot, and
 outputting annotations on the buildbot waterfall. These are intended to be
 used by the bisection scripts."""
 
 import errno
 import os
 import shutil
 import subprocess
 import sys
 
-
-GCLIENT_SPEC = """
-solutions = [
+GCLIENT_SPEC_DATA = [
   { "name"        : "src",
     "url"         : "https://chromium.googlesource.com/chromium/src.git",
     "deps_file"   : ".DEPS.git",
     "managed"     : True,
     "custom_deps" : {
-      "src/data/page_cycler": "https://chrome-internal.googlesource.com/" +
+      "src/data/page_cycler": "https://chrome-internal.googlesource.com/"
                               "chrome/data/page_cycler/.git",
-      "src/data/dom_perf": "https://chrome-internal.googlesource.com/" +
+      "src/data/dom_perf": "https://chrome-internal.googlesource.com/"
                            "chrome/data/dom_perf/.git",
-      "src/tools/perf/data": "https://chrome-internal.googlesource.com/" +
+      "src/tools/perf/data": "https://chrome-internal.googlesource.com/"
                              "chrome/tools/perf/data/.git",
-      "src/v8_bleeding_edge": "git://github.com/v8/v8.git",
     },
     "safesync_url": "",
   },
 ]
-"""
-GCLIENT_SPEC = ''.join([l for l in GCLIENT_SPEC.splitlines()])
-GCLIENT_SPEC_ANDROID = GCLIENT_SPEC + "\ntarget_os = ['android']"
+GCLIENT_ANDROID = "\ntarget_os = ['android']"
+GCLIENT_CUSTOM_DEPS_V8 = {"src/v8_bleeding_edge": "git://github.com/v8/v8.git"}
 FILE_DEPS_GIT = '.DEPS.git'
 
 REPO_PARAMS = [
   'https://chrome-internal.googlesource.com/chromeos/manifest-internal/',
   '--repo-url',
   'https://git.chromium.org/external/repo.git'
 ]
 
 REPO_SYNC_COMMAND = 'git checkout -f $(git rev-list --max-count=1 '\
                     '--before=%d remotes/m/master)'
@@ skipping 32 matching lines @@
   os.chdir(working_directory)
   try:
     os.mkdir('bisect')
   except OSError, e:
     if e.errno != errno.EEXIST:
       return False
   os.chdir('bisect')
   return True
 
 
-def SubprocessCall(cmd):
+def SubprocessCall(cmd, cwd=None):
   """Runs a subprocess with specified parameters.
 
   Args:
     params: A list of parameters to pass to gclient.
+    cwd: Working directory to run from.
 
   Returns:
     The return code of the call.
   """
   if os.name == 'nt':
     # "HOME" isn't normally defined on windows, but is needed
     # for git to find the user's .netrc file.
     if not os.getenv('HOME'):
       os.environ['HOME'] = os.environ['USERPROFILE']
   shell = os.name == 'nt'
-  return subprocess.call(cmd, shell=shell)
+  return subprocess.call(cmd, shell=shell, cwd=cwd)
 
 
-def RunGClient(params):
+def RunGClient(params, cwd=None):
   """Runs gclient with the specified parameters.
 
   Args:
     params: A list of parameters to pass to gclient.
+    cwd: Working directory to run from.
 
   Returns:
     The return code of the call.
   """
   cmd = ['gclient'] + params
 
-  return SubprocessCall(cmd)
+  return SubprocessCall(cmd, cwd=cwd)
 
 
 def RunRepo(params):
   """Runs cros repo command with specified parameters.
 
   Args:
     params: A list of parameters to pass to gclient.
 
   Returns:
     The return code of the call.
@@ skipping 10 matching lines @@
     params: Unix timestamp to sync to.
 
   Returns:
     The return code of the call.
   """
   repo_sync = REPO_SYNC_COMMAND % timestamp
   cmd = ['forall', '-c', REPO_SYNC_COMMAND % timestamp]
   return RunRepo(cmd)
 
 
-def RunGClientAndCreateConfig(opts):
+def RunGClientAndCreateConfig(opts, custom_deps=None, cwd=None):
   """Runs gclient and creates a config containing both src and src-internal.
 
   Args:
     opts: The options parsed from the command line through parse_args().
+    custom_deps: A dictionary of additional dependencies to add to .gclient.
+    cwd: Working directory to run from.
 
   Returns:
     The return code of the call.
   """
-  spec = GCLIENT_SPEC
+  spec = GCLIENT_SPEC_DATA
+
+  if custom_deps:
+    for k, v in custom_deps.iteritems():
+      spec[0]['custom_deps'][k] = v
+
+  # Cannot have newlines in string on windows
+  spec = 'solutions =' + str(spec)
+  spec = ''.join([l for l in spec.splitlines()])
+
   if opts.target_platform == 'android':
-    spec = GCLIENT_SPEC_ANDROID
+    spec += GCLIENT_SPEC_ANDROID
 
   return_code = RunGClient(
-      ['config', '--spec=%s' % spec, '--git-deps'])
+      ['config', '--spec=%s' % spec, '--git-deps'], cwd=cwd)
   return return_code
 
 
 def IsDepsFileBlink():
   """Reads .DEPS.git and returns whether or not we're using blink.
 
   Returns:
     True if blink, false if webkit.
   """
   locals = {'Var': lambda _: locals["vars"][_],
@@ skipping 11 matching lines @@
   try:
     path_to_dir = os.path.join(os.getcwd(), 'third_party', 'WebKit')
     if os.path.exists(path_to_dir):
       shutil.rmtree(path_to_dir)
   except OSError, e:
     if e.errno != errno.ENOENT:
       return False
   return True
 
 
-def RunGClientAndSync(reset):
+def RunGClientAndSync(reset, cwd=None):
   """Runs gclient and does a normal sync.
 
   Args:
     reset: Whether to reset any changes to the depot.
+    cwd: Working directory to run from.
 
   Returns:
     The return code of the call.
   """
   params = ['sync', '--verbose', '--nohooks']
   if reset:
     params.extend(['--reset', '--force', '--delete_unversioned_trees'])
-  return RunGClient(params)
+  return RunGClient(params, cwd=cwd)
 
 
 def SetupGitDepot(opts, reset):
   """Sets up the depot for the bisection. The depot will be located in a
   subdirectory called 'bisect'.
 
   Args:
     opts: The options parsed from the command line through parse_args().
     reset: Whether to reset any changes to the depot.
 
@@ skipping 111 matching lines @@
     print 'Error: Could not create bisect directory.'
     print
     return 1
 
   if not SetupGitDepot(opts, reset):
     print 'Error: Failed to grab source.'
     print
     return 1
 
   return 0