libv8 4.5.95.5 → 5.0.71.48.0beta2

data/vendor/depot_tools/git_map_branches.py

@@ -27,16 +27,18 @@ Branches are colorized as follows:
 
 import argparse
 import collections
-import sys
+import os
 import subprocess2
-
-from third_party import colorama
-from third_party.colorama import Fore, Style
+import sys
 
 from git_common import current_branch, upstream, tags, get_branches_info
 from git_common import get_git_version, MIN_UPSTREAM_TRACK_GIT_VERSION, hash_one
 from git_common import run
 
+import setup_color
+
+from third_party.colorama import Fore, Style
+
 DEFAULT_SEPARATOR = ' ' * 4
 
 
@@ -174,7 +176,7 @@ class BranchMapper(object):
     return not parent or parent in self.__gone_branches
 
   def __color_for_branch(self, branch, branch_hash):
-    if branch.startswith('origin'):
+    if branch.startswith('origin/'):
       color = Fore.RED
     elif branch.startswith('branch-heads'):
       color = Fore.BLUE
@@ -271,7 +273,7 @@ class BranchMapper(object):
 
 
 def main(argv):
-  colorama.init()
+  setup_color.init()
   if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
     print >> sys.stderr, (
         'This tool will not show all tracking information for git version '

data/vendor/depot_tools/git_new_branch.py

@@ -3,6 +3,10 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+"""
+Create new branch tracking origin/master by default.
+"""
+
 import argparse
 import sys
 
@@ -14,7 +18,8 @@ from git_common import hash_one
 
 def main(args):
   parser = argparse.ArgumentParser(
-    formatter_class=argparse.ArgumentDefaultsHelpFormatter
+    formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+    description=__doc__,
   )
   parser.add_argument('branch_name')
   g = parser.add_mutually_exclusive_group()

data/vendor/depot_tools/git_rebase_update.py

@@ -49,9 +49,8 @@ def fetch_remotes(branch_tree):
   remotes = set()
   tag_set = git.tags()
   fetchspec_map = {}
-  all_fetchspec_configs = git.run(
-      'config', '--get-regexp', r'^remote\..*\.fetch').strip()
-  for fetchspec_config in all_fetchspec_configs.splitlines():
+  all_fetchspec_configs = git.config_regexp(r'^remote\..*\.fetch')
+  for fetchspec_config in all_fetchspec_configs:
     key, _, fetchspec = fetchspec_config.partition(' ')
     dest_spec = fetchspec.partition(':')[2]
     remote_name = key.split('.')[1]
@@ -87,32 +86,54 @@ def remove_empty_branches(branch_tree):
   tag_set = git.tags()
   ensure_root_checkout = git.once(lambda: git.run('checkout', git.root()))
 
-  deletions = set()
+  deletions = {}
+  reparents = {}
   downstreams = collections.defaultdict(list)
   for branch, parent in git.topo_iter(branch_tree, top_down=False):
     downstreams[parent].append(branch)
 
-    if git.hash_one(branch) == git.hash_one(parent):
+    # If branch and parent have the same tree, then branch has to be marked
+    # for deletion and its children and grand-children reparented to parent.
+    if git.hash_one(branch+":") == git.hash_one(parent+":"):
       ensure_root_checkout()
 
       logging.debug('branch %s merged to %s', branch, parent)
 
+      # Mark branch for deletion while remembering the ordering, then add all
+      # its children as grand-children of its parent and record reparenting
+      # information if necessary.
+      deletions[branch] = len(deletions)
+
       for down in downstreams[branch]:
         if down in deletions:
           continue
 
-        if parent in tag_set:
-          git.set_branch_config(down, 'remote', '.')
-          git.set_branch_config(down, 'merge', 'refs/tags/%s' % parent)
-          print ('Reparented %s to track %s [tag] (was tracking %s)'
-                 % (down, parent, branch))
+        # Record the new and old parent for down, or update such a record
+        # if it already exists. Keep track of the ordering so that reparenting
+        # happen in topological order.
+        downstreams[parent].append(down)
+        if down not in reparents:
+          reparents[down] = (len(reparents), parent, branch)
         else:
-          git.run('branch', '--set-upstream-to', parent, down)
-          print ('Reparented %s to track %s (was tracking %s)'
-                 % (down, parent, branch))
+          order, _, old_parent = reparents[down]
+          reparents[down] = (order, parent, old_parent)
+
+  # Apply all reparenting recorded, in order.
+  for branch, value in sorted(reparents.iteritems(), key=lambda x:x[1][0]):
+    _, parent, old_parent = value
+    if parent in tag_set:
+      git.set_branch_config(branch, 'remote', '.')
+      git.set_branch_config(branch, 'merge', 'refs/tags/%s' % parent)
+      print ('Reparented %s to track %s [tag] (was tracking %s)'
+             % (branch, parent, old_parent))
+    else:
+      git.run('branch', '--set-upstream-to', parent, branch)
+      print ('Reparented %s to track %s (was tracking %s)'
+             % (branch, parent, old_parent))
 
-      deletions.add(branch)
-      print git.run('branch', '-d', branch)
+  # Apply all deletions recorded, in order.
+  for branch, _ in sorted(deletions.iteritems(), key=lambda x: x[1]):
+    print git.run('branch', '-d', branch)
 
 
 def rebase_branch(branch, parent, start_hash):
@@ -196,6 +217,8 @@ def rebase_branch(branch, parent, start_hash):
 def main(args=None):
   parser = argparse.ArgumentParser()
   parser.add_argument('--verbose', '-v', action='store_true')
+  parser.add_argument('--keep-going', '-k', action='store_true',
+                      help='Keep processing past failed rebases.')
   parser.add_argument('--no_fetch', '--no-fetch', '-n',
                       action='store_true',
                       help='Skip fetching remotes.')
@@ -245,6 +268,7 @@ def main(args=None):
   logging.debug('merge_base: %s' % pformat(merge_base))
 
   retcode = 0
+  unrebased_branches = []
   # Rebase each branch starting with the root-most branches and working
   # towards the leaves.
   for branch, parent in git.topo_iter(branch_tree):
@@ -254,7 +278,23 @@ def main(args=None):
       ret = rebase_branch(branch, parent, merge_base[branch])
       if not ret:
         retcode = 1
-        break
+
+        if opts.keep_going:
+          print '--keep-going set, continuing with next branch.'
+          unrebased_branches.append(branch)
+          if git.in_rebase():
+            git.run_with_retcode('rebase', '--abort')
+          if git.in_rebase():  # pragma: no cover
+            print 'Failed to abort rebase. Something is really wrong.'
+            break
+        else:
+          break
+
+  if unrebased_branches:
+    print
+    print 'The following branches could not be cleanly rebased:'
+    for branch in unrebased_branches:
+      print '  %s' % branch
 
   if not retcode:
     remove_empty_branches(branch_tree)

data/vendor/depot_tools/git_reparent_branch.py

@@ -31,11 +31,14 @@ def main(args):
   # TODO(iannucci): Allow specification of the branch-to-reparent
 
   branch = current_branch()
+
   if opts.root:
     new_parent = root_ref
   elif opts.lkgr:
     new_parent = 'lkgr'
   else:
+    if not opts.new_parent:
+      parser.error('Must specify new parent somehow')
     new_parent = opts.new_parent
   cur_parent = upstream(branch)
 
@@ -44,6 +47,16 @@ def main(args):
   if new_parent == cur_parent:
     parser.error('Cannot reparent a branch to its existing parent')
 
+  if not cur_parent:
+    msg = (
+      "Unable to determine %s@{upstream}.\n\nThis can happen if you didn't use "
+      "`git new-branch` to create the branch and haven't used "
+      "`git branch --set-upstream-to` to assign it one.\n\nPlease assign an "
+      "upstream branch and then run this command again."
+    )
+    print >> sys.stderr, msg % branch
+    return 1
+
   mbase = get_or_create_merge_base(branch, cur_parent)
 
   all_tags = tags()

data/vendor/depot_tools/git_try.py

@@ -7,8 +7,6 @@
 import logging
 import sys
 
-import breakpad  # pylint: disable=W0611
-
 from scm import GIT
 import subprocess2
 import third_party.upload

data/vendor/depot_tools/gsutil.py

@@ -8,12 +8,15 @@
 
 import argparse
 import base64
+import contextlib
 import hashlib
 import json
 import os
 import shutil
 import subprocess
 import sys
+import tempfile
+import time
 import urllib2
 import zipfile
 
@@ -26,7 +29,6 @@ DEFAULT_BIN_DIR = os.path.join(THIS_DIR, 'external_bin', 'gsutil')
 DEFAULT_FALLBACK_GSUTIL = os.path.join(
     THIS_DIR, 'third_party', 'gsutil', 'gsutil')
 
-
 class InvalidGsutilError(Exception):
   pass
 
@@ -73,44 +75,72 @@ def check_gsutil(gsutil_bin):
       [sys.executable, gsutil_bin, 'version'],
       stdout=subprocess.PIPE, stderr=subprocess.STDOUT) == 0
 
