libv8 5.3.332.38.5 → 5.6.326.50.0beta1

data/vendor/depot_tools/recipe_modules/bot_update/example.expected/tryjob_v8_head_by_default.json

@@ -4,15 +4,9 @@
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
-      "--master",
-      "chromium.testing.master",
-      "--builder",
-      "TestBuilder",
-      "--slave",
-      "TestSlavename",
       "--spec",
       "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
-      "--root",
+      "--patch_root",
       "src/v8",
       "--revision_mapping_file",
       "{\"src\": \"got_cr_revision\"}",
@@ -32,15 +26,31 @@
       "src/v8@HEAD"
     ],
     "env": {
+      "GIT_HTTP_LOW_SPEED_LIMIT": "1000",
+      "GIT_HTTP_LOW_SPEED_TIME": "300",
       "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
     },
     "name": "bot_update",
     "~followup_annotations": [
+      "@@@STEP_TEXT@Some step text@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"did_run\": false, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false@@@",
+      "@@@STEP_LOG_LINE@json.output@  \"did_run\": true, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"fixed_revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src\": \"HEAD\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"src/v8\": \"HEAD\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_failure\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"patch_root\": \"src/v8\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"properties\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"got_cr_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }, @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"root\": \"src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"step_text\": \"Some step text\"@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
+      "@@@STEP_LOG_END@json.output@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
+      "@@@SET_BUILD_PROPERTY@got_cr_revision_cp@\"refs/heads/master@{#170242}\"@@@"
     ]
   },
   {

data/vendor/depot_tools/recipe_modules/bot_update/example.py

@@ -6,6 +6,7 @@ DEPS = [
   'bot_update',
   'gclient',
   'recipe_engine/path',
+  'recipe_engine/platform',
   'recipe_engine/properties',
 ]
 
@@ -25,12 +26,12 @@ def RunSteps(api):
                                                  'HEAD')
   patch = api.properties.get('patch', True)
   clobber = True if api.properties.get('clobber') else False
-  force = True if api.properties.get('force') else False
   no_shallow = True if api.properties.get('no_shallow') else False
   output_manifest = api.properties.get('output_manifest', False)
   with_branch_heads = api.properties.get('with_branch_heads', False)
   refs = api.properties.get('refs', [])
   oauth2 = api.properties.get('oauth2', False)
+  oauth2_json = api.properties.get('oauth2_json', False)
   root_solution_revision = api.properties.get('root_solution_revision')
   suffix = api.properties.get('suffix')
   gerrit_no_reset = True if api.properties.get('gerrit_no_reset') else False
@@ -44,12 +45,12 @@ def RunSteps(api):
         gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref)
   else:
     api.bot_update.ensure_checkout(
-        force=force,
         no_shallow=no_shallow,
         patch=patch,
         with_branch_heads=with_branch_heads,
         output_manifest=output_manifest,
         refs=refs, patch_oauth2=oauth2,
+        oauth2_json=oauth2_json,
         clobber=clobber,
         root_solution_revision=root_solution_revision,
         suffix=suffix,
@@ -59,110 +60,78 @@ def RunSteps(api):
 
 def GenTests(api):
   yield api.test('basic') + api.properties(
-      mastername='chromium.linux',
-      buildername='Linux Builder',
-      slavename='totallyaslave-m1',
+      patch=False,
+      revision='abc'
+  )
+  yield api.test('buildbot') + api.properties(
+      path_config='buildbot',
       patch=False,
       revision='abc'
   )
   yield api.test('basic_with_branch_heads') + api.properties(
-      mastername='chromium.linux',
-      buildername='Linux Builder',
-      slavename='totallyaslave-m1',
       with_branch_heads=True,
       suffix='with branch heads'
   )
   yield api.test('basic_output_manifest') + api.properties(
-      mastername='chromium.linux',
-      buildername='Linux Builder',
-      slavename='totallyaslave-m1',
       output_manifest=True,
   )
   yield api.test('tryjob') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       issue=12345,
       patchset=654321,
-      patch_url='http://src.chromium.org/foo/bar'
+      rietveld='https://rietveld.example.com/',
   )
   yield api.test('trychange') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       refs=['+refs/change/1/2/333'],
   )
   yield api.test('trychange_oauth2') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       oauth2=True,
   )
-  yield api.test('tryjob_fail') + api.properties(
+  yield api.test('trychange_oauth2_buildbot') + api.properties(
+      path_config='buildbot',
+      oauth2=True,
+  )
+  yield api.test('trychange_oauth2_json') + api.properties(
       mastername='tryserver.chromium.linux',
       buildername='linux_rel',
       slavename='totallyaslave-c4',
+      oauth2_json=True,
+  )
+  yield api.test('trychange_oauth2_json_win') + api.properties(
+      mastername='tryserver.chromium.win',
+      buildername='win_rel',
+      slavename='totallyaslave-c4',
+      oauth2_json=True,
+  ) + api.platform('win', 64)
+  yield api.test('tryjob_fail') + api.properties(
       issue=12345,
       patchset=654321,
-      patch_url='http://src.chromium.org/foo/bar',
+      rietveld='https://rietveld.example.com/',
   ) + api.step_data('bot_update', retcode=1)
   yield api.test('tryjob_fail_patch') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       issue=12345,
       patchset=654321,
-      patch_url='http://src.chromium.org/foo/bar',
+      rietveld='https://rietveld.example.com/',
       fail_patch='apply',
   ) + api.step_data('bot_update', retcode=88)
   yield api.test('tryjob_fail_patch_download') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       issue=12345,
       patchset=654321,
-      patch_url='http://src.chromium.org/foo/bar',
+      rietveld='https://rietveld.example.com/',
       fail_patch='download'
   ) + api.step_data('bot_update', retcode=87)
-  yield api.test('forced') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
-      force=1
-  )
   yield api.test('no_shallow') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
       no_shallow=1
   )
-  yield api.test('off') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
-  )
   yield api.test('clobber') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
       clobber=1
   )
   yield api.test('reset_root_solution_revision') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
       root_solution_revision='revision',
   )
   yield api.test('gerrit_no_reset') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
       gerrit_no_reset=1
   )
   yield api.test('gerrit_no_rebase_patch_ref') + api.properties(
-      mastername='experimental',
-      buildername='Experimental Builder',
-      slavename='somehost',
       gerrit_no_rebase_patch_ref=True
   )
   yield api.test('apply_gerrit_ref') + api.properties(
@@ -172,18 +141,31 @@ def GenTests(api):
       test_apply_gerrit_ref=True,
   )
   yield api.test('tryjob_v8') + api.properties(
-      mastername='tryserver.chromium.linux',
-      buildername='linux_rel',
-      slavename='totallyaslave-c4',
       issue=12345,
       patchset=654321,
-      patch_url='http://src.chromium.org/foo/bar',
+      rietveld='https://rietveld.example.com/',
       patch_project='v8',
       revisions={'src/v8': 'abc'}
   )
   yield api.test('tryjob_v8_head_by_default') + api.properties.tryserver(
       patch_project='v8',
   )
