libv8 6.3.292.48.1 → 6.7.288.46.0

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_gerrit_angle_deprecated.json

@@ -1,4 +1,48 @@
 [
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "changes",
+      "--host",
+      "https://chromium-review.googlesource.com",
+      "--json_file",
+      "/path/to/tmp/json",
+      "--limit",
+      "1",
+      "-p",
+      "change=456789"
+    ],
+    "env": {
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "gerrit get_patch_destination_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@[@@@",
+      "@@@STEP_LOG_LINE@json.output@  {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"_number\": \"91827\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"branch\": \"master\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"change_id\": \"Ideadbeef\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"created\": \"2017-01-30 13:11:20.000000000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"has_review_started\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"project\": \"chromium/src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"184ebe53805e102605d11f6b143486d15c23a09c\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"_number\": \"1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"commit\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"message\": \"Change commit message\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"status\": \"NEW\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"subject\": \"Change title\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
   {
     "cmd": [
       "python",

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/{trychange_oauth2_buildbot.json → tryjob_gerrit_branch_heads.json}

@@ -1,4 +1,48 @@
 [
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "changes",
+      "--host",
+      "https://chromium-review.googlesource.com",
+      "--json_file",
+      "/path/to/tmp/json",
+      "--limit",
+      "1",
+      "-p",
+      "change=338811"
+    ],
+    "env": {
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "gerrit get_patch_destination_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@[@@@",
+      "@@@STEP_LOG_LINE@json.output@  {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"_number\": \"91827\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"branch\": \"refs/branch-heads/67\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"change_id\": \"Ideadbeef\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"created\": \"2017-01-30 13:11:20.000000000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"has_review_started\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"project\": \"chromium/src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"184ebe53805e102605d11f6b143486d15c23a09c\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"_number\": \"1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"commit\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"message\": \"Change commit message\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"status\": \"NEW\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"subject\": \"Change title\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
   {
     "cmd": [
       "python",
@@ -14,14 +58,16 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--apply_issue_email_file",
-      "[BUILD]/site_config/.rietveld_client_email",
-      "--apply_issue_key_file",
-      "[BUILD]/site_config/.rietveld_secret_key",
+      "--gerrit_repo",
+      "https://chromium.googlesource.com/chromium/src",
+      "--gerrit_ref",
+      "refs/changes/11/338811/3",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
-      "src@HEAD",
+      "src@refs/branch-heads/67",
+      "--refs",
+      "refs/branch-heads/67",
       "--disable-syntax-validation"
     ],
     "env_prefixes": {

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8.json

@@ -14,12 +14,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12345",
-      "--patchset",
-      "654321",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -121,8 +115,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--rietveld_server",
-      "https://rietveld.example.com/",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_v8_head_by_default.json

@@ -1,4 +1,48 @@
 [
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gerrit_client.py",
+      "changes",
+      "--host",
+      "https://chromium-review.googlesource.com",
+      "--json_file",
+      "/path/to/tmp/json",
+      "--limit",
+      "1",
+      "-p",
+      "change=456789"
+    ],
+    "env": {
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "infra_step": true,
+    "name": "gerrit get_patch_destination_branch",
+    "~followup_annotations": [
+      "@@@STEP_LOG_LINE@json.output@[@@@",
+      "@@@STEP_LOG_LINE@json.output@  {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"_number\": \"91827\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"branch\": \"master\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"change_id\": \"Ideadbeef\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"created\": \"2017-01-30 13:11:20.000000000\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"has_review_started\": false, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"project\": \"chromium/src\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"revisions\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@      \"184ebe53805e102605d11f6b143486d15c23a09c\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@        \"_number\": \"1\", @@@",
+      "@@@STEP_LOG_LINE@json.output@        \"commit\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@          \"message\": \"Change commit message\"@@@",
+      "@@@STEP_LOG_LINE@json.output@        }@@@",
+      "@@@STEP_LOG_LINE@json.output@      }@@@",
+      "@@@STEP_LOG_LINE@json.output@    }, @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"status\": \"NEW\", @@@",
+      "@@@STEP_LOG_LINE@json.output@    \"subject\": \"Change title\"@@@",
+      "@@@STEP_LOG_LINE@json.output@  }@@@",
+      "@@@STEP_LOG_LINE@json.output@]@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
   {
     "cmd": [
       "python",
@@ -14,12 +58,10 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--issue",
-      "12853011",
-      "--patchset",
-      "1",
-      "--rietveld_server",
-      "https://codereview.chromium.org",
+      "--gerrit_repo",
+      "https://chromium.googlesource.com/chromium/src",
+      "--gerrit_ref",
+      "refs/changes/89/456789/12",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",
@@ -121,8 +163,6 @@
       "[GIT_CACHE]",
       "--cleanup-dir",
       "[CLEANUP]/bot_update",
-      "--rietveld_server",
-      "https://codereview.chromium.org",
       "--output_json",
       "/path/to/tmp/json",
       "--revision",

data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.py

@@ -40,12 +40,10 @@ def RunSteps(api):
 
   patch = api.properties.get('patch', True)
   clobber = True if api.properties.get('clobber') else False
-  no_shallow = True if api.properties.get('no_shallow') else False
+  no_shallow = True if api.properties.get('no_shallow', 1) else False
   with_branch_heads = api.properties.get('with_branch_heads', False)
   with_tags = api.properties.get('with_tags', 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
@@ -75,8 +73,7 @@ def RunSteps(api):
         patch=patch,
         with_branch_heads=with_branch_heads,
         with_tags=with_tags,
-        refs=refs, patch_oauth2=oauth2,
-        oauth2_json=oauth2_json,
+        refs=refs,
         clobber=clobber,
         root_solution_revision=root_solution_revision,
         suffix=suffix,
@@ -134,25 +131,6 @@ def GenTests(api):
   yield api.test('trychange') + api.properties(
       refs=['+refs/change/1/2/333'],
   )
-  yield api.test('trychange_oauth2') + api.properties(
-      oauth2=True,
-  )
-  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,
@@ -170,8 +148,8 @@ def GenTests(api):
       rietveld='https://rietveld.example.com/',
       fail_patch='download'
   ) + api.step_data('bot_update', retcode=87)
-  yield api.test('no_shallow') + api.properties(
-      no_shallow=1
+  yield api.test('shallow') + api.properties(
+      no_shallow=0
   )
   yield api.test('clobber') + api.properties(
       clobber=1
@@ -215,6 +193,13 @@ def GenTests(api):
       patch_issue=338811,
       patch_set=3,
   )
+  yield api.test('no_apply_patch_on_gclient') + api.properties.tryserver(
+      gerrit_project='angle/angle',
+      patch_issue=338811,
+      patch_set=3,
+  ) + api.bot_update.properties(
+      apply_patch_on_gclient=False,
+  )
   yield api.test('tryjob_gerrit_v8') + api.properties.tryserver(
       gerrit_project='v8/v8',
       patch_issue=338811,
@@ -237,6 +222,14 @@ def GenTests(api):
       'gerrit get_patch_destination_branch',
       api.gerrit.get_one_change_response_data(branch='experimental/feature'),
   )
+  yield api.test('tryjob_gerrit_branch_heads') + api.properties.tryserver(
+      gerrit_project='chromium/src',
+      patch_issue=338811,
+      patch_set=3,
+  ) + api.step_data(
+      'gerrit get_patch_destination_branch',
+      api.gerrit.get_one_change_response_data(branch='refs/branch-heads/67'),
+  )
   yield api.test('tryjob_gerrit_angle_deprecated') + api.properties.tryserver(
       patch_project='angle/angle',
       gerrit='https://chromium-review.googlesource.com',

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

@@ -7,6 +7,7 @@
 
 import cStringIO
 import codecs
+from contextlib import contextmanager
 import copy
 import ctypes
 import json
@@ -41,6 +42,9 @@ CHROMIUM_SRC_URL = CHROMIUM_GIT_HOST + '/chromium/src.git'
 BRANCH_HEADS_REFSPEC = '+refs/branch-heads/*'
 TAGS_REFSPEC = '+refs/tags/*'
 
+# Regular expression to match sha1 git revision.
+COMMIT_HASH_RE = re.compile(r'[0-9a-f]{5,40}', re.IGNORECASE)
+
 # Regular expression that matches a single commit footer line.
 COMMIT_FOOTER_ENTRY_RE = re.compile(r'([^:]+):\s*(.*)')
 
@@ -51,6 +55,9 @@ COMMIT_ORIGINAL_POSITION_FOOTER_KEY = 'Cr-Original-Commit-Position'
 # Regular expression to parse gclient's revinfo entries.
 REVINFO_RE = re.compile(r'^([^:]+):\s+([^@]+)@(.+)$')
 
+# Regular expression to match gclient's patch error message.
+PATCH_ERROR_RE = re.compile('Failed to apply .* @ .* to .* at .*')
+
 # Copied from scripts/recipes/chromium.py.
 GOT_REVISION_MAPPINGS = {
     CHROMIUM_SRC_URL: {
@@ -70,6 +77,7 @@ GCLIENT_TEMPLATE = """solutions = %(solutions)s
 cache_dir = r%(cache_dir)s
 %(target_os)s
 %(target_os_only)s
+%(target_cpu)s
 """
 
 
@@ -142,7 +150,7 @@ def call(*args, **kwargs):  # pragma: no cover
     kwargs['stdin'] = subprocess.PIPE
   out = cStringIO.StringIO()
   new_env = kwargs.get('env', {})
-  env = copy.copy(os.environ)
+  env = os.environ.copy()
   env.update(new_env)
   kwargs['env'] = env
 
@@ -209,12 +217,14 @@ def git(*args, **kwargs):  # pragma: no cover
   return call(*cmd, **kwargs)
 
 
-def get_gclient_spec(solutions, target_os, target_os_only, git_cache_dir):
+def get_gclient_spec(solutions, target_os, target_os_only, target_cpu,
+                     git_cache_dir):
   return GCLIENT_TEMPLATE % {
       'solutions': pprint.pformat(solutions, indent=4),
       'cache_dir': '"%s"' % git_cache_dir,
       'target_os': ('\ntarget_os=%s' % target_os) if target_os else '',
-      'target_os_only': '\ntarget_os_only=%s' % target_os_only
+      'target_os_only': '\ntarget_os_only=%s' % target_os_only,
+      'target_cpu': ('\ntarget_cpu=%s' % target_cpu) if target_cpu else ''
   }
 
 
@@ -314,16 +324,36 @@ def call_gclient(*args, **kwargs):
   return call(*cmd, **kwargs)
 
 
-def gclient_configure(solutions, target_os, target_os_only, git_cache_dir):
+def gclient_configure(solutions, target_os, target_os_only, target_cpu,
+                      git_cache_dir):
   """Should do the same thing as gclient --spec='...'."""
   with codecs.open('.gclient', mode='w', encoding='utf-8') as f:
     f.write(get_gclient_spec(
-        solutions, target_os, target_os_only, git_cache_dir))
+        solutions, target_os, target_os_only, target_cpu, git_cache_dir))
+
+
+@contextmanager
+def git_config_if_not_set(key, value):
+  """Set git config for key equal to value if key was not set.
+
+  If key was not set, unset it once we're done."""
+  should_unset = True
+  try:
+    git('config', '--global', key)
+    should_unset = False
+  except SubprocessFailed as e:
+    git('config', '--global', key, value)
+  try:
+    yield
+  finally:
+    if should_unset:
+      git('config', '--global', '--unset', key)
 
 
 def gclient_sync(
     with_branch_heads, with_tags, shallow, revisions, break_repo_locks,
-    disable_syntax_validation):
+    disable_syntax_validation, gerrit_repo, gerrit_ref, gerrit_reset,
+    gerrit_rebase_patch_ref, apply_patch_on_gclient):
   # We just need to allocate a filename.
   fd, gclient_output_file = tempfile.mkstemp(suffix='.json')
   os.close(fd)
@@ -346,9 +376,22 @@ def gclient_sync(
       revision = 'origin/master'
     args.extend(['--revision', '%s@%s' % (name, revision)])
 
+  if apply_patch_on_gclient and gerrit_repo and gerrit_ref:
+    # TODO(ehmaldonado): Merge gerrit_repo and gerrit_ref into a patch-ref flag
+    # and add support for passing multiple patch refs.
+    args.extend(['--patch-ref', gerrit_repo + '@' + gerrit_ref])
+    if not gerrit_reset:
+      args.append('--no-reset-patch-ref')
+    if not gerrit_rebase_patch_ref:
+      args.append('--no-rebase-patch-ref')
+
   try:
     call_gclient(*args)
   except SubprocessFailed as e:
+    # If gclient sync is handling patching, parse the output for a patch error
+    # message.
+    if apply_patch_on_gclient and PATCH_ERROR_RE.search(e.output):
+      raise PatchFailed(e.message, e.code, e.output)
     # Throw a GclientSyncFailed exception so we can catch this independently.
     raise GclientSyncFailed(e.message, e.code, e.output)
   else:
@@ -414,7 +457,7 @@ def create_manifest(gclient_output, patch_root, gerrit_ref):
     the directory -> repo:revision mapping.
   * Gerrit Patch info which contains info about patched revisions.
 
-  We normalize the URLs such that if they are googlesource.com urls, they:
+  We normalize the URLs using the normalize_git_url function.
   """
   manifest = {
       'version': 0,  # Currently the only valid version is 0.
@@ -424,19 +467,16 @@ def create_manifest(gclient_output, patch_root, gerrit_ref):
     patch_root = patch_root.strip('/')  # Normalize directory names.
   for directory, info in gclient_output.get('solutions', {}).iteritems():
     directory = directory.strip('/')  # Normalize the directory name.
-    # There are two places to the the revision from, we do it in this order:
-    # 1. In the "revision" field
-    # 2. At the end of the URL, after @
-    repo = ''
-    revision = info.get('revision', '')
     # The format of the url is "https://repo.url/blah.git@abcdefabcdef" or
     # just "https://repo.url/blah.git"
-    url_split = info.get('url', '').split('@')
-    if not revision and len(url_split) == 2:
-      revision = url_split[1]
-    if url_split:
-      repo = normalize_git_url(url_split[0])
-    if repo:
+    url = info.get('url') or ''
+    repo, _, url_revision = url.partition('@')
+    repo = normalize_git_url(repo)
+    # There are two places to get the revision from, we do it in this order:
+    # 1. In the "revision" field
+    # 2. At the end of the URL, after @
+    revision = info.get('revision') or url_revision
+    if repo and revision:
       dirs[directory] = {
         'git_checkout': {
           'repo_url': repo,
@@ -523,6 +563,15 @@ def _get_target_branch_and_revision(solution_name, git_url, revisions):
   return 'master', configured
 
 
+def get_target_pin(solution_name, git_url, revisions):
+  """Returns revision to be checked out if it is pinned, else None."""
+  _, revision = _get_target_branch_and_revision(
+      solution_name, git_url, revisions)
+  if COMMIT_HASH_RE.match(revision):
+    return revision
+  return None
+
+
 def force_solution_revision(solution_name, git_url, revisions, cwd):
   branch, revision = _get_target_branch_and_revision(
       solution_name, git_url, revisions)
@@ -543,6 +592,18 @@ def force_solution_revision(solution_name, git_url, revisions, cwd):
   git('checkout', '--force', treeish, '--', cwd=cwd)
 
 
+def _has_in_git_cache(revision_sha1, git_cache_dir, url):
+  """Returns whether given revision_sha1 is contained in cache of a given repo.
+  """
+  try:
+    mirror_dir = git(
+        'cache', 'exists', '--quiet', '--cache-dir', git_cache_dir, url).strip()
+    git('cat-file', '-e', revision_sha1, cwd=mirror_dir)
+    return True
+  except SubprocessFailed:
+    return False
+
+
 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'))
@@ -606,20 +667,54 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
   for ref in refs:
     populate_cmd.extend(['--ref', ref])
 
-  # Just in case we're hitting a different git server than the one from
-  # which the target revision was polled, we retry some.
+  env = {}
+  if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
+    # This is for performance investigation of `git fetch` in chromium/src.
+    env = {
+        'GIT_TRACE': 'true',
+        'GIT_TRACE_PERFORMANCE': 'true',
+    }
 
-  # One minute (5 tries with exp. backoff). We retry at least once regardless
-  # of deadline in case initial fetch takes longer than the deadline but does
-  # not contain the required revision.
-  deadline = time.time() + 60
-  tries = 0
-  while True:
-    git(*populate_cmd)
-    mirror_dir = git(
-        'cache', 'exists', '--quiet',
-        '--cache-dir', git_cache_dir, url).strip()
+  # Step 1: populate/refresh cache, if necessary.
+  pin = get_target_pin(name, url, revisions)
+  if not pin:
+    # Refresh only once.
+    git(*populate_cmd, env=env)
+  elif _has_in_git_cache(pin, git_cache_dir, url):
+    # No need to fetch at all, because we already have needed revision.
+    pass
+  else:
+    # We may need to retry a bit due to eventual consinstency in replication of
+    # git servers.
+    soft_deadline = time.time() + 60
+    attempt = 0
+    while True:
+      attempt += 1
+      # TODO(tandrii): propagate the pin to git server per recommendation of
+      # maintainers of *.googlesource.com (workaround git server replication
+      # lag).
+      git(*populate_cmd, env=env)
+      if _has_in_git_cache(pin, git_cache_dir, url):
+        break
+      overrun = time.time() - soft_deadline
+      # Only kick in deadline after second attempt to ensure we retry at least
+      # once after initial fetch from not-yet-replicated server.
+      if attempt >= 2 and overrun > 0:
+        print 'Ran %s seconds past deadline. Aborting.' % (overrun,)
+        # TODO(tandrii): raise exception immediately here, instead of doing
+        # useless step 2 trying to fetch something that we know doesn't exist
+        # in cache **after production data gives us confidence to do so**.
+        break
+
+      sleep_secs = min(60, 2**attempt)
+      print 'waiting %s seconds and trying to fetch again...' % sleep_secs
+      time.sleep(sleep_secs)
 
+  # Step 2: populate a checkout from local cache. All operations are local.
+  mirror_dir = git(
+      'cache', 'exists', '--quiet', '--cache-dir', git_cache_dir, url).strip()
+  first_try = True
+  while True:
     try:
       # If repo deletion was aborted midway, it may have left .git in broken
       # state.
@@ -631,7 +726,9 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
       if not path.isdir(sln_dir):
         git('clone', '--no-checkout', '--local', '--shared', mirror_dir,
             sln_dir)
+        _git_disable_gc(sln_dir)
       else:
+        _git_disable_gc(sln_dir)
         git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir)
         git('fetch', 'origin', cwd=sln_dir)
       for ref in refs:
@@ -650,20 +747,17 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
     except SubprocessFailed as e:
       # Exited abnormally, theres probably something wrong.
       print 'Something failed: %s.' % str(e)
-
-      # Only kick in deadline after trying once, in case the revision hasn't
-      # yet propagated.
-      if tries >= 1 and time.time() > deadline:
-        overrun = time.time() - deadline
-        print 'Ran %s seconds past deadline. Aborting.' % overrun
+      if first_try:
+        first_try = False
+        # Lets wipe the checkout and try again.
+        remove(sln_dir, cleanup_dir)
+      else:
         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, cleanup_dir)
+def _git_disable_gc(cwd):
+  git('config', 'gc.auto', '0', cwd=cwd)
+  git('config', 'gc.autodetach', '0', cwd=cwd)
+  git('config', 'gc.autopacklimit', '0', cwd=cwd)
 
 
 def _download(url):
@@ -676,46 +770,6 @@ def _download(url):
         raise
 
 
-def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
-                         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,
-         # The patch will be applied on top of this directory.
-         '--root_dir', root,
-         # Tell apply_issue how to fetch the patch.
-         '--issue', issue,
-         '--server', server,
-         # Always run apply_issue.py, otherwise it would see update.flag
-         # and then bail out.
-         '--force',
-         # Don't run gclient sync when it sees a DEPS change.
-         '--ignore_deps',
-  ]
-  # 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')
-
-  if patchset:
-    cmd.extend(['--patchset', patchset])
-  if whitelist:
-    for item in whitelist:
-      cmd.extend(['--whitelist', item])
-  elif blacklist:
-    for item in blacklist:
-      cmd.extend(['--blacklist', item])
-
-  # Only try once, since subsequent failures hide the real failure.
-  try:
-    call(*cmd)
-  except SubprocessFailed as e:
-    raise PatchFailed(e.message, e.code, e.output)
-
 def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
                      gerrit_rebase_patch_ref):
   gerrit_repo = gerrit_repo or 'origin'
@@ -725,7 +779,7 @@ 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.
+  # TODO(tandrii): move the fix below to common 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
@@ -827,44 +881,37 @@ def emit_json(out_file, did_run, gclient_output=None, **kwargs):
 
 
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
-                    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,
-                    cleanup_dir, gerrit_reset, disable_syntax_validation):
+                    target_cpu, patch_root, gerrit_repo, gerrit_ref,
+                    gerrit_rebase_patch_ref, shallow, refs, git_cache_dir,
+                    cleanup_dir, gerrit_reset, disable_syntax_validation,
+                    apply_patch_on_gclient):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
   print 'Fetching Git checkout'
 
-  git_ref = git_checkouts(solutions, revisions, shallow, refs, git_cache_dir,
-                          cleanup_dir)
+  git_checkouts(solutions, revisions, shallow, refs, git_cache_dir, cleanup_dir)
 
-  print '===Processing patch solutions==='
-  already_patched = []
-  patch_root = patch_root or ''
   applied_gerrit_patch = False
-  print 'Patch root is %r' % patch_root
-  for solution in solutions:
-    print 'Processing solution %r' % solution['name']
-    if (patch_root == solution['name'] or
-        solution['name'].startswith(patch_root + '/')):
-      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 issue:
-        apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                             revision_mapping, git_ref, apply_issue_email_file,
-                             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,
-                         gerrit_rebase_patch_ref)
-        applied_gerrit_patch = True
+  if not apply_patch_on_gclient:
+    print '===Processing patch solutions==='
+    patch_root = patch_root or ''
+    print 'Patch root is %r' % patch_root
+    for solution in solutions:
+      print 'Processing solution %r' % solution['name']
+      if (patch_root == solution['name'] or
+          solution['name'].startswith(patch_root + '/')):
+        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 gerrit_ref:
+          apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
+                           gerrit_rebase_patch_ref)
+          applied_gerrit_patch = True
 
   # Ensure our build/ directory is set up with the correct .gclient file.
-  gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
+  gclient_configure(solutions, target_os, target_os_only, target_cpu,
+                    git_cache_dir)
 
   # Windows sometimes has trouble deleting files. This can make git commands
   # that rely on locks fail.
@@ -879,16 +926,24 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   # 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(
-      BRANCH_HEADS_REFSPEC in refs,
-      TAGS_REFSPEC in refs,
-      shallow,
-      gc_revisions,
-      break_repo_locks,
-      disable_syntax_validation)
+
+  with git_config_if_not_set('user.name', 'chrome-bot'):
+    with git_config_if_not_set('user.email', 'chrome-bot@chromium.org'):
+      # 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(
+          BRANCH_HEADS_REFSPEC in refs,
+          TAGS_REFSPEC in refs,
+          shallow,
+          gc_revisions,
+          break_repo_locks,
+          disable_syntax_validation,
+          gerrit_repo,
+          gerrit_ref,
+          gerrit_reset,
+          gerrit_rebase_patch_ref,
+          apply_patch_on_gclient)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
@@ -896,12 +951,7 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
     git('checkout', 'HEAD', '--', '.DEPS.git', cwd=first_sln)
 
   # Apply the rest of the patch here (sans DEPS)
-  if issue:
-    apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
-                         revision_mapping, git_ref, apply_issue_email_file,
-                         apply_issue_key_file, apply_issue_oauth2_file,
-                         blacklist=already_patched)
-  elif gerrit_ref and not applied_gerrit_patch:
+  if gerrit_ref and not applied_gerrit_patch and not apply_patch_on_gclient:
     # 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
     # git repositories.
@@ -911,7 +961,8 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions:
     sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
-  gclient_configure(solutions, target_os, target_os_only, git_cache_dir)
+  gclient_configure(solutions, target_os, target_os_only, target_cpu,
+                    git_cache_dir)
 
   return gclient_output
 
@@ -960,23 +1011,9 @@ def parse_revisions(revisions, root):
 def parse_args():
   parse = optparse.OptionParser()
 
-  parse.add_option('--issue', help='Issue number to patch from.')
-  parse.add_option('--patchset',
-                   help='Patchset from issue to patch from, if applicable.')
-  parse.add_option('--apply_issue_email_file',
-                   help='--email-file option passthrough for apply_patch.py.')
-  parse.add_option('--apply_issue_key_file',
-                   help='--private-key-file option passthrough for '
-                        'apply_patch.py.')
-  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.')
-  parse.add_option('--rietveld_server',
-                   default='codereview.chromium.org',
-                   help='Rietveld server.')
   parse.add_option('--gerrit_repo',
                    help='Gerrit repository to pull the ref from.')
   parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
@@ -1001,9 +1038,9 @@ def parse_args():
                    help='Delete checkout first, always')
   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('--maybe_shallow', action='store_true',
+                   help='Enables turning on shallow mode if total disk '
+                        'space is low.')
   parse.add_option('--refs', action='append',
                    help='Also fetch this refspec for the main solution(s). '
                         'Eg. +refs/branch-heads/*')
@@ -1020,6 +1057,10 @@ def parse_args():
   parse.add_option(
       '--disable-syntax-validation', action='store_true',
       help='Disable validation of .gclient and DEPS syntax.')
+  parse.add_option('--no-apply-patch-on-gclient',
+                   dest='apply_patch_on_gclient', action='store_false',
+                   default=True,
+                   help='Patch the gerrit ref in gclient instead of here.')
 
   options, args = parse.parse_args()
 
@@ -1085,7 +1126,7 @@ def prepare(options, git_slns, active):
                                            total_disk_space_gb,
                                            percent_used)
   shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD
-             and not options.no_shallow)
+             and options.maybe_shallow)
 
   # The first solution is where the primary DEPS file resides.
   first_sln = dir_names[0]
@@ -1119,18 +1160,14 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
           target_os=specs.get('target_os', []),
           target_os_only=specs.get('target_os_only', False),
 
+          # Also, target cpu variables for gclient.
+          target_cpu=specs.get('target_cpu', []),
+
           # Then, pass in information about how to patch.
           patch_root=options.patch_root,
-          issue=options.issue,
-          patchset=options.patchset,
-          rietveld_server=options.rietveld_server,
           gerrit_repo=options.gerrit_repo,
           gerrit_ref=options.gerrit_ref,
           gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
-          revision_mapping=options.revision_mapping,
-          apply_issue_email_file=options.apply_issue_email_file,
-          apply_issue_key_file=options.apply_issue_key_file,
-          apply_issue_oauth2_file=options.apply_issue_oauth2_file,
 
           # Finally, extra configurations such as shallowness of the clone.
           shallow=shallow,
@@ -1138,7 +1175,8 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
           git_cache_dir=options.git_cache_dir,
           cleanup_dir=options.cleanup_dir,
           gerrit_reset=not options.gerrit_no_reset,
-          disable_syntax_validation=options.disable_syntax_validation)
+          disable_syntax_validation=options.disable_syntax_validation,
+          apply_patch_on_gclient=options.apply_patch_on_gclient)
       gclient_output = ensure_checkout(**checkout_parameters)
     except GclientSyncFailed:
       print 'We failed gclient sync, lets delete the checkout and retry.'