-def ensure_gsutil(version, target):
+@contextlib.contextmanager
+def temporary_directory(base):
+  tmpdir = tempfile.mkdtemp(prefix='gsutil_py', dir=base)
+  try:
+    yield tmpdir
+  finally:
+    if os.path.isdir(tmpdir):
+      shutil.rmtree(tmpdir)
+
+def ensure_gsutil(version, target, clean):
   bin_dir = os.path.join(target, 'gsutil_%s' % version)
   gsutil_bin = os.path.join(bin_dir, 'gsutil', 'gsutil')
-  if os.path.isfile(gsutil_bin) and check_gsutil(gsutil_bin):
+  if not clean and os.path.isfile(gsutil_bin) and check_gsutil(gsutil_bin):
     # Everything is awesome! we're all done here.
     return gsutil_bin
 
-  if os.path.isdir(bin_dir):
+  if not os.path.exists(target):
+    os.makedirs(target)
+  with temporary_directory(target) as instance_dir:
     # Clean up if we're redownloading a corrupted gsutil.
-    shutil.rmtree(bin_dir)
-  cache_dir = os.path.join(target, '.cache_dir')
-  if not os.path.isdir(cache_dir):
-    os.makedirs(cache_dir)
-  target_zip_filename = download_gsutil(version, cache_dir)
-  with zipfile.ZipFile(target_zip_filename, 'r') as target_zip:
-    target_zip.extractall(bin_dir)
+    cleanup_path = os.path.join(instance_dir, 'clean')
+    try:
+      os.rename(bin_dir, cleanup_path)
+    except (OSError, IOError):
+      cleanup_path = None
+    if cleanup_path:
+      shutil.rmtree(cleanup_path)
+
+    download_dir = os.path.join(instance_dir, 'download')
+    target_zip_filename = download_gsutil(version, instance_dir)
+    with zipfile.ZipFile(target_zip_filename, 'r') as target_zip:
+      target_zip.extractall(download_dir)
+
+    try:
+      os.rename(download_dir, bin_dir)
+    except (OSError, IOError):
+      # Something else did this in parallel.
+      pass
 
   # Final check that the gsutil bin is okay.  This should never fail.
   if not check_gsutil(gsutil_bin):
     raise InvalidGsutilError()