-  yield api.test('tryjob_gerrit_angle') + api.properties.tryserver_gerrit(
-      full_project_name='angle/angle',
+  yield api.test('tryjob_gerrit_angle') + api.properties.tryserver(
+      gerrit_project='angle/angle',
+      patch_issue=338811,
+      patch_set=3,
+  )
+  yield api.test('tryjob_gerrit_angle_deprecated') + api.properties.tryserver(
+      patch_project='angle/angle',
+      gerrit='https://chromium-review.googlesource.com',
+      patch_storage='gerrit',
+      repository='https://chromium.googlesource.com/angle/angle',
+      rietveld=None,
+      **{
+        'event.change.id': 'angle%2Fangle~master~Ideadbeaf',
+        'event.change.number': 338811,
+        'event.change.url':
+          'https://chromium-review.googlesource.com/#/c/338811',
+        'event.patchSet.ref': 'refs/changes/11/338811/3',
+      }
   )

data/vendor/depot_tools/recipe_modules/bot_update/resources/bot_update.py

@@ -7,7 +7,6 @@
 
 import cStringIO
 import codecs
-import collections
 import copy
 import ctypes
 import json
@@ -16,7 +15,6 @@ import os
 import pprint
 import random
 import re
-import socket
 import subprocess
 import sys
 import tempfile
@@ -32,130 +30,35 @@ import os.path as path
 BUF_SIZE = 256
 
 
-# TODO(luqui): This is a horrible hack to identify build_internal when build
-# is a recipe dependency.  bot_update should not be depending on internal,
-# rather the arrow should go the other way (or just be destroyed).
-def check_dir(name, dirs, default=None):
-  for d in dirs:
-    d = path.abspath(d)
-    if path.basename(d) == name and path.isdir(d):
-      return d
-  return default
-
-
 # Define a bunch of directory paths.
 # Relative to the current working directory.
 CURRENT_DIR = path.abspath(os.getcwd())
 BUILDER_DIR = path.dirname(CURRENT_DIR)
-SLAVE_DIR = path.dirname(BUILDER_DIR)
 
 # Relative to this script's filesystem path.
 THIS_DIR = path.dirname(path.abspath(__file__))
-SCRIPTS_DIR = check_dir(
-    'scripts', [
-        path.dirname(THIS_DIR),
-        path.join(SLAVE_DIR, '..', 'scripts'),
-        path.join(THIS_DIR,  # resources
-                  '..',      # bot_update
-                  '..',      # recipe_modules
-                  '..',      # depot_tools
-                  '..',      # .recipe_deps
-                  '..',      # slave
-                  '..',      # scripts
-                  '..',      # build_internal
-                  '..',      # ROOT_DIR
-                  'build',
-                  'scripts'),
-        path.join(SLAVE_DIR, '..', 'build', 'scripts'),
-    ], default=path.dirname(THIS_DIR))
-BUILD_DIR = path.dirname(SCRIPTS_DIR)
-ROOT_DIR = path.dirname(BUILD_DIR)
 
 DEPOT_TOOLS_DIR = path.abspath(path.join(THIS_DIR, '..', '..', '..'))
 
-BUILD_INTERNAL_DIR = check_dir(
-    'build_internal', [
-        path.join(ROOT_DIR, 'build_internal'),
-        path.join(ROOT_DIR,      # .recipe_deps
-                  path.pardir,   # slave
-                  path.pardir,   # scripts
-                  path.pardir),  # build_internal
-    ])
-
-
 CHROMIUM_GIT_HOST = 'https://chromium.googlesource.com'
 CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
 
-# Official builds use buildspecs, so this is a special case.
-BUILDSPEC_TYPE = collections.namedtuple('buildspec',
-    ('container', 'version'))
-BUILDSPEC_RE = (r'^/chrome-internal/trunk/tools/buildspec/'
-                 '(build|branches|releases)/(.+)$')
-GIT_BUILDSPEC_PATH = ('https://chrome-internal.googlesource.com/chrome/tools/'
-                      'buildspec')
 BRANCH_HEADS_REFSPEC = '+refs/branch-heads/*'
 
-BUILDSPEC_COMMIT_RE = (
-    re.compile(r'Buildspec for.*version (\d+\.\d+\.\d+\.\d+)'),
-    re.compile(r'Create (\d+\.\d+\.\d+\.\d+) buildspec'),
-    re.compile(r'Auto-converted (\d+\.\d+\.\d+\.\d+) buildspec to git'),
-)
-
 # Regular expression that matches a single commit footer line.
 COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s+(.+)')
 
 # Footer metadata keys for regular and gsubtreed mirrored commit positions.
 COMMIT_POSITION_FOOTER_KEY = 'Cr-Commit-Position'
 COMMIT_ORIGINAL_POSITION_FOOTER_KEY = 'Cr-Original-Commit-Position'
-# Regular expression to parse a commit position
-COMMIT_POSITION_RE = re.compile(r'(.+)@\{#(\d+)\}')
 
 # Regular expression to parse gclient's revinfo entries.
 REVINFO_RE = re.compile(r'^([^:]+):\s+([^@]+)@(.+)$')
 
-# Used by 'ResolveSvnRevisionFromGitiles'
-GIT_SVN_PROJECT_MAP = {
-  'webkit': {
-    'svn_url': 'svn://svn.chromium.org/blink',
-    'branch_map': [
-      (r'trunk', r'refs/heads/master'),
-      (r'branches/([^/]+)', r'refs/branch-heads/\1'),
-    ],
-  },
-  'v8': {
-    'svn_url': 'https://v8.googlecode.com/svn',
-    'branch_map': [
-      (r'trunk', r'refs/heads/candidates'),
-      (r'branches/bleeding_edge', r'refs/heads/master'),
-      (r'branches/([^/]+)', r'refs/branch-heads/\1'),
-    ],
-  },
-  'nacl': {
-    'svn_url': 'svn://svn.chromium.org/native_client',
-    'branch_map': [
-      (r'trunk/src/native_client', r'refs/heads/master'),
-    ],
-  },
-}
-
-# Key for the 'git-svn' ID metadata commit footer entry.
-GIT_SVN_ID_FOOTER_KEY = 'git-svn-id'
-# e.g., git-svn-id: https://v8.googlecode.com/svn/trunk@23117
-#     ce2b1a6d-e550-0410-aec6-3dcde31c8c00
-GIT_SVN_ID_RE = re.compile(r'((?:\w+)://[^@]+)@(\d+)\s+(?:[a-zA-Z0-9\-]+)')
-
-
-# This is the git mirror of the buildspecs repository. We could rely on the svn
-# checkout, now that the git buildspecs are checked in alongside the svn
-# buildspecs, but we're going to want to pull all the buildspecs from here
-# eventually anyhow, and there's already some logic to pull from git (for the
-# old git_buildspecs.git repo), so just stick with that.
-GIT_BUILDSPEC_REPO = (
-    'https://chrome-internal.googlesource.com/chrome/tools/buildspec')
 
 # Copied from scripts/recipes/chromium.py.
 GOT_REVISION_MAPPINGS = {
-    '/chrome/trunk/src': {
+    CHROMIUM_SRC_URL: {
         'src/': 'got_revision',
         'src/native_client/': 'got_nacl_revision',
         'src/tools/swarm_client/': 'got_swarm_client_revision',
@@ -167,62 +70,6 @@ GOT_REVISION_MAPPINGS = {
 }
 
 
-BOT_UPDATE_MESSAGE = """
-What is the "Bot Update" step?
-==============================
-
-This step ensures that the source checkout on the bot (e.g. Chromium's src/ and
-its dependencies) is checked out in a consistent state. This means that all of
-the necessary repositories are checked out, no extra repositories are checked
-out, and no locally modified files are present.
-
-These actions used to be taken care of by the "gclient revert" and "update"
-steps. However, those steps are known to be buggy and occasionally flaky. This
-step has two main advantages over them:
-  * it only operates in Git, so the logic can be clearer and cleaner; and
-  * it is a slave-side script, so its behavior can be modified without
-    restarting the master.
-
-Why Git, you ask? Because that is the direction that the Chromium project is
-heading. This step is an integral part of the transition from using the SVN repo
-at chrome/trunk/src to using the Git repo src.git. Please pardon the dust while
-we fully convert everything to Git. This message will get out of your way
-eventually, and the waterfall will be a happier place because of it.
-
-This step can be activated or deactivated independently on every builder on
-every master. When it is active, the "gclient revert" and "update" steps become
-no-ops. When it is inactive, it prints this message, cleans up after itself, and
-lets everything else continue as though nothing has changed. Eventually, when
-everything is stable enough, this step will replace them entirely.
-
-Debugging information:
-(master/builder/slave may be unspecified on recipes)
-master: %(master)s
-builder: %(builder)s
-slave: %(slave)s
-forced by recipes: %(recipe)s
-CURRENT_DIR: %(CURRENT_DIR)s
-BUILDER_DIR: %(BUILDER_DIR)s
-SLAVE_DIR: %(SLAVE_DIR)s
-THIS_DIR: %(THIS_DIR)s
-SCRIPTS_DIR: %(SCRIPTS_DIR)s
-BUILD_DIR: %(BUILD_DIR)s
-ROOT_DIR: %(ROOT_DIR)s
-DEPOT_TOOLS_DIR: %(DEPOT_TOOLS_DIR)s
-bot_update.py is:"""
-
-ACTIVATED_MESSAGE = """ACTIVE.
-The bot will perform a Git checkout in this step.
-The "gclient revert" and "update" steps are no-ops.
-
-"""
-
-NOT_ACTIVATED_MESSAGE = """INACTIVE.
-This step does nothing. You actually want to look at the "update" step.
-
-"""
-
-
 GCLIENT_TEMPLATE = """solutions = %(solutions)s
 
 cache_dir = r%(cache_dir)s
@@ -231,138 +78,11 @@ cache_dir = r%(cache_dir)s
 """
 
 
-internal_data = {}
-if BUILD_INTERNAL_DIR:
-  local_vars = {}
-  try:
-    execfile(os.path.join(
-        BUILD_INTERNAL_DIR, 'scripts', 'slave', 'bot_update_cfg.py'),
-        local_vars)
-  except Exception:
-    # Same as if BUILD_INTERNAL_DIR didn't exist in the first place.
-    print 'Warning: unable to read internal configuration file.'
-    print 'If this is an internal bot, this step may be erroneously inactive.'
-  internal_data = local_vars
-
-RECOGNIZED_PATHS = {
-    # If SVN path matches key, the entire URL is rewritten to the Git url.
-    '/chrome/trunk/src':
-        CHROMIUM_SRC_URL,
-    '/chrome/trunk/src/tools/cros.DEPS':
-        CHROMIUM_GIT_HOST + '/chromium/src/tools/cros.DEPS.git',
-    '/chrome-internal/trunk/src-internal':
-        'https://chrome-internal.googlesource.com/chrome/src-internal.git',
-}
-RECOGNIZED_PATHS.update(internal_data.get('RECOGNIZED_PATHS', {}))
-
-ENABLED_MASTERS = [
-    'bot_update.always_on',
-    'chromium.android',
-    'chromium.angle',
-    'chromium.chrome',
-    'chromium.chromedriver',
-    'chromium.chromiumos',
-    'chromium',
-    'chromium.fyi',
-    'chromium.goma',
-    'chromium.gpu',
-    'chromium.gpu.fyi',
-    'chromium.infra',
-    'chromium.infra.cron',
-    'chromium.linux',
-    'chromium.lkgr',
-    'chromium.mac',
-    'chromium.memory',
-    'chromium.memory.fyi',
-    'chromium.perf',
-    'chromium.perf.fyi',
-    'chromium.swarm',
-    'chromium.webkit',
-    'chromium.webrtc',
-    'chromium.webrtc.fyi',
-    'chromium.win',
-    'client.catapult',
-    'client.drmemory',
-    'client.mojo',
-    'client.nacl',
-    'client.nacl.ports',
-    'client.nacl.sdk',
-    'client.nacl.toolchain',
-    'client.pdfium',
-    'client.skia',
-    'client.skia.fyi',
-    'client.v8',
-    'client.v8.branches',
-    'client.v8.fyi',
-    'client.v8.ports',
-    'client.webrtc',
-    'client.webrtc.fyi',
-    'tryserver.blink',
-    'tryserver.client.catapult',
-    'tryserver.client.mojo',
-    'tryserver.chromium.android',
-    'tryserver.chromium.angle',
-    'tryserver.chromium.linux',
-    'tryserver.chromium.mac',
-    'tryserver.chromium.perf',
-    'tryserver.chromium.win',
-    'tryserver.infra',
-    'tryserver.nacl',
-    'tryserver.v8',
-    'tryserver.webrtc',
-]
-ENABLED_MASTERS += internal_data.get('ENABLED_MASTERS', [])
-
-ENABLED_BUILDERS = {
-    'client.dart.fyi': [
-        'v8-linux-release',
-        'v8-mac-release',
-        'v8-win-release',
-    ],
-    'client.dynamorio': [
-        'linux-v8-dr',
-    ],
-}
-ENABLED_BUILDERS.update(internal_data.get('ENABLED_BUILDERS', {}))
-
-ENABLED_SLAVES = {}
-ENABLED_SLAVES.update(internal_data.get('ENABLED_SLAVES', {}))
-
-# Disabled filters get run AFTER enabled filters, so for example if a builder
-# config is enabled, but a bot on that builder is disabled, that bot will
-# be disabled.
-DISABLED_BUILDERS = {}
-DISABLED_BUILDERS.update(internal_data.get('DISABLED_BUILDERS', {}))
-
-DISABLED_SLAVES = {}
-DISABLED_SLAVES.update(internal_data.get('DISABLED_SLAVES', {}))
-
-# These masters work only in Git, meaning for got_revision, always output
-# a git hash rather than a SVN rev.
-GIT_MASTERS = [
-    'client.v8',
-    'client.v8.branches',
-    'client.v8.ports',
-    'tryserver.v8',
-]
-GIT_MASTERS += internal_data.get('GIT_MASTERS', [])
-
-
 # How many times to try before giving up.
 ATTEMPTS = 5
 
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
-
-# Find the patch tool.
-if sys.platform.startswith('win'):
-  if not BUILD_INTERNAL_DIR:
-    print 'Warning: could not find patch tool because there is no '
-    print 'build_internal present.'
-    PATCH_TOOL = None
-  else:
-    PATCH_TOOL = path.join(BUILD_INTERNAL_DIR, 'tools', 'patch.EXE')
-else:
-  PATCH_TOOL = '/usr/bin/patch'
+GCLIENT_PATH = path.join(DEPOT_TOOLS_DIR, 'gclient.py')
 
 # If there is less than 100GB of disk space on the system, then we do
 # a shallow checkout.
@@ -384,19 +104,10 @@ class GclientSyncFailed(SubprocessFailed):
   pass
 
 
-class SVNRevisionNotFound(Exception):
-  pass
-
-
 class InvalidDiff(Exception):
   pass
 
 
-class Inactive(Exception):
-  """Not really an exception, just used to exit early cleanly."""
-  pass
-
-
 RETRY = object()
 OK = object()
 FAIL = object()
@@ -525,48 +236,6 @@ def get_gclient_spec(solutions, target_os, target_os_only, git_cache_dir):
   }
 
 
-def check_enabled(master, builder, slave):
-  if master in ENABLED_MASTERS:
-    return True
-  builder_list = ENABLED_BUILDERS.get(master)
-  if builder_list and builder in builder_list:
-    return True
-  slave_list = ENABLED_SLAVES.get(master)
-  if slave_list and slave in slave_list:
-    return True
-  return False
-
-
-def check_disabled(master, builder, slave):
-  """Returns True if disabled, False if not disabled."""
-  builder_list = DISABLED_BUILDERS.get(master)
-  if builder_list and builder in builder_list:
-    return True
-  slave_list = DISABLED_SLAVES.get(master)
-  if slave_list and slave in slave_list:
-    return True
-  return False
-
-
-def check_valid_host(master, builder, slave):
-  return (check_enabled(master, builder, slave)
-          and not check_disabled(master, builder, slave))
-
-
-def maybe_ignore_revision(revision, buildspec):
-  """Handle builders that don't care what buildbot tells them to build.
-
-  This is especially the case with branch builders that build from buildspecs
-  and/or trigger off multiple repositories, where the --revision passed in has
-  nothing to do with the solution being built. Clearing the revision in this
-  case causes bot_update to use HEAD rather that trying to checkout an
-  inappropriate version of the solution.
-  """
-  if buildspec and buildspec.container == 'branches':
-    return []
-  return revision
-
-
 def solutions_printer(solutions):
   """Prints gclient solution to stdout."""
   print 'Gclient Solutions'
@@ -601,52 +270,18 @@ def solutions_printer(solutions):
     print
 
 
-def solutions_to_git(input_solutions):
+def modify_solutions(input_solutions):
   """Modifies urls in solutions to point at Git repos.
 
-  returns: (git solution, svn root of first solution) tuple.
+  returns: new solution dictionary
   """
   assert input_solutions
   solutions = copy.deepcopy(input_solutions)
-  first_solution = True
-  buildspec = None
   for solution in solutions:
     original_url = solution['url']
     parsed_url = urlparse.urlparse(original_url)
     parsed_path = parsed_url.path
 
-    # Rewrite SVN urls into Git urls.
-    buildspec_m = re.match(BUILDSPEC_RE, parsed_path)
-    if first_solution and buildspec_m:
-      solution['url'] = GIT_BUILDSPEC_PATH
-      buildspec = BUILDSPEC_TYPE(
-          container=buildspec_m.group(1),
-          version=buildspec_m.group(2),
-      )
-      solution['deps_file'] = path.join(buildspec.container, buildspec.version,
-                                        'DEPS')
-    elif parsed_path in RECOGNIZED_PATHS:
-      solution['url'] = RECOGNIZED_PATHS[parsed_path]
-      solution['deps_file'] = '.DEPS.git'
-    elif parsed_url.scheme == 'https' and 'googlesource' in parsed_url.netloc:
-      pass
-    else:
-      print 'Warning: %s' % ('path %r not recognized' % parsed_path,)
-
-    # Strip out deps containing $$V8_REV$$, etc.
-    if 'custom_deps' in solution:
-      new_custom_deps = {}
-      for deps_name, deps_value in solution['custom_deps'].iteritems():
-        if deps_value and '$$' in deps_value:
-          print 'Dropping %s:%s from custom deps' % (deps_name, deps_value)
-        else:
-          new_custom_deps[deps_name] = deps_value
-      solution['custom_deps'] = new_custom_deps
-
-    if first_solution:
-      root = parsed_path
-      first_solution = False
-
     solution['managed'] = False
     # We don't want gclient to be using a safesync URL. Instead it should
     # using the lkgr/lkcr branch/tags.
@@ -654,7 +289,8 @@ def solutions_to_git(input_solutions):
       print 'Removing safesync url %s from %s' % (solution['safesync_url'],
                                                   parsed_path)
       del solution['safesync_url']
-  return solutions, root, buildspec
+
+  return solutions
 
 
 def remove(target):
@@ -662,35 +298,40 @@ def remove(target):
   dead_folder = path.join(BUILDER_DIR, 'build.dead')
   if not path.exists(dead_folder):
     os.makedirs(dead_folder)
-  os.rename(target, path.join(dead_folder, uuid.uuid4().hex))
-
-
-def ensure_no_checkout(dir_names, scm_dirname):
-  """Ensure that there is no undesired checkout under build/.
+  dest = path.join(dead_folder, uuid.uuid4().hex)
+  print 'Marking for removal %s => %s' % (target, dest)
+  try:
+    os.rename(target, dest)
+  except Exception as e:
+    print 'Error renaming %s to %s: %s' % (target, dest, str(e))
+    raise
 
-  If there is an incorrect checkout under build/, then
-  move build/ to build.dead/
-  This function will check each directory in dir_names.
 
-  scm_dirname is expected to be either ['.svn', '.git']
-  """
-  assert scm_dirname in ['.svn', '.git', '*']
-  has_checkout = any(path.exists(path.join(os.getcwd(), dir_name, scm_dirname))
+def ensure_no_checkout(dir_names):
+  """Ensure that there is no undesired checkout under build/."""
+  build_dir = os.getcwd()
+  has_checkout = any(path.exists(path.join(build_dir, dir_name, '.git'))
                      for dir_name in dir_names)
-
-  if has_checkout or scm_dirname == '*':
-    build_dir = os.getcwd()
-    prefix = ''
-    if scm_dirname != '*':
-      prefix = '%s detected in checkout, ' % scm_dirname
-
+  if has_checkout:
     for filename in os.listdir(build_dir):
       deletion_target = path.join(build_dir, filename)
-      print '%sdeleting %s...' % (prefix, deletion_target),
+      print '.git detected in checkout, deleting %s...' % deletion_target,
       remove(deletion_target)
       print 'done'
 
 
+def call_gclient(*args, **kwargs):
+  """Run the "gclient.py" tool with the supplied arguments.
+
+  Args:
+    args: command-line arguments to pass to gclient.
+    kwargs: keyword arguments to pass to call.
+  """
+  cmd = [sys.executable, '-u', GCLIENT_PATH]
+  cmd.extend(args)
+  return call(*cmd, **kwargs)
+
+
 def gclient_configure(solutions, target_os, target_os_only, git_cache_dir):
   """Should do the same thing as gclient --spec='...'."""
   with codecs.open('.gclient', mode='w', encoding='utf-8') as f:
@@ -698,21 +339,27 @@ def gclient_configure(solutions, target_os, target_os_only, git_cache_dir):
         solutions, target_os, target_os_only, git_cache_dir))
 
 
-def gclient_sync(with_branch_heads, shallow):
+def gclient_sync(with_branch_heads, shallow, revisions, break_repo_locks):
   # We just need to allocate a filename.
   fd, gclient_output_file = tempfile.mkstemp(suffix='.json')
   os.close(fd)
-  gclient_bin = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
-  cmd = [gclient_bin, 'sync', '--verbose', '--reset', '--force',
+
+  args = ['sync', '--verbose', '--reset', '--force',
          '--ignore_locks', '--output-json', gclient_output_file,
          '--nohooks', '--noprehooks', '--delete_unversioned_trees']
   if with_branch_heads:
-    cmd += ['--with_branch_heads']
+    args += ['--with_branch_heads']
   if shallow:
-    cmd += ['--shallow']
+    args += ['--shallow']
+  if break_repo_locks:
+    args += ['--break_repo_locks']
+  for name, revision in sorted(revisions.iteritems()):
+    if revision.upper() == 'HEAD':
+      revision = 'origin/master'
+    args.extend(['--revision', '%s@%s' % (name, revision)])
 
   try:
-    call(*cmd, tries=1)
+    call_gclient(*args, tries=1)
   except SubprocessFailed as e:
     # Throw a GclientSyncFailed exception so we can catch this independently.
     raise GclientSyncFailed(e.message, e.code, e.output)
@@ -723,15 +370,8 @@ def gclient_sync(with_branch_heads, shallow):
     os.remove(gclient_output_file)
 
 
-def gclient_runhooks(gyp_envs):
-  gclient_bin = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
-  env = dict([env_var.split('=', 1) for env_var in gyp_envs])
-  call(gclient_bin, 'runhooks', env=env)
-
-
 def gclient_revinfo():
-  gclient_bin = 'gclient.bat' if sys.platform.startswith('win') else 'gclient'
-  return call(gclient_bin, 'revinfo', '-a') or ''
+  return call_gclient('revinfo', '-a') or ''
 
 
 def create_manifest():
@@ -780,32 +420,6 @@ def get_commit_message_footer(message, key):
   return get_commit_message_footer_map(message).get(key)
 
 
-def get_svn_rev(git_hash, dir_name):
-  log = git('log', '-1', git_hash, cwd=dir_name)
-  git_svn_id = get_commit_message_footer(log, GIT_SVN_ID_FOOTER_KEY)
-  if not git_svn_id:
-    return None
-  m = GIT_SVN_ID_RE.match(git_svn_id)
-  if not m:
-    return None
-  return int(m.group(2))
-
-
-def get_git_hash(revision, branch, sln_dir):
-  """We want to search for the SVN revision on the git-svn branch.
-
-  Note that git will search backwards from origin/master.
-  """
-  match = "^%s: [^ ]*@%s " % (GIT_SVN_ID_FOOTER_KEY, revision)
-  ref = branch if branch.startswith('refs/') else 'origin/%s' % branch
-  cmd = ['log', '-E', '--grep', match, '--format=%H', '--max-count=1', ref]
-  result = git(*cmd, cwd=sln_dir).strip()
-  if result:
-    return result
-  raise SVNRevisionNotFound('We can\'t resolve svn r%s into a git hash in %s' %
-                            (revision, sln_dir))
-
-
 def emit_log_lines(name, lines):
   for line in lines.splitlines():
     print '@@@STEP_LOG_LINE@%s@%s@@@' % (name, line)
@@ -860,16 +474,35 @@ def force_revision(folder_name, revision):
     branch, revision = split_revision
 
   if revision and revision.upper() != 'HEAD':
-    if revision and revision.isdigit() and len(revision) < 40:
-      # rev_num is really a svn revision number, convert it into a git hash.
-      git_ref = get_git_hash(int(revision), branch, folder_name)
-    else:
-      # rev_num is actually a git hash or ref, we can just use it.
-      git_ref = revision
-    git('checkout', '--force', git_ref, cwd=folder_name)
+    git('checkout', '--force', revision, cwd=folder_name, tries=1)
   else:
     ref = branch if branch.startswith('refs/') else 'origin/%s' % branch
-    git('checkout', '--force', ref, cwd=folder_name)
+    git('checkout', '--force', ref, cwd=folder_name, tries=1)
+
+
+def is_broken_repo_dir(repo_dir):
+  # Treat absence of 'config' as a signal of a partially deleted repo.
+  return not path.exists(os.path.join(repo_dir, '.git', 'config'))
+
+
+def _maybe_break_locks(checkout_path):
+  """This removes all .lock files from this repo's .git directory.
+
+  In particular, this will cleanup index.lock files, as well as ref lock
+  files.
+  """
+  git_dir = os.path.join(checkout_path, '.git')
+  for dirpath, _, filenames in os.walk(git_dir):
+    for filename in filenames:
+      if filename.endswith('.lock'):
+        to_break = os.path.join(dirpath, filename)
+        print 'breaking lock: %s' % to_break
+        try:
+          os.remove(to_break)
+        except OSError as ex:
+          print 'FAILED to break lock: %s: %s' % (to_break, ex)
+          raise
+
 
 def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
   build_dir = os.getcwd()
@@ -883,10 +516,11 @@ def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
         raise Exception('%s exists after cache unlock' % filename)
   first_solution = True
   for sln in solutions:
-    # This is so we can loop back and try again if we need to wait for the
-    # git mirrors to update from SVN.
+    # Just in case we're hitting a different git server than the one from
+    # which the target revision was polled, we retry some.
     done = False
-    tries_left = 60
+    deadline = time.time() + 60  # One minute (5 tries with exp. backoff).
+    tries = 0
     while not done:
       name = sln['name']
       url = sln['url']
@@ -908,39 +542,52 @@ def git_checkout(solutions, revisions, shallow, refs, git_cache_dir):
           'clone', '--no-checkout', '--local', '--shared', mirror_dir, sln_dir)
 
       try:
+        # If repo deletion was aborted midway, it may have left .git in broken
+        # state.
+        if path.exists(sln_dir) and is_broken_repo_dir(sln_dir):
+          print 'Git repo %s appears to be broken, removing it' % sln_dir
+          remove(sln_dir)
+
+        # Use "tries=1", since we retry manually in this loop.
         if not path.isdir(sln_dir):
-          git(*clone_cmd)
+          git(*clone_cmd, tries=1)
         else:
-          git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir)
-          git('fetch', 'origin', cwd=sln_dir)
+          git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir, tries=1)
+          git('fetch', 'origin', cwd=sln_dir, tries=1)
         for ref in refs:
           refspec = '%s:%s' % (ref, ref.lstrip('+'))
