libv8 5.0.71.48.3 → 5.1.281.59.0beta3

data/vendor/depot_tools/git_footers.py

@@ -4,6 +4,7 @@
 # found in the LICENSE file.
 
 import argparse
+import json
 import re
 import sys
 
@@ -22,6 +23,7 @@ def normalize_name(header):
 
 
 def parse_footer(line):
+  """Returns footer's (key, value) if footer is valid, else None."""
   match = FOOTER_PATTERN.match(line)
   if match:
     return (match.group(1), match.group(2))
@@ -31,21 +33,39 @@ def parse_footer(line):
 
 def parse_footers(message):
   """Parses a git commit message into a multimap of footers."""
+  _, _, parsed_footers = split_footers(message)
+  footer_map = defaultdict(list)
+  if parsed_footers:
+    # Read footers from bottom to top, because latter takes precedense,
+    # and we want it to be first in the multimap value.
+    for (k, v) in reversed(parsed_footers):
+      footer_map[normalize_name(k)].append(v.strip())
+  return footer_map
+
+
+def split_footers(message):
+  """Returns (non_footer_lines, footer_lines, parsed footers).
+
+  Guarantees that:
+    (non_footer_lines + footer_lines) == message.splitlines().
+    parsed_footers is parse_footer applied on each line of footer_lines.
+  """
+  message_lines = list(message.splitlines())
   footer_lines = []
-  for line in reversed(message.splitlines()):
+  for line in reversed(message_lines):
     if line == '' or line.isspace():
       break
     footer_lines.append(line)
+  else:
+    # The whole description was consisting of footers,
+    # which means those aren't footers.
+    footer_lines = []
 
+  footer_lines.reverse()
   footers = map(parse_footer, footer_lines)
-  if not all(footers):
-    return defaultdict(list)
-
-  footer_map = defaultdict(list)
-  for (k, v) in footers:
-    footer_map[normalize_name(k)].append(v.strip())
-
-  return footer_map
+  if not footer_lines or not all(footers):
+    return message_lines, [], []
+  return message_lines[:-len(footer_lines)], footer_lines, footers
 
 
 def get_footer_svn_id(branch=None):
@@ -70,38 +90,46 @@ def get_footer_change_id(message):
 def add_footer_change_id(message, change_id):
   """Returns message with Change-ID footer in it.
 
-  Assumes that Change-Id is not yet in footers, which is then
-  inserted after any of these footers: Bug|Issue|Test|Feature.
+  Assumes that Change-Id is not yet in footers, which is then inserted at
+  earliest footer line which is after all of these footers:
+    Bug|Issue|Test|Feature.
   """
-  assert 0 == len(get_footer_change_id(message))
-  change_id_line = 'Change-Id: %s' % change_id
-  # This code does the same as parse_footers, but keeps track of line
-  # numbers so that ChangeId is inserted in the right place.
-  lines = message.splitlines()
-  footer_lines = []
-  for line in reversed(lines):
-    if line == '' or line.isspace():
-      break
-    footer_lines.append(line)
-  else:
-    # The whole description was consisting of footers,
-    # which means those aren't footers.
-    footer_lines = []
-  # footers order is from end to start of the message.
-  footers = map(parse_footer, footer_lines)
-  if not footers or not all(footers):
-    lines.append('')
-    lines.append(change_id_line)
+  assert 'Change-Id' not in parse_footers(message)
+  return add_footer(message, 'Change-Id', change_id,
+                    after_keys=['Bug', 'Issue', 'Test', 'Feature'])
+
+def add_footer(message, key, value, after_keys=None):
+  """Returns a message with given footer appended.
+
+  If after_keys is None (default), appends footer last.
+  Otherwise, after_keys must be iterable of footer keys, then the new footer
+  would be inserted at the topmost position such there would be no footer lines
+  after it with key matching one of after_keys.
+  For example, given
+      message='Header.\n\nAdded: 2016\nBug: 123\nVerified-By: CQ'
+      after_keys=['Bug', 'Issue']
+  the new footer will be inserted between Bug and Verified-By existing footers.
+  """
+  assert key == normalize_name(key), 'Use normalized key'
+  new_footer = '%s: %s' % (key, value)
+
+  top_lines, footer_lines, parsed_footers = split_footers(message)
+  if not footer_lines:
+    if not top_lines or top_lines[-1] != '':
+      top_lines.append('')
+    footer_lines = [new_footer]
+  elif not after_keys:
+    footer_lines.append(new_footer)
   else:
-    after = set(map(normalize_name, ['Bug', 'Issue', 'Test', 'Feature']))
-    for i, (key, _) in enumerate(footers):
-      if normalize_name(key) in after:
-        insert_at = len(lines) - i
+    after_keys = set(map(normalize_name, after_keys))
+    # Iterate from last to first footer till we find the footer keys above.
+    for i, (key, _) in reversed(list(enumerate(parsed_footers))):
+      if normalize_name(key) in after_keys:
+        footer_lines.insert(i + 1, new_footer)
         break
     else:
-      insert_at = len(lines) - len(footers)
-    lines.insert(insert_at, change_id_line)
-  return '\n'.join(lines)
+      footer_lines.insert(0, new_footer)
+  return '\n'.join(top_lines + footer_lines)
 
 
 def get_unique(footers, key):
@@ -163,7 +191,8 @@ def main(args):
   parser = argparse.ArgumentParser(
     formatter_class=argparse.ArgumentDefaultsHelpFormatter
   )
-  parser.add_argument('ref')
+  parser.add_argument('ref', nargs='?', help="Git ref to retrieve footers from."
+                      " Omit to parse stdin.")
 
   g = parser.add_mutually_exclusive_group()
   g.add_argument('--key', metavar='KEY',
@@ -172,11 +201,16 @@ def main(args):
   g.add_argument('--position', action='store_true')
   g.add_argument('--position-ref', action='store_true')
   g.add_argument('--position-num', action='store_true')
+  g.add_argument('--json', help="filename to dump JSON serialized headers to.")
 
 
   opts = parser.parse_args(args)
 
-  message = git.run('log', '-1', '--format=%B', opts.ref)
+  if opts.ref:
+    message = git.run('log', '-1', '--format=%B', opts.ref)
+  else:
+    message = '\n'.join(l for l in sys.stdin)
+
   footers = parse_footers(message)
 
   if opts.key:
@@ -191,6 +225,9 @@ def main(args):
     pos = get_position(footers)
     assert pos[1], 'No valid position for commit'
     print pos[1]
+  elif opts.json:
+    with open(opts.json, 'w') as f:
+      json.dump(footers, f)
   else:
     for k in footers.keys():
       for v in footers[k]:

data/vendor/depot_tools/git_map_branches.py

@@ -128,17 +128,19 @@ class BranchMapper(object):
         include_tracking_status=self.verbosity >= 1)
     if (self.verbosity >= 2):
       # Avoid heavy import unless necessary.
-      from git_cl import get_cl_statuses, color_for_status
+      from git_cl import get_cl_statuses, color_for_status, Changelist
 
-      status_info = get_cl_statuses(self.__branches_info.keys(),
+      change_cls = [Changelist(branchref='refs/heads/'+b)
+                    for b in self.__branches_info.keys() if b]
+      status_info = get_cl_statuses(change_cls,
                                     fine_grained=self.verbosity > 2,
                                     max_processes=self.maxjobs)
 
-      for _ in xrange(len(self.__branches_info)):
-        # This is a blocking get which waits for the remote CL status to be
-        # retrieved.
-        (branch, url, status) = status_info.next()
-        self.__status_info[branch] = (url, color_for_status(status))
+      # This is a blocking get which waits for the remote CL status to be
+      # retrieved.
+      for cl, status in status_info:
+        self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(),
+                                              color_for_status(status))
 
     roots = set()
 
@@ -258,9 +260,9 @@ class BranchMapper(object):
 
     # The Rietveld issue associated with the branch.
     if self.verbosity >= 2:
-      none_text = '' if self.__is_invalid_parent(branch) else 'None'
-      (url, color) = self.__status_info[branch]
-      line.append(url or none_text, color=color)
+      (url, color) = ('', '') if self.__is_invalid_parent(branch) \
+                              else self.__status_info[branch]
+      line.append(url or '', color=color)
 
     # The subject of the most recent commit on the branch.
     if self.show_subject:

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

@@ -4,20 +4,9 @@
 version: 1
 cq_name: "depot_tools"
 cq_status_url: "https://chromium-cq-status.appspot.com"
-svn_repo_url: "svn://svn.chromium.org/chrome/trunk/tools/depot_tools"
 
 rietveld {
   url: "https://codereview.chromium.org"
-  project_bases: "^svn\\:\\/\\/svn\\.chromium\\.org\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^svn\\:\\/\\/chrome\\-svn\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^svn\\:\\/\\/chrome\\-svn\\.corp\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^svn\\:\\/\\/chrome\\-svn\\.corp\\.google\\.com\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^http\\:\\/\\/src\\.chromium\\.org\\/svn/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^https\\:\\/\\/src\\.chromium\\.org\\/svn/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^http\\:\\/\\/src\\.chromium\\.org\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^https\\:\\/\\/src\\.chromium\\.org\\/chrome/trunk/tools/depot_tools(|/.*)$"
-  project_bases: "^https?\\:\\/\\/git\\.chromium\\.org\\/git\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
-  project_bases: "^https?\\:\\/\\/git\\.chromium\\.org\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
   project_bases: "^https?\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
   project_bases: "^https?\\:\\/\\/chromium\\.googlesource\\.com\\/a\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
 }

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

