libv8 5.2.361.43.1 → 5.3.332.38.0beta2

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

@@ -0,0 +1,44 @@
+[
+  {
+    "cmd": [
+      "python",
+      "-u",
+      "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
+      "--master",
+      "experimental",
+      "--builder",
+      "Experimental Builder",
+      "--slave",
+      "somehost",
+      "--spec",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
+      "--root",
+      "src",
+      "--revision_mapping_file",
+      "{\"src\": \"got_cr_revision\"}",
+      "--git-cache-dir",
+      "[GIT_CACHE]",
+      "--output_json",
+      "/path/to/tmp/json",
+      "--revision",
+      "src@HEAD",
+      "--gerrit_no_rebase_patch_ref"
+    ],
+    "env": {
+      "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+    },
+    "name": "bot_update",
+    "~followup_annotations": [
+      "@@@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@}@@@",
+      "@@@STEP_LOG_END@json.output@@@"
+    ]
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -11,7 +11,7 @@
       "--slave",
       "totallyaslave-c4",
       "--spec",
-      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'svn://svn.chromium.org/chrome/trunk/src'}]",
+      "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]",
       "--root",
       "src",
       "--revision_mapping_file",
@@ -65,7 +65,7 @@
       "-u",
       "import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)"
     ],
-    "name": "Patch failure",
+    "name": "Patch failure - Try Rebasing",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_LOG_LINE@python.inline@import sys;print \"Patch download failed. See bot_update step for details\";sys.exit(1)@@@",
@@ -75,7 +75,7 @@
   },
   {
     "name": "$result",
-    "reason": "Infra Failure: Step('Patch failure') returned 1",
+    "reason": "Infra Failure: Step('Patch failure - Try Rebasing') returned 1",
     "recipe_result": null,
     "status_code": 1
   }

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

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

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

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

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

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

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

@@ -12,10 +12,10 @@ DEPS = [
 def RunSteps(api):
   api.gclient.use_mirror = True
 
-  src_cfg = api.gclient.make_config(GIT_MODE=True, CACHE_DIR='[GIT_CACHE]')
+  src_cfg = api.gclient.make_config(CACHE_DIR='[GIT_CACHE]')
   soln = src_cfg.solutions.add()
   soln.name = 'src'
-  soln.url = 'svn://svn.chromium.org/chrome/trunk/src'
+  soln.url = 'https://chromium.googlesource.com/chromium/src.git'
   soln.revision = api.properties.get('revision')
   api.gclient.c = src_cfg
   api.gclient.c.revisions.update(api.properties.get('revisions', {}))
@@ -34,16 +34,27 @@ def RunSteps(api):
   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
-  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,
-                                 clobber=clobber,
-                                 root_solution_revision=root_solution_revision,
-                                 suffix=suffix,
-                                 gerrit_no_reset=gerrit_no_reset)
+  gerrit_no_rebase_patch_ref = bool(
+      api.properties.get('gerrit_no_rebase_patch_ref'))
+
+  if api.properties.get('test_apply_gerrit_ref'):
+    api.bot_update.apply_gerrit_ref(
+        root='/tmp/test/root',
+        gerrit_no_reset=gerrit_no_reset,
+        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,
+        clobber=clobber,
+        root_solution_revision=root_solution_revision,
+        suffix=suffix,
+        gerrit_no_reset=gerrit_no_reset,
+        gerrit_no_rebase_patch_ref=gerrit_no_rebase_patch_ref)
 
 
 def GenTests(api):
@@ -130,12 +141,6 @@ def GenTests(api):
       buildername='Experimental Builder',
       slavename='somehost',
   )