-          git('fetch', 'origin', refspec, cwd=sln_dir)
+          git('fetch', 'origin', refspec, cwd=sln_dir, tries=1)
+
+        # Windows sometimes has trouble deleting files.
+        # This can make git commands that rely on locks fail.
+        # Try a few times in case Windows has trouble again (and again).
+        if sys.platform.startswith('win'):
+          tries = 3
+          while tries:
+            try:
+              _maybe_break_locks(sln_dir)
+              break
+            except Exception:
+              tries -= 1
 
         revision = get_target_revision(name, url, revisions) or 'HEAD'
         force_revision(sln_dir, revision)
         done = True
       except SubprocessFailed as e:
         # Exited abnormally, theres probably something wrong.
-        # Lets wipe the checkout and try again.
-        tries_left -= 1
-        if tries_left > 0:
-          print 'Something failed: %s.' % str(e)
-          print 'waiting 5 seconds and trying again...'
-          time.sleep(5)
-        else:
+        print 'Something failed: %s.' % str(e)
+
+        if time.time() > deadline:
+          overrun = time.time() - deadline
+          print 'Ran %s seconds past deadline. Aborting.' % overrun
           raise
+
+        # Lets wipe the checkout and try again.
+        tries += 1
+        sleep_secs = 2**tries
+        print 'waiting %s seconds and trying again...' % sleep_secs
+        time.sleep(sleep_secs)
         remove(sln_dir)
