libv8 6.7.288.46.1 → 7.3.492.27.0beta1

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

@@ -55,9 +55,6 @@ 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: {
@@ -87,11 +84,6 @@ ATTEMPTS = 5
 GIT_CACHE_PATH = path.join(DEPOT_TOOLS_DIR, 'git_cache.py')
 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.
-SHALLOW_CLONE_THRESHOLD = 100 * 1024 * 1024 * 1024
-
-
 class SubprocessFailed(Exception):
   def __init__(self, message, code, output):
     Exception.__init__(self, message)
@@ -351,22 +343,20 @@ def git_config_if_not_set(key, value):
 
 
 def gclient_sync(
-    with_branch_heads, with_tags, shallow, revisions, break_repo_locks,
-    disable_syntax_validation, gerrit_repo, gerrit_ref, gerrit_reset,
-    gerrit_rebase_patch_ref, apply_patch_on_gclient):
+    with_branch_heads, with_tags, revisions, break_repo_locks,
+    disable_syntax_validation, patch_refs, gerrit_reset,
+    gerrit_rebase_patch_ref):
   # We just need to allocate a filename.
   fd, gclient_output_file = tempfile.mkstemp(suffix='.json')
   os.close(fd)
 
   args = ['sync', '--verbose', '--reset', '--force',
-         '--ignore_locks', '--output-json', gclient_output_file,
-         '--nohooks', '--noprehooks', '--delete_unversioned_trees']
+          '--ignore_locks', '--output-json', gclient_output_file,
+          '--nohooks', '--noprehooks', '--delete_unversioned_trees']
   if with_branch_heads:
     args += ['--with_branch_heads']
   if with_tags:
     args += ['--with_tags']
-  if shallow:
-    args += ['--shallow']
   if break_repo_locks:
     args += ['--break_repo_locks']
   if disable_syntax_validation:
@@ -376,10 +366,9 @@ 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 patch_refs:
+    for patch_ref in patch_refs:
+      args.extend(['--patch-ref', patch_ref])
     if not gerrit_reset:
       args.append('--no-reset-patch-ref')
     if not gerrit_rebase_patch_ref:
@@ -390,7 +379,7 @@ def gclient_sync(
   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):
+    if 'Failed to apply patch.' in 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)
@@ -446,7 +435,7 @@ def create_manifest_old():
 
 
 # TODO(hinoka): Include patch revision.