-  yield api.test('svn_mode') + api.properties(
-      mastername='experimental.svn',
-      buildername='Experimental SVN Builder',
-      slavename='somehost',
-      force=1
-  )
   yield api.test('clobber') + api.properties(
       mastername='experimental',
       buildername='Experimental Builder',
@@ -154,6 +159,18 @@ def GenTests(api):
       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(
+      repository='chromium',
+      gerrit_no_rebase_patch_ref=True,
+      gerrit_no_reset=1,
+      test_apply_gerrit_ref=True,
+  )
   yield api.test('tryjob_v8') + api.properties(
       mastername='tryserver.chromium.linux',
       buildername='linux_rel',

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

@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+# Copyright 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import optparse
+import sys
+
+import bot_update  # pylint: disable=relative-import
+
+
+if __name__ == '__main__':
+  parse = optparse.OptionParser()
+
+  parse.add_option('--gerrit_repo',
+                   help='Gerrit repository to pull the ref from.')
+  parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
+  parse.add_option('--root', help='The location of the checkout.')
+  parse.add_option('--gerrit_no_reset', action='store_true',
+                   help='Bypass calling reset after applying a gerrit ref.')
+  parse.add_option('--gerrit_no_rebase_patch_ref', action='store_true',
+                   help='Bypass rebase of Gerrit patch ref after checkout.')
+
+  options, _ = parse.parse_args()
+
+  sys.exit(
+      bot_update.apply_gerrit_ref(
+          options.gerrit_repo,
+          options.gerrit_ref,
+          options.root,
+          not options.gerrit_no_reset,
+          not options.gerrit_no_rebase_patch_ref)
+  )

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

@@ -351,11 +351,6 @@ GIT_MASTERS += internal_data.get('GIT_MASTERS', [])
 # How many times to try before giving up.
 ATTEMPTS = 5
 
-# Find deps2git
-DEPS2GIT_DIR_PATH = path.join(SCRIPTS_DIR, 'tools', 'deps2git')
-DEPS2GIT_PATH = path.join(DEPS2GIT_DIR_PATH, 'deps2git.py')
-S2G_INTERNAL_PATH = path.join(SCRIPTS_DIR, 'tools', 'deps2git_internal',
-                              'svn_to_git_internal.py')
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
 
 # Find the patch tool.
@@ -811,59 +806,6 @@ def get_git_hash(revision, branch, sln_dir):
                             (revision, sln_dir))
 
 
-def _last_commit_for_file(filename, repo_base):
-  cmd = ['log', '--format=%H', '--max-count=1', '--', filename]
-  return git(*cmd, cwd=repo_base).strip()
-
-
-def need_to_run_deps2git(repo_base, deps_file, deps_git_file):
-  """Checks to see if we need to run deps2git.
-
-  Returns True if there was a DEPS change after the last .DEPS.git update
-  or if DEPS has local modifications.
-  """
-  # See if DEPS is dirty
-  deps_file_status = git(
-      'status', '--porcelain', deps_file, cwd=repo_base).strip()
-  if deps_file_status and deps_file_status.startswith('M '):
-    return True
-
-  last_known_deps_ref = _last_commit_for_file(deps_file, repo_base)
-  last_known_deps_git_ref = _last_commit_for_file(deps_git_file, repo_base)
-  merge_base_ref = git('merge-base', last_known_deps_ref,
-                       last_known_deps_git_ref, cwd=repo_base).strip()
-
-  # If the merge base of the last DEPS and last .DEPS.git file is not
-  # equivilent to the hash of the last DEPS file, that means the DEPS file
-  # was committed after the last .DEPS.git file.
-  return last_known_deps_ref != merge_base_ref
-
-
-def ensure_deps2git(solution, shallow, git_cache_dir):
-  repo_base = path.join(os.getcwd(), solution['name'])
-  deps_file = path.join(repo_base, 'DEPS')
-  deps_git_file = path.join(repo_base, '.DEPS.git')
-  if (not git('ls-files', 'DEPS', cwd=repo_base).strip() or
-      not git('ls-files', '.DEPS.git', cwd=repo_base).strip()):
-    return
-
-  print 'Checking if %s is newer than %s' % (deps_file, deps_git_file)
-  if not need_to_run_deps2git(repo_base, deps_file, deps_git_file):
-    return
-
-  print '===DEPS file modified, need to run deps2git==='
-  cmd = [sys.executable, DEPS2GIT_PATH,
-         '--workspace', os.getcwd(),
-         '--cache_dir', git_cache_dir,
-         '--deps', deps_file,
-         '--out', deps_git_file]
-  if 'chrome-internal.googlesource' in solution['url']:
-    cmd.extend(['--extra-rules', S2G_INTERNAL_PATH])
-  if shallow:
-    cmd.append('--shallow')
-  call(*cmd)
-
-
 def emit_log_lines(name, lines):
   for line in lines.splitlines():
     print '@@@STEP_LOG_LINE@%s@%s@@@' % (name, line)
@@ -1108,10 +1050,6 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
          '--force',
          # Don't run gclient sync when it sees a DEPS change.
          '--ignore_deps',
-         # TODO(tandrii): remove after http://crbug.com/537417 is resolved.
-         # Temporary enable verbosity to see if Rietveld requests are actually
-         # retried.
-         '-v', '-v',  # = logging.DEBUG level.
   ]
   # Use an oauth key file if specified.
   if email_file and key_file:
@@ -1138,15 +1076,39 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
   except SubprocessFailed as e:
     raise PatchFailed(e.message, e.code, e.output)
 
-def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset):
+def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset,
+                     gerrit_rebase_patch_ref):
   gerrit_repo = gerrit_repo or 'origin'
   assert gerrit_ref
+  base_rev = git('rev-parse', 'HEAD', cwd=root).strip()
+
   print '===Applying gerrit ref==='
-  print 'Repo is %r, ref is %r, root is %r' % (gerrit_repo, gerrit_ref, root)
+  print 'Repo is %r @ %r, ref is %r, root is %r' % (
+      gerrit_repo, base_rev, gerrit_ref, root)
   try:
-    base_rev = git('rev-parse', 'HEAD', cwd=root).strip()
     git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1)
     git('checkout', 'FETCH_HEAD', cwd=root)
+
+    if gerrit_rebase_patch_ref:
+      print '===Rebasing==='
+      # git rebase requires a branch to operate on.
+      temp_branch_name = 'tmp/' + uuid.uuid4().hex
+      try:
+        ok = False
+        git('checkout', '-b', temp_branch_name, cwd=root)
+        git('rebase', base_rev, cwd=root)
+
+        # Get off of the temporary branch since it can't be deleted otherwise.
+        cur_rev = git('rev-parse', 'HEAD', cwd=root).strip()
+        git('checkout', cur_rev, cwd=root)
+        git('branch', '-D', temp_branch_name, cwd=root)
+        ok = True
+      finally:
+        if not ok:
+          # Get off of the temporary branch since it can't be deleted otherwise.
+          git('checkout', base_rev, cwd=root)
+          git('branch', '-D', temp_branch_name, cwd=root)
+
     if gerrit_reset:
       git('reset', '--soft', base_rev, cwd=root)
   except SubprocessFailed as e:
@@ -1304,10 +1266,10 @@ def ensure_deps_revisions(deps_url_mapping, solutions, revisions):
 
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
                     patch_root, issue, patchset, patch_url, rietveld_server,
-                    gerrit_repo, gerrit_ref, revision_mapping,
-                    apply_issue_email_file, apply_issue_key_file, buildspec,
-                    gyp_env, shallow, runhooks, refs, git_cache_dir,
-                    gerrit_reset):
+                    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):
   # Get a checkout of each solution, without DEPS or hooks.
   # Calling git directly because there is no way to run Gclient without
   # invoking DEPS.
@@ -1322,6 +1284,7 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   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']
@@ -1338,11 +1301,10 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
                              revision_mapping, git_ref, apply_issue_email_file,
                              apply_issue_key_file, whitelist=[target])
         already_patched.append(target)
-
-  if not buildspec:
-    # Run deps2git if there is a DEPS change after the last .DEPS.git commit.
-    for solution in solutions:
-      ensure_deps2git(solution, shallow, git_cache_dir)
+      elif 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)
@@ -1376,8 +1338,12 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
     apply_rietveld_issue(issue, patchset, patch_root, rietveld_server,
                          revision_mapping, git_ref, apply_issue_email_file,
                          apply_issue_key_file, blacklist=already_patched)
-  elif gerrit_ref:
-    apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset)
+  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
+    # git repositories.
+    apply_gerrit_ref(gerrit_repo, gerrit_ref, patch_root, gerrit_reset,
+                     gerrit_rebase_patch_ref)
 
   # Reset the deps_file point in the solutions so that hooks get run properly.
   for sln in solutions:
@@ -1456,6 +1422,8 @@ def parse_args():
   parse.add_option('--gerrit_repo',
                    help='Gerrit repository to pull the ref from.')
   parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
+  parse.add_option('--gerrit_no_rebase_patch_ref', action='store_true',
+                   help='Bypass rebase of Gerrit patch ref after checkout.')
   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.')
@@ -1617,6 +1585,7 @@ def checkout(options, git_slns, specs, buildspec, master,
           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,