-      except SVNRevisionNotFound:
-        tries_left -= 1
-        if tries_left > 0:
-          # If we don't have the correct revision, wait and try again.
-          print 'We can\'t find revision %s.' % revision
-          print 'The svn to git replicator is probably falling behind.'
-          print 'waiting 5 seconds and trying again...'
-          time.sleep(5)
-        else:
-          raise
 
     git('clean', '-dff', cwd=sln_dir)
 
@@ -961,82 +608,9 @@ def _download(url):
         raise
 
 
-def parse_diff(diff):
-  """Takes a unified diff and returns a list of diffed files and their diffs.
-
-  The return format is a list of pairs of:
-    (<filename>, <diff contents>)
-  <diff contents> is inclusive of the diff line.
-  """
-  result = []
-  current_diff = ''
-  current_header = None
-  for line in diff.splitlines():
-    # "diff" is for git style patches, and "Index: " is for SVN style patches.
-    if line.startswith('diff') or line.startswith('Index: '):
-      if current_header:
-        # If we are in a diff portion, then save the diff.
-        result.append((current_header, '%s\n' % current_diff))
-      git_header_match = re.match(r'diff (?:--git )?(\S+) (\S+)', line)
-      svn_header_match = re.match(r'Index: (.*)', line)
-
-      if git_header_match:
-        # First, see if its a git style header.
-        from_file = git_header_match.group(1)
-        to_file = git_header_match.group(2)
-        if from_file != to_file and from_file.startswith('a/'):
-          # Sometimes git prepends 'a/' and 'b/' in front of file paths.
-          from_file = from_file[2:]
-        current_header = from_file
-
-      elif svn_header_match:
-        # Otherwise, check if its an SVN style header.
-        current_header = svn_header_match.group(1)
-
-      else:
-        # Otherwise... I'm not really sure what to do with this.
-        raise InvalidDiff('Can\'t process header: %s\nFull diff:\n%s' %
-                          (line, diff))
-
-      current_diff = ''
-    current_diff += '%s\n' % line
-  if current_header:
-    # We hit EOF, gotta save the last diff.
-    result.append((current_header, current_diff))
-  return result
-
-
-def get_svn_patch(patch_url):
-  """Fetch patch from patch_url, return list of (filename, diff)"""
-  svn_exe = 'svn.bat' if sys.platform.startswith('win') else 'svn'
-  patch_data = call(svn_exe, 'cat', patch_url)
-  return parse_diff(patch_data)
-
-
-def apply_svn_patch(patch_root, patches, whitelist=None, blacklist=None):
-  """Expects a list of (filename, diff), applies it on top of patch_root."""
-  if whitelist:
-    patches = [(name, diff) for name, diff in patches if name in whitelist]
-  elif blacklist:
-    patches = [(name, diff) for name, diff in patches if name not in blacklist]
-  diffs = [diff for _, diff in patches]
-  patch = ''.join(diffs)
-
-  if patch:
-    print '===Patching files==='
-    for filename, _ in patches:
-      print 'Patching %s' % filename
-    try:
-      call(PATCH_TOOL, '-p0', '--remove-empty-files', '--force', '--forward',
-          stdin_data=patch, cwd=patch_root, tries=1)
-      for filename, _ in patches:
-        full_filename = path.abspath(path.join(patch_root, filename))
-        git('add', full_filename, cwd=path.dirname(full_filename))
-    except SubprocessFailed as e:
-      raise PatchFailed(e.message, e.code, e.output)
-
 def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