@@ -5,5 +5,5 @@ deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "764aae62ed63f929771542b1dc01cc518f61bb36"
+  revision: "da26a351b7034d37e55acd468fa90c8ee3a1ada0"
 }

data/vendor/depot_tools/presubmit_canned_checks.py

@@ -211,6 +211,26 @@ def CheckChangeHasNoCrAndHasOnlyOneEol(input_api, output_api,
       items=eof_files))
   return outputs
 
+def CheckGenderNeutral(input_api, output_api, source_file_filter=None):
+  """Checks that there are no gendered pronouns in any of the text files to be
+  submitted.
+  """
+  gendered_re = input_api.re.compile(
+      '(^|\s|\(|\[)([Hh]e|[Hh]is|[Hh]ers?|[Hh]im|[Ss]he|[Gg]uys?)\\b')
+
+  errors = []
+  for f in input_api.AffectedFiles(include_deletes=False,
+                                   file_filter=source_file_filter):
+    for line_num, line in f.ChangedContents():
+      if gendered_re.search(line):
+        errors.append('%s (%d): %s' % (f.LocalPath(), line_num, line))
+
+  if len(errors):
+    return [output_api.PresubmitPromptWarning('Found a gendered pronoun in:',
+                                              long_text='\n'.join(errors))]
+  return []
+
+
 
 def _ReportErrorFileAndLine(filename, line_num, dummy_line):
   """Default error formatter for _FindNewViolationsOfRule."""
@@ -875,7 +895,7 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
       input_api.change.AffectedFiles(file_filter=source_file_filter)])
 
   owners_db = input_api.owners_db