-def create_manifest(gclient_output, patch_root, gerrit_ref):
+def create_manifest(gclient_output, patch_root):
   """Return the JSONPB equivilent of the source manifest proto.
 
   The source manifest proto is defined here:
@@ -483,8 +472,6 @@ def create_manifest(gclient_output, patch_root, gerrit_ref):
           'revision': revision,
         }
       }
-      if patch_root == directory:
-        dirs[directory]['git_checkout']['patch_fetch_ref'] = gerrit_ref
 
   manifest['directories'] = dirs
   return manifest
@@ -560,7 +547,9 @@ def _get_target_branch_and_revision(solution_name, git_url, revisions):
   if len(parts) == 2:
     # Support for "branch:revision" syntax.
     return parts
-  return 'master', configured
+  if COMMIT_HASH_RE.match(configured):
+    return 'master', configured
+  return configured, 'HEAD'
 
 
 def get_target_pin(solution_name, git_url, revisions):
@@ -584,7 +573,10 @@ def force_solution_revision(solution_name, git_url, revisions, cwd):
     # This will also not work if somebody passes a local refspec like
     # refs/heads/master. It needs to translate to refs/remotes/origin/master
     # first. See also https://crbug.com/740456 .
-    treeish = branch if branch.startswith('refs/') else 'origin/%s' % branch
+    if branch.startswith(('refs/', 'origin/')):
+      treeish = branch
+    else:
+      treeish = 'origin/' + branch
 
   # Note that -- argument is necessary to ensure that git treats `treeish`
   # argument as revision or ref, and not as a file/directory which happens to
@@ -592,13 +584,15 @@ 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):
+def _has_in_git_cache(revision_sha1, refs, 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)
+    for ref in refs:
+      git('cat-file', '-e', ref, cwd=mirror_dir)
     return True
   except SubprocessFailed:
     return False
@@ -637,14 +631,12 @@ def _maybe_break_locks(checkout_path, tries=3):
 
 
 
-def git_checkouts(solutions, revisions, shallow, refs, git_cache_dir,
-                  cleanup_dir):
+def git_checkouts(solutions, revisions, refs, git_cache_dir, cleanup_dir):
   build_dir = os.getcwd()
   first_solution = True
   for sln in solutions:
     sln_dir = path.join(build_dir, sln['name'])
-    _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
-                  cleanup_dir)
+    _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir)
     if first_solution:
       git_ref = git('log', '--format=%H', '--max-count=1',
                     cwd=path.join(build_dir, sln['name'])
@@ -653,17 +645,11 @@ def git_checkouts(solutions, revisions, shallow, refs, git_cache_dir,
   return git_ref
 
 
-def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
-                  cleanup_dir):
+def _git_checkout(sln, sln_dir, revisions, refs, git_cache_dir, cleanup_dir):
   name = sln['name']
   url = sln['url']
-  if url == CHROMIUM_SRC_URL or url + '.git' == CHROMIUM_SRC_URL:
-    # Experiments show there's little to be gained from
-    # a shallow clone of src.
-    shallow = False
-  s = ['--shallow'] if shallow else []
   populate_cmd = (['cache', 'populate', '--ignore_locks', '-v',
-                   '--cache-dir', git_cache_dir] + s + [url])
+                   '--cache-dir', git_cache_dir, url, '--reset-fetch-config'])
   for ref in refs:
     populate_cmd.extend(['--ref', ref])
 
@@ -680,7 +666,7 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
   if not pin:
     # Refresh only once.
     git(*populate_cmd, env=env)
-  elif _has_in_git_cache(pin, git_cache_dir, url):
+  elif _has_in_git_cache(pin, refs, git_cache_dir, url):
     # No need to fetch at all, because we already have needed revision.
     pass
   else:
@@ -694,7 +680,7 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
       # maintainers of *.googlesource.com (workaround git server replication
       # lag).
       git(*populate_cmd, env=env)
-      if _has_in_git_cache(pin, git_cache_dir, url):
+      if _has_in_git_cache(pin, refs, git_cache_dir, url):
         break
       overrun = time.time() - soft_deadline
       # Only kick in deadline after second attempt to ensure we retry at least
@@ -731,6 +717,7 @@ def _git_checkout(sln, sln_dir, revisions, shallow, refs, git_cache_dir,
         _git_disable_gc(sln_dir)
         git('remote', 'set-url', 'origin', mirror_dir, cwd=sln_dir)
         git('fetch', 'origin', cwd=sln_dir)
+      git('remote', 'set-url', '--push', 'origin', url, cwd=sln_dir)
       for ref in refs:
         refspec = '%s:%s' % (ref, ref.lstrip('+'))
         git('fetch', 'origin', refspec, cwd=sln_dir)
@@ -770,58 +757,6 @@ def _download(url):
         raise
 
 
-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 @ %r, ref is %r, root is %r' % (
-      gerrit_repo, base_rev, gerrit_ref, root)
-  # 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
-  # command will do so. See http://crbug.com/692067.
-  git('reset', '--hard', cwd=root)
-  try:
-    git('fetch', gerrit_repo, gerrit_ref, cwd=root)
-    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)
-        try:
-          git('-c', 'user.name=chrome-bot',
-              '-c', 'user.email=chrome-bot@chromium.org',
-              '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()
-        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:
-    raise PatchFailed(e.message, e.code, e.output)
-
-
 def get_commit_position(git_path, revision='HEAD'):
   """Dumps the 'git' log for a specific revision and parses out the commit
   position.
@@ -881,33 +816,15 @@ def emit_json(out_file, did_run, gclient_output=None, **kwargs):
 
 
 def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
-                    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):
+                    target_cpu, patch_root, patch_refs,
+                    gerrit_rebase_patch_ref, refs, git_cache_dir,
+                    cleanup_dir, gerrit_reset, disable_syntax_validation):
   # 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_checkouts(solutions, revisions, shallow, refs, git_cache_dir, cleanup_dir)
-
-  applied_gerrit_patch = False
-  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
+  git_checkouts(solutions, revisions, refs, git_cache_dir, cleanup_dir)
 
   # Ensure our build/ directory is set up with the correct .gclient file.
   gclient_configure(solutions, target_os, target_os_only, target_cpu,
@@ -935,29 +852,18 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
       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,
+          patch_refs,
           gerrit_reset,
-          gerrit_rebase_patch_ref,
-          apply_patch_on_gclient)
+          gerrit_rebase_patch_ref)
 
   # Now that gclient_sync has finished, we should revert any .DEPS.git so that
   # presubmit doesn't complain about it being modified.
   if git('ls-files', '.DEPS.git', cwd=first_sln).strip():
     git('checkout', 'HEAD', '--', '.DEPS.git', cwd=first_sln)
 
-  # Apply the rest of the patch here (sans DEPS)
-  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.
-    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:
     sln['deps_file'] = sln.get('deps_file', 'DEPS').replace('.DEPS.git', 'DEPS')
@@ -980,11 +886,11 @@ def parse_revisions(revisions, root):
     # TODO(hinoka): Delete this when webkit switches to recipes.
     expanded_revisions.extend(revision.split(','))
   for revision in expanded_revisions:
-    split_revision = revision.split('@')
+    split_revision = revision.split('@', 1)
     if len(split_revision) == 1:
       # This is just a plain revision, set it as the revision for root.
       results[root] = split_revision[0]
-    elif len(split_revision) == 2:
+    else:
       # This is an alt_root@revision argument.
       current_root, current_rev = split_revision
 
@@ -1002,9 +908,7 @@ def parse_revisions(revisions, root):
         normalized_root = current_root.strip('/')
 
       results[normalized_root] = current_rev