-                         email_file, key_file, whitelist=None, blacklist=None):
+                         email_file, key_file, oauth2_file,
+                         whitelist=None, blacklist=None):
   apply_issue_bin = ('apply_issue.bat' if sys.platform.startswith('win')
                      else 'apply_issue')
   cmd = [apply_issue_bin,
@@ -1051,8 +625,10 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
          # Don't run gclient sync when it sees a DEPS change.
          '--ignore_deps',
   ]
-  # Use an oauth key file if specified.
-  if email_file and key_file:
+  # Use an oauth key or json file if specified.
+  if oauth2_file:
+    cmd.extend(['--auth-refresh-token-json', oauth2_file])
+  elif email_file and key_file:
     cmd.extend(['--email-file', email_file, '--private-key-file', key_file])
   else:
     cmd.append('--no-auth')
@@ -1085,6 +661,12 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
   print '===Applying gerrit ref==='
   print 'Repo is %r @ %r, ref is %r, root is %r' % (
       gerrit_repo, base_rev, gerrit_ref, root)
+  # TODO(tandrii): move the fix below to common rietveld/gerrit codepath.
+  # Speculative fix: prior bot_update run with Rietveld patch may leave git
+  # index with unmerged paths. bot_update calls 'checkout --force xyz' thus
+  # ignoring such paths, but potentially never cleaning them up. The following
+  # command will do so. See http://crbug.com/692067.
+  git('reset', '--hard', cwd=root)
   try:
     git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1)
     git('checkout', 'FETCH_HEAD', cwd=root)