-
   return gsutil_bin
 
 
-def run_gsutil(force_version, fallback, target, args):
+def run_gsutil(force_version, fallback, target, args, clean=False):
   if force_version:
-    gsutil_bin = ensure_gsutil(force_version, target)
+    gsutil_bin = ensure_gsutil(force_version, target, clean)
   else:
     gsutil_bin = fallback
-  cmd = [sys.executable, gsutil_bin] + args
+  disable_update = ['-o', 'GSUtil:software_update_check_period=0']
+  cmd = [sys.executable, gsutil_bin] + disable_update + args
   return subprocess.call(cmd)
 
 
 def parse_args():
+  bin_dir = os.environ.get('DEPOT_TOOLS_GSUTIL_BIN_DIR', DEFAULT_BIN_DIR)
+
   parser = argparse.ArgumentParser()
-  parser.add_argument('--force-version')
+  parser.add_argument('--force-version', default='4.13')
+  parser.add_argument('--clean', action='store_true',
+      help='Clear any existing gsutil package, forcing a new download.')
   parser.add_argument('--fallback', default=DEFAULT_FALLBACK_GSUTIL)
-  parser.add_argument('--target', default=DEFAULT_BIN_DIR)
+  parser.add_argument('--target', default=bin_dir,
+      help='The target directory to download/store a gsutil version in. '
+           '(default is %(default)s).')
   parser.add_argument('args', nargs=argparse.REMAINDER)
 
   args, extras = parser.parse_known_args()
