libv8 4.5.95.5 → 5.0.71.48.0beta2

data/vendor/depot_tools/cbuildbot

@@ -0,0 +1 @@
+support/chromite_wrapper

data/vendor/depot_tools/checkout.py

@@ -255,7 +255,8 @@ class SvnConfig(object):
       if sys.platform == 'win32':
         self.svn_config_dir = os.path.join(os.environ['APPDATA'], 'Subversion')
       else:
-        self.svn_config_dir = os.path.join(os.environ['HOME'], '.subversion')
+        self.svn_config_dir = os.path.expanduser(
+            os.path.join('~', '.subversion'))
     svn_config_file = os.path.join(self.svn_config_dir, 'config')
     parser = ConfigParser.SafeConfigParser()
     if os.path.isfile(svn_config_file):

data/vendor/depot_tools/chrome_set_ver

@@ -0,0 +1 @@
+support/chromite_wrapper

data/vendor/depot_tools/cit

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# 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.
+
+base_dir=$(dirname "$0")
+
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/cit.py" "$@"

data/vendor/depot_tools/cit.bat

@@ -0,0 +1,11 @@
+@echo off
+:: 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.
+setlocal
+
+:: This is required with cygwin only.
+PATH=%~dp0;%PATH%
+
+:: Defer control.
+%~dp0python "%~dp0\cit.py" %*

data/vendor/depot_tools/cit.py