@@ -1096,7 +678,12 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
       try:
         ok = False
         git('checkout', '-b', temp_branch_name, cwd=root)
-        git('rebase', base_rev, cwd=root)
+        try:
+          git('rebase', base_rev, cwd=root)
+        except SubprocessFailed:
+          # Abort the rebase since there were failures.
+          git('rebase', '--abort', cwd=root)
+          raise
 
         # Get off of the temporary branch since it can't be deleted otherwise.
         cur_rev = git('rev-parse', 'HEAD', cwd=root).strip()
@@ -1114,70 +701,14 @@ def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
   except SubprocessFailed as e:
     raise PatchFailed(e.message, e.code, e.output)
 
-def check_flag(flag_file):
-  """Returns True if the flag file is present."""
-  return os.path.isfile(flag_file)
-
-
-def delete_flag(flag_file):
-  """Remove bot update flag."""
-  if os.path.isfile(flag_file):
-    os.remove(flag_file)
-
-
-def emit_flag(flag_file):
-  """Deposit a bot update flag on the system to tell gclient not to run."""
-  print 'Emitting flag file at %s' % flag_file
-  with open(flag_file, 'wb') as f:
-    f.write('Success!')
-
-
-def get_commit_position_for_git_svn(url, revision):
-  """Generates a commit position string for a 'git-svn' URL/revision.
-
-  If the 'git-svn' URL maps to a known project, we will construct a commit
-  position branch value by applying substitution on the SVN URL.
-  """
-  # Identify the base URL so we can strip off trunk/branch name
-  project_config = branch = None
-  for _, project_config in GIT_SVN_PROJECT_MAP.iteritems():
-    if url.startswith(project_config['svn_url']):
-      branch = url[len(project_config['svn_url']):]
-      break
-
-  if branch:
-    # Strip any leading slashes
-    branch = branch.lstrip('/')
-
-    # Try and map the branch
-    for pattern, repl in project_config.get('branch_map', ()):
-      nbranch, subn = re.subn(pattern, repl, branch, count=1)
-      if subn:
-        print 'INFO: Mapped SVN branch to Git branch [%s] => [%s]' % (
-            branch, nbranch)
-        branch = nbranch
-        break
-  else:
-    # Use generic 'svn' branch
-    print 'INFO: Could not resolve project for SVN URL %r' % (url,)
-    branch = 'svn'
-  return '%s@{#%s}' % (branch, revision)
-
 
 def get_commit_position(git_path, revision='HEAD'):
   """Dumps the 'git' log for a specific revision and parses out the commit
   position.
 
   If a commit position metadata key is found, its value will be returned.
-
-  Otherwise, we will search for a 'git-svn' metadata entry. If one is found,
-  we will compose a commit position from it, using its SVN revision value as
-  the revision.
-
-  If the 'git-svn' URL maps to a known project, we will construct a commit
-  position branch value by truncating the URL, mapping 'trunk' to
-  "refs/heads/master". Otherwise, we will return the generic branch, 'svn'.
   """
+  # TODO(iannucci): Use git-footers for this.
   git_log = git('log', '--format=%B', '-n1', revision, cwd=git_path)
   footer_map = get_commit_message_footer_map(git_log)
 
@@ -1186,23 +717,11 @@ def get_commit_position(git_path, revision='HEAD'):
            footer_map.get(COMMIT_ORIGINAL_POSITION_FOOTER_KEY))
   if value:
     return value
-
-  # Compose a commit position from 'git-svn' metadata
-  value = footer_map.get(GIT_SVN_ID_FOOTER_KEY)
-  if value:
-    m = GIT_SVN_ID_RE.match(value)
-    if not m:
-      raise ValueError("Invalid 'git-svn' value: [%s]" % (value,))
-    return get_commit_position_for_git_svn(m.group(1), m.group(2))
   return None
 
 
-def parse_got_revision(gclient_output, got_revision_mapping, use_svn_revs):
-  """Translate git gclient revision mapping to build properties.
-
-  If use_svn_revs is True, then translate git hashes in the revision mapping
-  to svn revision numbers.
-  """
+def parse_got_revision(gclient_output, got_revision_mapping):
+  """Translate git gclient revision mapping to build properties."""
   properties = {}
   solutions_output = {
       # Make sure path always ends with a single slash.
@@ -1217,22 +736,14 @@ def parse_got_revision(gclient_output, got_revision_mapping, use_svn_revs):
     solution_output = solutions_output[dir_name]
     if solution_output.get('scm') is None:
       # This is an ignored DEPS, so the output got_revision should be 'None'.
-      git_revision = revision = commit_position = None
+      revision = commit_position = None
     else:
       # Since we are using .DEPS.git, everything had better be git.
       assert solution_output.get('scm') == 'git'
-      git_revision = git('rev-parse', 'HEAD', cwd=dir_name).strip()
-      if use_svn_revs:
-        revision = get_svn_rev(git_revision, dir_name)
-        if not revision:
-          revision = git_revision
-      else:
-        revision = git_revision
+      revision = git('rev-parse', 'HEAD', cwd=dir_name).strip()
       commit_position = get_commit_position(dir_name)
 
     properties[property_name] = revision
-    if revision != git_revision:
-      properties['%s_git' % property_name] = git_revision
     if commit_position:
       properties['%s_cp' % property_name] = commit_position
 
@@ -1249,27 +760,12 @@ def emit_json(out_file, did_run, gclient_output=None, **kwargs):
     f.write(json.dumps(output, sort_keys=True))
 
 
-def ensure_deps_revisions(deps_url_mapping, solutions, revisions):
-  """Ensure correct DEPS revisions, ignores solutions."""
-  for deps_name, deps_data in sorted(deps_url_mapping.items()):
-    if deps_name.strip('/') in solutions:
-      # This has already been forced to the correct solution by git_checkout().
-      continue
-    revision = get_target_revision(deps_name, deps_data.get('url', None),
-                                   revisions)
-    if not revision:
-      continue
-    # TODO(hinoka): Catch SVNRevisionNotFound error maybe?
-    git('fetch', 'origin', cwd=deps_name)
-    force_revision(deps_name, revision)
-
-
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
-                    patch_root, issue, patchset, patch_url, rietveld_server,
-                    gerrit_repo, gerrit_ref, gerrit_rebase_patch_ref,
-                    revision_mapping, apply_issue_email_file,
-                    apply_issue_key_file, buildspec, gyp_env, shallow, runhooks,
-                    refs, git_cache_dir, gerrit_reset):
+                    patch_root, issue, patchset, rietveld_server, gerrit_repo,
+                    gerrit_ref, gerrit_rebase_patch_ref, revision_mapping,
+                    apply_issue_email_file, apply_issue_key_file,
+                    apply_issue_oauth2_file, shallow, refs, git_cache_dir,
+                    gerrit_reset):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
@@ -1277,10 +773,6 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
 
   git_ref = git_checkout(solutions, revisions, shallow, refs, git_cache_dir)
 
-  patches = None
-  if patch_url:
-    patches = get_svn_patch(patch_url)
-
   print '===Processing patch solutions==='
   already_patched = []
   patch_root = patch_root or ''
@@ -1293,13 +785,11 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
       relative_root = solution['name'][len(patch_root) + 1:]
       target = '/'.join([relative_root, 'DEPS']).lstrip('/')
       print '  relative root is %r, target is %r' % (relative_root, target)
-      if patches:
-        apply_svn_patch(patch_root, patches, whitelist=[target])
-        already_patched.append(target)
-      elif issue:
+      if issue:
         apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                              revision_mapping, git_ref, apply_issue_email_file,
-                             apply_issue_key_file, whitelist=[target])
+                             apply_issue_key_file, apply_issue_oauth2_file,
+                             whitelist=[target])
         already_patched.append(target)
       elif gerrit_ref:
         apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
@@ -1309,35 +799,36 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
 