@@ -118,12 +148,13 @@ def parse_args():
     args.args.pop(0)
   if extras:
     args.args = extras + args.args
-  return args.force_version, args.fallback, args.target, args.args
+  return args
 
 
 def main():
-  force_version, fallback, target, args = parse_args()
-  return run_gsutil(force_version, fallback, target, args)
+  args = parse_args()
+  return run_gsutil(args.force_version, args.fallback, args.target, args.args,
+                    clean=args.clean)
 
 if __name__ == '__main__':
   sys.exit(main())

data/vendor/depot_tools/infra/config/OWNERS

@@ -1,5 +1,7 @@
 set noparent
-akuegel@chromium.org
+iannucci@chromium.org
 phajdan.jr@chromium.org
 sergiyb@chromium.org
 tandrii@chromium.org
+
+per-file recipes.cfg=martiniss@chromium.org

data/vendor/depot_tools/infra/config/cq.cfg

@@ -24,14 +24,18 @@ rietveld {
 
 verifiers {
   reviewer_lgtm {
-    committer_list: "chromium"
+    committer_list: "project-infra-committers"
   }
 
   try_job {
     buckets {
-      name: "tryserver.chromium.linux"
+      name: "tryserver.infra"
       builders {
-        name: "depot_tools_presubmit"
+        name: "Depot Tools Presubmit"
+      }
+      builders {
+        name: "Recipe Roll Downstream Tester"
+        experiment_percentage: 100
       }
     }
   }

data/vendor/depot_tools/infra/config/recipes.cfg

@@ -0,0 +1,9 @@
+api_version: 1
+project_id: "depot_tools"
+recipes_path: ""
+deps {
+  project_id: "recipe_engine"
+  url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
+  branch: "master"
+  revision: "764aae62ed63f929771542b1dc01cc518f61bb36"
+}

data/vendor/depot_tools/luci_hacks/README.md

@@ -0,0 +1,35 @@
+LUCI Hacks - A set of shims used to provide an iterable end-to-end demo.
+
+The main goal of Luci Hakcs is to be able to use iterate on Milo as if it was
+displaying real data.  These are a couple of hacks used to get LUCI running from
+"git cl try --luci" to displaying a page on Milo.  These include:
+
+luci_recipe_run.py:
+* Downloading a depot_tools tarball onto swarming from Google Storage to bootstrap gclient.
+** LUCI shouldn't require depot_tools or gclient.
+* Running gclient on a swarming slave to bootstrap a full build+infra checkout.
+** M1: This should check out the recipes repo instead.
+** M2: The recipes repo should have been already isolated.
+* Seeding properties by emitting annotation in stdout so that Milo can pick it
+  up
+* Running annotated_run.py from a fake build directory "build/slave/bot/build"
+
+trigger_luci_job.py:
+* Master/Builder -> Recipe + Platform mapping is hardcoded into this file.  This
+  is information that is otherwise encoded into master.cfg/slaves.cfg.
+** Actually I lied, we just assume linux right now.
+** M1: This information should be encoded into the recipe via luci.cfg
+* Swarming client is checked out via "git clone <swarming repo>"
+* Swarming server is hard coded into the file.  This info should also be pulled
+  out from luci.cfg
+* Triggering is done directly to swarming.  Once Swarming is able to pull from
+  DM we can send jobs to DM instead of swarming.
+
+
+Misc:
+* This just runs the full recipe on the bot.  Yes, including bot_update.
+** In the future this would be probably an isolated checkout?
+** This also includes having git_cache either set up a local cache, or download
+   the bootstrap zip file on every invocation.  In reality there isn't a huge
+   time penalty for doing this, but at scale it does incur a non-trival amount of
+   unnecessary bandwidth.

data/vendor/depot_tools/luci_hacks/luci_recipe_run.isolate

@@ -0,0 +1,12 @@
+{
+  'variables': {
+    'files': [
+      'luci_recipe_run.py',
+    ],
+    'command': [
+      'python',
+      'luci_recipe_run.py',
+    ],
+  },
+}
+

data/vendor/depot_tools/luci_hacks/luci_recipe_run.py

@@ -0,0 +1,81 @@
+#!/usr/bin/env python
+# Copyright (c) 2015 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.
+
+
+"""Download recipe prerequisites and run a single recipe."""
+
+
+import base64
+import json
+import os
+import subprocess
+import sys
+import tarfile
+import urllib2
+import zlib
+
+
+def download(source, dest):
+  u = urllib2.urlopen(source)  # TODO: Verify certificate?
+  with open(dest, 'wb') as f:
+    while True:
+      buf = u.read(8192)
+      if not buf:
+        break
+      f.write(buf)
+
+
+def unzip(source, dest):
+  with tarfile.open(source, 'r') as z:
+    z.extractall(dest)
+
+
+def get_infra(dt_dir, root_dir):
+  fetch = os.path.join(dt_dir, 'fetch.py')
+  subprocess.check_call([sys.executable, fetch, 'infra'], cwd=root_dir)
+
+
+def seed_properties(args):
+  # Assumes args[0] is factory properties and args[1] is build properties.
+  fact_prop_str = args[0][len('--factory-properties-gz='):]
+  build_prop_str = args[1][len('--build-properties-gz='):]
+  fact_prop = json.loads(zlib.decompress(base64.b64decode(fact_prop_str)))
+  build_prop = json.loads(zlib.decompress(base64.b64decode(build_prop_str)))
+  for k, v in fact_prop.iteritems():
+    print '@@@SET_BUILD_PROPERTY@%s@%s@@@' % (k, v)
+  for k, v in build_prop.iteritems():
+    print '@@@SET_BUILD_PROPERTY@%s@%s@@@' % (k, v)
+
+
+def main(args):
+  cwd = os.getcwd()
+
+  # Bootstrap depot tools (required for fetching build/infra)
+  dt_url = 'https://storage.googleapis.com/dumbtest/depot_tools.tar.gz'
+  dt_dir = os.path.join(cwd, 'staging')
+  os.makedirs(dt_dir)
+  dt_zip = os.path.join(dt_dir, 'depot_tools.tar.gz')
+  download(dt_url, os.path.join(dt_zip))
+  unzip(dt_zip, dt_dir)
+  dt_path = os.path.join(dt_dir, 'depot_tools')
+  os.environ['PATH'] = '%s:%s' % (dt_path, os.environ['PATH'])
+
+  # Fetch infra (which comes with build, which comes with recipes)
+  root_dir = os.path.join(cwd, 'b')
+  os.makedirs(root_dir)
+  get_infra(dt_path, root_dir)
+  work_dir = os.path.join(root_dir, 'build', 'slave', 'bot', 'build')
+  os.makedirs(work_dir)
+
+  # Emit annotations that encapsulates build properties.
+  seed_properties(args)
+
+  # JUST DO IT.
+  cmd = [sys.executable, '-u', '../../../scripts/slave/annotated_run.py']
+  cmd.extend(args)
+  subprocess.check_call(cmd, cwd=work_dir)
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))