@@ -0,0 +1,120 @@
+#!/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.
+
+
+"""Wrapper for updating and calling infra.git tools.
+
+This tool does a two things:
+* Maintains a infra.git checkout pinned at "deployed" in the home dir
+* Acts as an alias to infra.tools.*
+"""
+
+# TODO(hinoka): Use cipd/glyco instead of git/gclient.
+
+import argparse
+import sys
+import os
+import subprocess
+import re
+
+
+SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+GCLIENT = os.path.join(SCRIPT_DIR, 'gclient.py')
+TARGET_DIR = os.path.expanduser(os.path.join('~', '.chrome-infra'))
+INFRA_DIR = os.path.join(TARGET_DIR, 'infra')
+
+
+def get_git_rev(target, branch):
+  return subprocess.check_output(
+      ['git', 'log', '--format=%B', '-n1', branch], cwd=target)
+
+
+def need_to_update(branch):
+  """Checks to see if we need to update the ~/.chrome-infra/infra checkout."""
+  try:
+    cmd = [sys.executable, GCLIENT, 'revinfo']
+    subprocess.check_call(
+        cmd, cwd=os.path.join(TARGET_DIR), stdout=subprocess.PIPE)
+  except subprocess.CalledProcessError:
+    return True  # Gclient failed, definitely need to update.
+  except OSError:
+    return True  # Gclient failed, definitely need to update.
+
+  if not os.path.isdir(INFRA_DIR):
+    return True
+
+  local_rev = get_git_rev(INFRA_DIR, 'HEAD')
+
+  subprocess.check_call(
+      ['git', 'fetch', 'origin'], cwd=INFRA_DIR,
+      stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  origin_rev = get_git_rev(INFRA_DIR, 'origin/%s' % (branch,))
+  return origin_rev != local_rev
+
+
+def ensure_infra(branch):
+  """Ensures that infra.git is present in ~/.chrome-infra."""
+  print 'Fetching infra@%s into %s, may take a couple of minutes...' % (
+      branch, TARGET_DIR)
+  if not os.path.isdir(TARGET_DIR):
+    os.mkdir(TARGET_DIR)
+  if not os.path.exists(os.path.join(TARGET_DIR, '.gclient')):
+    subprocess.check_call(
+        [sys.executable, os.path.join(SCRIPT_DIR, 'fetch.py'), 'infra'],
+        cwd=TARGET_DIR,
+        stdout=subprocess.PIPE)
+  subprocess.check_call(
+      [sys.executable, GCLIENT, 'sync', '--revision', 'origin/%s' % (branch,)],
+      cwd=TARGET_DIR,
+      stdout=subprocess.PIPE)
+
+
+def get_available_tools():
+  tools = []
+  starting = os.path.join(TARGET_DIR, 'infra', 'infra', 'tools')
+  for root, _, files in os.walk(starting):
+    if '__main__.py' in files:
+      tools.append(root[len(starting)+1:].replace(os.path.sep, '.'))
+  return sorted(tools)
+
+
+def run(args):
+  if args:
+    tool_name = args[0]
+    cmd = [
+        sys.executable, os.path.join(TARGET_DIR, 'infra', 'run.py'),
+        'infra.tools.%s' % tool_name]
+    cmd.extend(args[1:])
+    return subprocess.call(cmd)
+
+  tools = get_available_tools()
+  print """usage: cit.py <name of tool> [args for tool]
+
+  Wrapper for maintaining and calling tools in "infra.git/run.py infra.tools.*"
+
+  Available tools are:
+  """
+  for tool in tools:
+    print '  * %s' % tool
+
+
+def main():
+  parser = argparse.ArgumentParser("Chrome Infrastructure CLI.")
+  parser.add_argument('-b', '--infra-branch', default='deployed',
+      help="The name of the 'infra' branch to use (default is %(default)s).")
+  parser.add_argument('args', nargs=argparse.REMAINDER)
+
+  args, extras = parser.parse_known_args()
+  if args.args and args.args[0] == '--':
+    args.args.pop(0)
+  if extras:
+    args.args = extras + args.args
+
+  if need_to_update(args.infra_branch):
+    ensure_infra(args.infra_branch)
+  return run(args.args)
+
+if __name__ == '__main__':
+  sys.exit(main())

data/vendor/depot_tools/codereview.settings

@@ -2,6 +2,4 @@
 CODE_REVIEW_SERVER: codereview.chromium.org
 CC_LIST: chromium-reviews@chromium.org
 VIEW_VC: http://src.chromium.org/viewvc/chrome?view=rev&revision=
-GITCL_PREUPLOAD: http://src.chromium.org/viewvc/chrome/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD
-GITCL_PREDCOMMIT: http://src.chromium.org/viewvc/chrome/trunk/tools/depot_tools/git-cl-upload-hook?revision=HEAD
 PROJECT: depot_tools

data/vendor/depot_tools/commit_queue

@@ -5,8 +5,4 @@
 
 base_dir=$(dirname "$0")
 
-if [[ "#grep#fetch#cleanup#diff#" != *"#$1#"* ]]; then
-  "$base_dir"/update_depot_tools "$@"
-fi
-
-PYTHONDONTWRITEBYTECODE=1 exec "$base_dir/ENV/bin/python" "$base_dir/commit_queue.py" "$@"
+PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/commit_queue.py" "$@"

data/vendor/depot_tools/commit_queue.bat

@@ -7,8 +7,5 @@ setlocal
 :: This is required with cygwin only.
 PATH=%~dp0;%PATH%
 
-:: Synchronize the root directory before deferring control back to gclient.py.
-call "%~dp0\update_depot_tools.bat" %*
-
 :: Defer control.
-%~dp0\ENV\bin\python "%~dp0\commit_queue.py" %*
+%~dp0python "%~dp0\commit_queue.py" %*

data/vendor/depot_tools/commit_queue.py

@@ -16,8 +16,6 @@ import os
 import sys
 import urllib2
 
-import breakpad  # pylint: disable=W0611
-
 import auth
 import fix_encoding
 import rietveld
@@ -26,7 +24,6 @@ THIRD_PARTY_DIR = os.path.join(os.path.dirname(__file__), 'third_party')
 sys.path.insert(0, THIRD_PARTY_DIR)
 
 from cq_client import cq_pb2
-from cq_client import validate_config
 from protobuf26 import text_format
 
 def usage(more):
@@ -77,11 +74,10 @@ def need_issue(fn):
   return hook
 
 
-def set_commit(obj, issue, flag):
-  """Sets the commit bit flag on an issue."""
+def _apply_on_issue(fun, obj, issue):
+  """Applies function 'fun' on an issue."""
   try:
-    patchset = obj.get_issue_properties(issue, False)['patchsets'][-1]
-    print obj.set_flag(issue, patchset, 'commit', flag)
+    return fun(obj.get_issue_properties(issue, False))
   except urllib2.HTTPError, e:
     if e.code == 404:
       print >> sys.stderr, 'Issue %d doesn\'t exist.' % issue
@@ -91,6 +87,44 @@ def set_commit(obj, issue, flag):
       raise
     return 1
 
+def get_commit(obj, issue):
+  """Gets the commit bit flag of an issue."""
+  def _get_commit(properties):
+    print int(properties['commit'])
+    return 0
+  _apply_on_issue(_get_commit, obj, issue)
+
+def set_commit(obj, issue, flag):
+  """Sets the commit bit flag on an issue."""
+  def _set_commit(properties):
+    print obj.set_flag(issue, properties['patchsets'][-1], 'commit', flag)
+    return 0
+  _apply_on_issue(_set_commit, obj, issue)
+
+
+def get_master_builder_map(
+      config_path, include_experimental=True, include_triggered=True):
+  """Returns a map of master -> [builders] from cq config."""
+  with open(config_path) as config_file:
+    cq_config = config_file.read()
+
+  config = cq_pb2.Config()
+  text_format.Merge(cq_config, config)
+  masters = {}
+  if config.HasField('verifiers') and config.verifiers.HasField('try_job'):
+    for bucket in config.verifiers.try_job.buckets:
+      masters.setdefault(bucket.name, [])
+      for builder in bucket.builders:
+        if (not include_experimental and
+            builder.HasField('experiment_percentage')):
+          continue
+        if (not include_triggered and
+            builder.HasField('triggered_by')):
+          continue
+        masters[bucket.name].append(builder.name)
+  return masters
+
+
 @need_issue
 def CMDset(parser, args):
   """Sets the commit bit."""
@@ -99,6 +133,13 @@ def CMDset(parser, args):
     parser.error('Unrecognized args: %s' % ' '.join(args))
   return set_commit(obj, options.issue, '1')
 
+@need_issue
+def CMDget(parser, args):
+  """Gets the commit bit."""
+  options, args, obj = parser.parse_args(args)
+  if args:
+    parser.error('Unrecognized args: %s' % ' '.join(args))
+  return get_commit(obj, options.issue)
 
 @need_issue
 def CMDclear(parser, args):
@@ -123,43 +164,51 @@ def CMDbuilders(parser, args):
       ]
     }
   """
-  _, args = parser.parse_args(args)
+  parser.add_option('--include-experimental', action='store_true')
+  parser.add_option('--exclude-experimental', action='store_false',
+                    dest='include_experimental')
+  parser.add_option('--include-triggered', action='store_true')
+  parser.add_option('--exclude-triggered', action='store_false',
+                    dest='include_triggered')
+  # The defaults have been chosen because of backward compatbility.
+  parser.set_defaults(include_experimental=True, include_triggered=True)
+  options, args = parser.parse_args(args)
   if len(args) != 1:
     parser.error('Expected a single path to CQ config. Got: %s' %
                  ' '.join(args))
-
-  with open(args[0]) as config_file:
-    cq_config = config_file.read()
-
-  config = cq_pb2.Config()
-  text_format.Merge(cq_config, config)
-  masters = {}
-  if config.HasField('verifiers') and config.verifiers.HasField('try_job'):
-    for bucket in config.verifiers.try_job.buckets:
-      masters.setdefault(bucket.name, [])
-      for builder in bucket.builders:
-        if not builder.HasField('experiment_percentage'):
-          masters[bucket.name].append(builder.name)
-  print json.dumps(masters)
+  print json.dumps(get_master_builder_map(
+      args[0],
+      include_experimental=options.include_experimental,
+      include_triggered=options.include_triggered))
 
 CMDbuilders.func_usage_more = '<path-to-cq-config>'
 
 
 def CMDvalidate(parser, args):
-  """Validates a CQ config.
+  """Validates a CQ config, returns 0 on valid config.
 
-  Takes a single argument - path to the CQ config to be validated. Returns 0 on
-  valid config, non-zero on invalid config. Errors and warnings are printed to
-  screen.
+  BUGS: this doesn't do semantic validation, only verifies validity of protobuf.
+    But don't worry - bad cq.cfg won't cause outages, luci-config service will
+    not accept them, will send warning email, and continue using previous
+    version.
   """
   _, args = parser.parse_args(args)
   if len(args) != 1:
     parser.error('Expected a single path to CQ config. Got: %s' %
                  ' '.join(args))
 