+  # Windows sometimes has trouble deleting files. This can make git commands
+  # that rely on locks fail.
+  break_repo_locks = True if sys.platform.startswith('win') else False
+  # We want to pass all non-solution revisions into the gclient sync call.
+  solution_dirs = {sln['name'] for sln in solutions}
+  gc_revisions = {
+      dirname: rev for dirname, rev in revisions.iteritems()
+      if dirname not in solution_dirs}
+  # Gclient sometimes ignores "unmanaged": "False" in the gclient solution
+  # if --revision <anything> is passed (for example, for subrepos).
+  # This forces gclient to always treat solutions deps as unmanaged.
+  for solution_name in list(solution_dirs):
+    gc_revisions[solution_name] = 'unmanaged'
   # Let gclient do the DEPS syncing.
   # The branch-head refspec is a special case because its possible Chrome
   # src, which contains the branch-head refspecs, is DEPSed in.
-  gclient_output = gclient_sync(buildspec or BRANCH_HEADS_REFSPEC in refs,
-                                shallow)
+  gclient_output = gclient_sync(BRANCH_HEADS_REFSPEC in refs, shallow,
+                                gc_revisions, break_repo_locks)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
-  if (not buildspec and
-      git('ls-files', '.DEPS.git', cwd=first_sln).strip()):
+  if git('ls-files', '.DEPS.git', cwd=first_sln).strip():
     git('checkout', 'HEAD', '--', '.DEPS.git', cwd=first_sln)
 
-  if buildspec and runhooks:
-    # Run gclient runhooks if we're on an official builder.
-    # TODO(hinoka): Remove this when the official builders run their own
-    #               runhooks step.
-    gclient_runhooks(gyp_env)
-
-  # Finally, ensure that all DEPS are pinned to the correct revision.
-  dir_names = [sln['name'] for sln in solutions]
-  ensure_deps_revisions(gclient_output.get('solutions', {}),
-                        dir_names, revisions)
   # Apply the rest of the patch here (sans DEPS)
-  if patches:
-    apply_svn_patch(patch_root, patches, blacklist=already_patched)
-  elif issue:
+  if issue:
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                          revision_mapping, git_ref, apply_issue_email_file,
-                         apply_issue_key_file, blacklist=already_patched)
+                         apply_issue_key_file, apply_issue_oauth2_file,
+                         blacklist=already_patched)
   elif gerrit_ref and not applied_gerrit_patch:
     # If gerrit_ref was for solution's main repository, it has already been
     # applied above. This chunk is executed only for patches to DEPS-ed in
@@ -1374,15 +865,9 @@ def parse_revisions(revisions, root):
       # This is an alt_root@revision argument.
       current_root, current_rev = split_revision
 
-      # We want to normalize svn/git urls into .git urls.
       parsed_root = urlparse.urlparse(current_root)
-      if parsed_root.scheme == 'svn':
-        if parsed_root.path in RECOGNIZED_PATHS:
-          normalized_root = RECOGNIZED_PATHS[parsed_root.path]
-        else:
-          print 'WARNING: SVN path %s not recognized, ignoring' % current_root
-          continue
-      elif parsed_root.scheme in ['http', 'https']:
+      if parsed_root.scheme in ['http', 'https']:
+        # We want to normalize git urls into .git urls.
         normalized_root = 'https://%s/%s' % (parsed_root.netloc,
                                              parsed_root.path)
         if not normalized_root.endswith('.git'):
@@ -1412,7 +897,9 @@ def parse_args():
   parse.add_option('--apply_issue_key_file',
                    help='--private-key-file option passthrough for '
                         'apply_patch.py.')
-  parse.add_option('--patch_url', help='Optional URL to SVN patch.')
+  parse.add_option('--apply_issue_oauth2_file',
+                   help='--auth-refresh-token-json option passthrough for '
+                        'apply_patch.py.')
   parse.add_option('--root', dest='patch_root',
                    help='DEPRECATED: Use --patch_root.')
   parse.add_option('--patch_root', help='Directory to patch on top of.')
@@ -1427,62 +914,37 @@ def parse_args():
   parse.add_option('--gerrit_no_reset', action='store_true',
                    help='Bypass calling reset after applying a gerrit ref.')
   parse.add_option('--specs', help='Gcilent spec.')
-  parse.add_option('--master',
-                   help='Master name. If specified and it is not in '
-                        'bot_update\'s whitelist, bot_update will be noop.')
-  parse.add_option('-f', '--force', action='store_true',
-                   help='Bypass check to see if we want to be run. '
-                        'Should ONLY be used locally or by smart recipes.')
-  parse.add_option('--revision_mapping',
-                   help='{"path/to/repo/": "property_name"}')
   parse.add_option('--revision_mapping_file',
-                   help=('Same as revision_mapping, except its a path to a json'
-                         ' file containing that format.'))
+                   help=('Path to a json file of the form '
+                         '{"path/to/repo/": "property_name"}'))
   parse.add_option('--revision', action='append', default=[],
-                   help='Revision to check out. Can be an SVN revision number, '
-                        'git hash, or any form of git ref.  Can prepend '
-                        'root@<rev> to specify which repository, where root '
-                        'is either a filesystem path, git https url, or '
-                        'svn url. To specify Tip of Tree, set rev to HEAD.'
-                        'To specify a git branch and an SVN rev, <rev> can be '
-                        'set to <branch>:<revision>.')
+                   help='Revision to check out. Can be any form of git ref. '
+                        'Can prepend root@<rev> to specify which repository, '
+                        'where root is either a filesystem path or git https '
+                        'url. To specify Tip of Tree, set rev to HEAD. ')
   parse.add_option('--output_manifest', action='store_true',
                    help=('Add manifest json to the json output.'))
-  parse.add_option('--slave_name', default=socket.getfqdn().split('.')[0],
-                   help='Hostname of the current machine, '
-                   'used for determining whether or not to activate.')
-  parse.add_option('--builder_name', help='Name of the builder, '
-                   'used for determining whether or not to activate.')
-  parse.add_option('--build_dir', default=os.getcwd())
-  parse.add_option('--flag_file', default=path.join(os.getcwd(),
-                                                    'update.flag'))
-  parse.add_option('--shallow', action='store_true',
-                   help='Use shallow clones for cache repositories.')
-  parse.add_option('--gyp_env', action='append', default=[],
-                   help='Environment variables to pass into gclient runhooks.')
   parse.add_option('--clobber', action='store_true',
                    help='Delete checkout first, always')
-  parse.add_option('--bot_update_clobber', action='store_true', dest='clobber',
-                   help='(synonym for --clobber)')
-  parse.add_option('-o', '--output_json',
+  parse.add_option('--output_json',
                    help='Output JSON information into a specified file')
   parse.add_option('--no_shallow', action='store_true',
                    help='Bypass disk detection and never shallow clone. '
                         'Does not override the --shallow flag')
-  parse.add_option('--no_runhooks', action='store_true',
-                   help='Do not run hooks on official builder.')
   parse.add_option('--refs', action='append',
                    help='Also fetch this refspec for the main solution(s). '
                         'Eg. +refs/branch-heads/*')
   parse.add_option('--with_branch_heads', action='store_true',
                     help='Always pass --with_branch_heads to gclient.  This '
                           'does the same thing as --refs +refs/branch-heads/*')
-  parse.add_option('--git-cache-dir', default=path.join(SLAVE_DIR, 'cache_dir'),
-                   help='Path to git cache directory.')
+  parse.add_option('--git-cache-dir', help='Path to git cache directory.')
 
 
   options, args = parse.parse_args()
 
+  if not options.git_cache_dir:
+    parse.error('--git-cache-dir is required')
+
   if not options.refs:
     options.refs = []
 
@@ -1491,14 +953,11 @@ def parse_args():
     del options.with_branch_heads
 
   try:
-    if options.revision_mapping_file:
-      if options.revision_mapping:
-        print ('WARNING: Ignoring --revision_mapping: --revision_mapping_file '
-               'was set at the same time as --revision_mapping?')
-      with open(options.revision_mapping_file, 'r') as f:
-        options.revision_mapping = json.load(f)
-    elif options.revision_mapping:
-      options.revision_mapping = json.loads(options.revision_mapping)
+    if not options.revision_mapping_file:
+      parse.error('--revision_mapping_file is required')
+
+    with open(options.revision_mapping_file, 'r') as f:
+      options.revision_mapping = json.load(f)
   except Exception as e:
     print (
         'WARNING: Caught execption while parsing revision_mapping*: %s'
@@ -1517,22 +976,10 @@ def parse_args():
 def prepare(options, git_slns, active):
   """Prepares the target folder before we checkout."""
   dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
-  # If we're active now, but the flag file doesn't exist (we weren't active
-  # last run) or vice versa, blow away all checkouts.
-  if bool(active) != bool(check_flag(options.flag_file)):
-    ensure_no_checkout(dir_names, '*')
-  if options.output_json:
-    # Make sure we tell recipes that we didn't run if the script exits here.
-    emit_json(options.output_json, did_run=active)
-  if active:
-    if options.clobber:
-      ensure_no_checkout(dir_names, '*')
-    else:
-      ensure_no_checkout(dir_names, '.svn')
-    emit_flag(options.flag_file)
-  else:
-    delete_flag(options.flag_file)
-    raise Inactive  # This is caught in main() and we exit cleanly.
+  if options.clobber:
+    ensure_no_checkout(dir_names)
+  # Make sure we tell recipes that we didn't run if the script exits here.
+  emit_json(options.output_json, did_run=active)
 
   # Do a shallow checkout if the disk is less than 100GB.
   total_disk_space, free_disk_space = get_total_disk_space()
@@ -1545,9 +992,8 @@ def prepare(options, git_slns, active):
                                            percent_used)
   if not options.output_json:
     print '@@@STEP_TEXT@%s@@@' % step_text
-  if not options.shallow:
-    options.shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD
-                       and not options.no_shallow)
+  shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD
+             and not options.no_shallow)
 
   # The first solution is where the primary DEPS file resides.
   first_sln = dir_names[0]