-  owner_email, reviewers = _CodereviewOwnersAndReviewers(
+  owner_email, reviewers = GetCodereviewOwnerAndReviewers(
       input_api,
       owners_db.email_regexp,
       approval_needed=input_api.is_committing)
@@ -904,25 +924,17 @@ def CheckOwners(input_api, output_api, source_file_filter=None):
     return [output('Missing LGTM from someone other than %s' % owner_email)]
   return []
 
-def _CodereviewOwnersAndReviewers(input_api, email_regexp, approval_needed):
+def GetCodereviewOwnerAndReviewers(input_api, email_regexp, approval_needed):
   """Return the owner and reviewers of a change, if any.
 
   If approval_needed is True, only reviewers who have approved the change
   will be returned.
   """
-  if input_api.change.issue:
-    if input_api.gerrit:
-      res = _GerritOwnerAndReviewers(input_api, email_regexp, approval_needed)
-    else:
-      # Rietveld is default.
-      res = _RietveldOwnerAndReviewers(input_api, email_regexp, approval_needed)
-    if res:
-      return res
-
-  reviewers = set()
-  if not approval_needed:
-    reviewers = _ReviewersFromChange(input_api.change)
-  return None, reviewers
+  # Rietveld is default.
+  func = _RietveldOwnerAndReviewers
+  if input_api.gerrit:
+    func = _GerritOwnerAndReviewers
+  return func(input_api, email_regexp, approval_needed)
 
 
 def _GetRietveldIssueProps(input_api, messages):
@@ -953,11 +965,11 @@ def _RietveldOwnerAndReviewers(input_api, email_regexp, approval_needed=False):
 
   If approval_needed is True, only reviewers who have approved the change
   will be returned.
-  Returns None if can't fetch issue properties from codereview.
   """
   issue_props = _GetRietveldIssueProps(input_api, True)
   if not issue_props:
-    return None
+    return None, (set() if approval_needed else
+                  _ReviewersFromChange(input_api.change))
 
   if not approval_needed:
     return issue_props['owner_email'], set(issue_props['reviewers'])
@@ -977,11 +989,11 @@ def _GerritOwnerAndReviewers(input_api, email_regexp, approval_needed=False):
 
   If approval_needed is True, only reviewers who have approved the change
   will be returned.
-  Returns None if can't fetch issue properties from codereview.
   """
   issue = input_api.change.issue
   if not issue:
-    return None
+    return None, (set() if approval_needed else
+                  _ReviewersFromChange(input_api.change))
 
   owner_email = input_api.gerrit.GetChangeOwner(issue)
   reviewers = set(

data/vendor/depot_tools/presubmit_support.py

@@ -156,18 +156,6 @@ class _PresubmitResult(object):
       output.fail()
 
 
-# Top level object so multiprocessing can pickle
-# Public access through OutputApi object.
-class _PresubmitAddReviewers(_PresubmitResult):
-  """Add some suggested reviewers to the change."""
-  def __init__(self, reviewers):
-    super(_PresubmitAddReviewers, self).__init__('')
-    self.reviewers = reviewers
-
-  def handle(self, output):
-    output.reviewers.extend(self.reviewers)
-
-
 # Top level object so multiprocessing can pickle
 # Public access through OutputApi object.
 class _PresubmitError(_PresubmitResult):
@@ -270,7 +258,6 @@ class OutputApi(object):
   can output various types of results.
   """
   PresubmitResult = _PresubmitResult
-  PresubmitAddReviewers = _PresubmitAddReviewers
   PresubmitError = _PresubmitError
   PresubmitPromptWarning = _PresubmitPromptWarning
   PresubmitNotifyResult = _PresubmitNotifyResult

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

@@ -1126,6 +1126,10 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
     for item in blacklist:
       cmd.extend(['--blacklist', item])
 
+  # TODO(kjellander): Remove this hack when http://crbug.com/611808 is fixed.
+  if root == path.join('src', 'third_party', 'webrtc'):
+    cmd.extend(['--extra_patchlevel=1'])
+
   # Only try once, since subsequent failures hide the real failure.
   try:
     call(*cmd, tries=1)
@@ -1135,6 +1139,8 @@ def apply_rietveld_issue(issue, patchset, root, server, _rev_map, _revision,
 def apply_gerrit_ref(gerrit_repo, gerrit_ref, root, gerrit_reset):
   gerrit_repo = gerrit_repo or 'origin'
   assert gerrit_ref
+  print '===Applying gerrit ref==='
+  print 'Repo is %r, ref is %r, root is %r' % (gerrit_repo, gerrit_ref, root)
   try:
     base_rev = git('rev-parse', 'HEAD', cwd=root).strip()
     git('retry', 'fetch', gerrit_repo, gerrit_ref, cwd=root, tries=1)
@@ -1311,13 +1317,17 @@ def ensure_checkout(solutions, revisions, first_sln, target_os, target_os_only,
   if patch_url:
     patches = get_svn_patch(patch_url)
 
+  print '===Processing patch solutions==='
   already_patched = []
   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 patches:
         apply_svn_patch(patch_root, patches, whitelist=[target])
         already_patched.append(target)
@@ -1447,7 +1457,9 @@ def parse_args():
   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.')
-  parse.add_option('--master', help='Master name.')
+  parse.add_option('--master',
+                   help='Master name. If specified and it is not in '
+                        'bot_update\'s whitelist, bot_update will be noop.')
   parse.add_option('-f', '--force', action='store_true',
                    help='Bypass check to see if we want to be run. '
                         'Should ONLY be used locally or by smart recipes.')
@@ -1715,8 +1727,13 @@ def main():
   slave = options.slave_name
   master = options.master
 
+  if not master:
+    # bot_update activation whitelist is checked only on buildbot masters.
+    # If there is no master, bot_update is always active.
+    options.force = True
+
   # Check if this script should activate or not.
-  active = check_valid_host(master, builder, slave) or options.force or False
+  active = options.force or check_valid_host(master, builder, slave)
 
   # Print a helpful message to tell developers whats going on with this step.
   print_help_text(

data/vendor/depot_tools/recipe_modules/depot_tools/api.py

@@ -9,6 +9,10 @@ class DepotToolsApi(recipe_api.RecipeApi):
   def download_from_google_storage_path(self):
     return self.package_repo_resource('download_from_google_storage.py')
 
+  @property
+  def upload_to_google_storage_path(self):
+    return self.package_repo_resource('upload_to_google_storage.py')
+
   @property
   def cros_path(self):
     return self.package_repo_resource('cros')

data/vendor/depot_tools/recipe_modules/depot_tools/example.expected/basic.json

@@ -0,0 +1,49 @@
+[
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/download_from_google_storage.py"
+    ],
+    "name": "download_from_google_storage"
+  },
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/upload_to_google_storage.py"
+    ],
+    "name": "upload_to_google_storage"
+  },
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/cros"
+    ],
+    "name": "cros"
+  },
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gn.py"
+    ],
+    "name": "gn_py_path"
+  },
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py"
+    ],
+    "name": "gsutil_py_path"
+  },
+  {
+    "cmd": [
+      "ls",
+      "RECIPE_PACKAGE_REPO[depot_tools]/ninja"
+    ],
+    "name": "ninja_path"
+  },
+  {
+    "name": "$result",
+    "recipe_result": null,
+    "status_code": 0
+  }
+]