-    else:
-      print ('WARNING: %r is not recognized as a valid revision specification,'
-             'skipping' % revision)
+
   return results
 
 
@@ -1014,9 +918,8 @@ def parse_args():
   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('--gerrit_repo',
-                   help='Gerrit repository to pull the ref from.')
-  parse.add_option('--gerrit_ref', help='Gerrit ref to apply.')
+  parse.add_option('--patch_ref', dest='patch_refs', action='append', default=[],
+                   help='Git repository & ref to apply, as REPO@REF.')
   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',
@@ -1038,9 +941,6 @@ def parse_args():
                    help='Delete checkout first, always')
   parse.add_option('--output_json',
                    help='Output JSON information into a specified file')
-  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/*')
@@ -1057,10 +957,6 @@ 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()
 
@@ -1116,7 +1012,6 @@ def prepare(options, git_slns, active):
   # 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()
   total_disk_space_gb = int(total_disk_space / (1024 * 1024 * 1024))
   used_disk_space_gb = int((total_disk_space - free_disk_space)
@@ -1125,9 +1020,6 @@ def prepare(options, git_slns, active):
   step_text = '[%dGB/%dGB used (%d%%)]' % (used_disk_space_gb,
                                            total_disk_space_gb,
                                            percent_used)
-  shallow = (total_disk_space < SHALLOW_CLONE_THRESHOLD
-             and options.maybe_shallow)
-
   # The first solution is where the primary DEPS file resides.
   first_sln = dir_names[0]
 
@@ -1135,15 +1027,21 @@ 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, shallow
+  return revisions, step_text
 
 
-def checkout(options, git_slns, specs, revisions, step_text, shallow):
+def checkout(options, git_slns, specs, revisions, step_text):
   print 'Using Python version: %s' % (sys.version,)
   print 'Checking git version...'
   ver = git('version').strip()
   print 'Using %s' % ver
 
+  try:
+    protocol = git('config', '--get', 'protocol.version')
+    print 'Using git protocol version %s' % protocol
+  except SubprocessFailed as e:
+    print 'git protocol version is not specified.'
+
   first_sln = git_slns[0]['name']
   dir_names = [sln.get('name') for sln in git_slns if 'name' in sln]
   try:
@@ -1165,18 +1063,15 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
 
           # Then, pass in information about how to patch.
           patch_root=options.patch_root,
-          gerrit_repo=options.gerrit_repo,
-          gerrit_ref=options.gerrit_ref,
+          patch_refs=options.patch_refs,
           gerrit_rebase_patch_ref=not options.gerrit_no_rebase_patch_ref,
 
-          # Finally, extra configurations such as shallowness of the clone.
-          shallow=shallow,
+          # Finally, extra configurations cleanup dir location.
           refs=options.refs,
           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,
-          apply_patch_on_gclient=options.apply_patch_on_gclient)
+          disable_syntax_validation=options.disable_syntax_validation)
       gclient_output = ensure_checkout(**checkout_parameters)
     except GclientSyncFailed:
       print 'We failed gclient sync, lets delete the checkout and retry.'
@@ -1225,7 +1120,7 @@ def checkout(options, git_slns, specs, revisions, step_text, shallow):
             properties=got_revisions,
             manifest=create_manifest_old(),
             source_manifest=create_manifest(
-                gclient_output, options.patch_root, options.gerrit_ref))
+                gclient_output, options.patch_root))
 
 
 def print_debug_info():
@@ -1270,8 +1165,8 @@ def main():
 
   try:
     # Dun dun dun, the main part of bot_update.
-    revisions, step_text, shallow = prepare(options, git_slns, active)
-    checkout(options, git_slns, specs, revisions, step_text, shallow)
+    revisions, step_text = prepare(options, git_slns, active)
+    checkout(options, git_slns, specs, revisions, step_text)
 
   except PatchFailed as e:
     # Return a specific non-zero exit code for patch failure (because it is

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

@@ -8,15 +8,6 @@ from recipe_engine import recipe_test_api
 
 
 class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
-  def properties(self, apply_patch_on_gclient):
-    ret = self.test(None)
-    ret.properties = {
-        '$depot_tools/bot_update': {
-            'apply_patch_on_gclient': apply_patch_on_gclient,
-        }
-    }
-    return ret
-
   def output_json(self, root, first_sln, revision_mapping, fail_patch=False,
                   fixed_revisions=None):
     """Deterministically synthesize json.output test data for gclient's
@@ -45,11 +36,11 @@ class BotUpdateTestApi(recipe_test_api.RecipeTestApi):
     })
     output.update({
       'manifest': {
-				project_name: {
-					'repository': 'https://fake.org/%s.git' % project_name,
-					'revision': self.gen_revision(project_name),
-				}
-			for project_name in set(revision_mapping.values())}})
+          project_name: {
+              'repository': 'https://fake.org/%s.git' % project_name,
+              'revision': self.gen_revision(project_name),
+          }
+          for project_name in set(revision_mapping.values())}})
 
     output.update({
       'source_manifest': {