@@ -1556,11 +1002,14 @@ def prepare(options, git_slns, active):
   print 'Revisions: %s' % options.revision
   revisions = parse_revisions(options.revision, first_sln)
   print 'Fetching Git checkout at %s@%s' % (first_sln, revisions[first_sln])
-  return revisions, step_text
+  return revisions, step_text, shallow
 
 
-def checkout(options, git_slns, specs, buildspec, master,
-             svn_root, revisions, step_text):
+def checkout(options, git_slns, specs, revisions, step_text, shallow):
+  print 'Checking git version...'
+  ver = git('version').strip()
+  print 'Using %s' % ver
+
   first_sln = git_slns[0]['name']
   dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
   try:
@@ -1581,7 +1030,6 @@ def checkout(options, git_slns, specs, buildspec, master,
           patch_root=options.patch_root,
           issue=options.issue,
           patchset=options.patchset,
-          patch_url=options.patch_url,
           rietveld_server=options.rietveld_server,
           gerrit_repo=options.gerrit_repo,
           gerrit_ref=options.gerrit_ref,
@@ -1589,21 +1037,17 @@ def checkout(options, git_slns, specs, buildspec, master,
           revision_mapping=options.revision_mapping,
           apply_issue_email_file=options.apply_issue_email_file,
           apply_issue_key_file=options.apply_issue_key_file,
-
-          # For official builders.
-          buildspec=buildspec,
-          gyp_env=options.gyp_env,
-          runhooks=not options.no_runhooks,
+          apply_issue_oauth2_file=options.apply_issue_oauth2_file,
 
           # Finally, extra configurations such as shallowness of the clone.
-          shallow=options.shallow,
+          shallow=shallow,
           refs=options.refs,
           git_cache_dir=options.git_cache_dir,
           gerrit_reset=not options.gerrit_no_reset)
       gclient_output = ensure_checkout(**checkout_parameters)
     except GclientSyncFailed:
       print 'We failed gclient sync, lets delete the checkout and retry.'
-      ensure_no_checkout(dir_names, '*')
+      ensure_no_checkout(dir_names)
       gclient_output = ensure_checkout(**checkout_parameters)
   except PatchFailed as e:
     if options.output_json:
@@ -1623,11 +1067,8 @@ def checkout(options, git_slns, specs, buildspec, master,
       print '@@@STEP_TEXT@%s PATCH FAILED@@@' % step_text
     raise
 
-  # Revision is an svn revision, unless it's a git master.
-  use_svn_rev = master not in GIT_MASTERS
-
   # Take care of got_revisions outputs.
-  revision_mapping = dict(GOT_REVISION_MAPPINGS.get(svn_root, {}))
+  revision_mapping = GOT_REVISION_MAPPINGS.get(git_slns[0]['url'], {})
   if options.revision_mapping:
     revision_mapping.update(options.revision_mapping)
 
@@ -1637,8 +1078,7 @@ def checkout(options, git_slns, specs, buildspec, master,
   if not revision_mapping:
     revision_mapping[first_sln] = 'got_revision'
 
-  got_revisions = parse_got_revision(gclient_output, revision_mapping,
-                                     use_svn_rev)
+  got_revisions = parse_got_revision(gclient_output, revision_mapping)
 
   if not got_revisions:
     # TODO(hinoka): We should probably bail out here, but in the interest
@@ -1663,73 +1103,42 @@ def checkout(options, git_slns, specs, buildspec, master,
     emit_properties(got_revisions)
 
 
-def print_help_text(force, output_json, active, master, builder, slave):
-  """Print helpful messages to tell devs whats going on."""
-  if force and output_json:
-    recipe_force = 'Forced on by recipes'
-  elif active and output_json:
-    recipe_force = 'Off by recipes, but forced on by bot update'
-  elif not active and output_json:
-    recipe_force = 'Forced off by recipes'
-  else:
-    recipe_force = 'N/A. Was not called by recipes'
-
-  print BOT_UPDATE_MESSAGE % {
-    'master': master or 'Not specified',
-    'builder': builder or 'Not specified',
-    'slave': slave or 'Not specified',
-    'recipe': recipe_force,
+def print_debug_info():
+  print "Debugging info:"
+  debug_params = {
     'CURRENT_DIR': CURRENT_DIR,
     'BUILDER_DIR': BUILDER_DIR,
-    'SLAVE_DIR': SLAVE_DIR,
     'THIS_DIR': THIS_DIR,
-    'SCRIPTS_DIR': SCRIPTS_DIR,
-    'BUILD_DIR': BUILD_DIR,
-    'ROOT_DIR': ROOT_DIR,
     'DEPOT_TOOLS_DIR': DEPOT_TOOLS_DIR,
-  },
-  print ACTIVATED_MESSAGE if active else NOT_ACTIVATED_MESSAGE
+  }
+  for k, v in sorted(debug_params.iteritems()):
+    print "%s: %r" % (k, v)
 
 
 def main():
   # Get inputs.
   options, _ = parse_args()
-  builder = options.builder_name
-  slave = options.slave_name
-  master = options.master
-
-  if not master:
-    # bot_update activation whitelist is checked only on buildbot masters.
-    # If there is no master, bot_update is always active.
-    options.force = True
 
   # Check if this script should activate or not.
-  active = options.force or check_valid_host(master, builder, slave)
+  active = True
 
   # Print a helpful message to tell developers whats going on with this step.
-  print_help_text(
-      options.force, options.output_json, active, master, builder, slave)
+  print_debug_info()
 
-  # Parse, munipulate, and print the gclient solutions.
+  # Parse, manipulate, and print the gclient solutions.
   specs = {}
   exec(options.specs, specs)
-  svn_solutions = specs.get('solutions', [])
-  git_slns, svn_root, buildspec = solutions_to_git(svn_solutions)
-  options.revision = maybe_ignore_revision(options.revision, buildspec)
+  orig_solutions = specs.get('solutions', [])
+  git_slns = modify_solutions(orig_solutions)
 
   solutions_printer(git_slns)
 
   try:
     # Dun dun dun, the main part of bot_update.
-    revisions, step_text = prepare(options, git_slns, active)
-    checkout(options, git_slns, specs, buildspec, master, svn_root, revisions,
-             step_text)
+    revisions, step_text, shallow = prepare(options, git_slns, active)
+    checkout(options, git_slns, specs, revisions, step_text, shallow)
 
-  except Inactive:
-    # Not active, should count as passing.
-    pass
   except PatchFailed as e:
-    emit_flag(options.flag_file)
     # Return a specific non-zero exit code for patch failure (because it is
     # a failure), but make it different than other failures to distinguish
     # between infra failures (independent from patch author), and patch
@@ -1740,12 +1149,6 @@ def main():
       return 87
     # Genuine patch problem.
     return 88
-  except Exception:
-    # Unexpected failure.
-    emit_flag(options.flag_file)
-    raise
-  else:
-    emit_flag(options.flag_file)
 
 
 if __name__ == '__main__':