-  with open(args[0]) as config_file:
-    cq_config = config_file.read()
-  return 0 if validate_config.IsValid(cq_config) else 1
+  config = cq_pb2.Config()
+  try:
+    with open(args[0]) as config_file:
+      text_config = config_file.read()
+    text_format.Merge(text_config, config)
+    # TODO(tandrii): provide an option to actually validate semantics of CQ
+    # config.
+    return 0
+  except text_format.ParseError as e:
+    print 'failed to parse cq.cfg: %s' % e
+    return 1
+
 
 CMDvalidate.func_usage_more = '<path-to-cq-config>'
 

data/vendor/depot_tools/cpplint.py

@@ -1666,7 +1666,7 @@ def GetHeaderGuardCPPVariable(filename):
   filename = re.sub(r'/\.flymake/([^/]*)$', r'/\1', filename)
   # Replace 'c++' with 'cpp'.
   filename = filename.replace('C++', 'cpp').replace('c++', 'cpp')
-  
+
   fileinfo = FileInfo(filename)
   file_path_from_root = fileinfo.RepositoryName()
   if _root:
@@ -4794,7 +4794,7 @@ def CheckLanguage(filename, clean_lines, linenum, file_extension,
 
   # Make Windows paths like Unix.
   fullname = os.path.abspath(filename).replace('\\', '/')
-  
+
   # Perform other checks now that we are sure that this is not an include line
   CheckCasts(filename, clean_lines, linenum, error)
   CheckGlobalStatic(filename, clean_lines, linenum, error)
@@ -5498,18 +5498,26 @@ _HEADERS_CONTAINING_TEMPLATES = (
     ('<slist>', ('slist',)),
     )
 
-_RE_PATTERN_STRING = re.compile(r'\bstring\b')
+_HEADERS_MAYBE_TEMPLATES = (
+    ('<algorithm>', ('copy', 'max', 'min', 'min_element', 'sort',
+                     'transform',
+                    )),
+    ('<utility>', ('swap',)),
+    )
 
-_re_pattern_algorithm_header = []
-for _template in ('copy', 'max', 'min', 'min_element', 'sort', 'swap',
-                  'transform'):
-  # Match max<type>(..., ...), max(..., ...), but not foo->max, foo.max or
-  # type::max().
-  _re_pattern_algorithm_header.append(
-      (re.compile(r'[^>.]\b' + _template + r'(<.*?>)?\([^\)]'),
-       _template,
-       '<algorithm>'))
+_RE_PATTERN_STRING = re.compile(r'\bstring\b')
 
+_re_pattern_headers_maybe_templates = []
+for _header, _templates in _HEADERS_MAYBE_TEMPLATES:
+  for _template in _templates:
+    # Match max<type>(..., ...), max(..., ...), but not foo->max, foo.max or
+    # type::max().
+    _re_pattern_headers_maybe_templates.append(
+        (re.compile(r'[^>.]\b' + _template + r'(<.*?>)?\([^\)]'),
+            _template,
+            _header))
+
+# Other scripts may reach in and modify this pattern.
 _re_pattern_templates = []
 for _header, _templates in _HEADERS_CONTAINING_TEMPLATES:
   for _template in _templates:
@@ -5636,7 +5644,7 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
       if prefix.endswith('std::') or not prefix.endswith('::'):
         required['<string>'] = (linenum, 'string')
 
-    for pattern, template, header in _re_pattern_algorithm_header:
+    for pattern, template, header in _re_pattern_headers_maybe_templates:
       if pattern.search(line):
         required[header] = (linenum, template)
 
@@ -6034,7 +6042,7 @@ def ProcessFileData(filename, file_extension, lines, error,
   nesting_state.CheckCompletedBlocks(filename, error)
 
   CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error)
-  
+
   # Check that the .cc file has included its header if it exists.
   if file_extension == 'cc':
     CheckHeaderFileIncluded(filename, include_state, error)

data/vendor/depot_tools/cros

@@ -0,0 +1 @@
+support/chromite_wrapper

data/vendor/depot_tools/cros_sdk

@@ -0,0 +1 @@
+support/chromite_wrapper

data/vendor/depot_tools/depot-tools-auth.py

@@ -14,10 +14,10 @@ Usage:
 import logging
 import optparse
 import sys
-
-from third_party import colorama
+import os
 
 import auth
+import setup_color
 import subcommand
 
 __version__ = '1.0'
@@ -94,7 +94,7 @@ def main(argv):
 
 
 if __name__ == '__main__':
-  colorama.init()
+  setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt: