libv8 5.7.492.65.1 → 5.9.211.38.0beta0

data/vendor/depot_tools/git_common.py

@@ -37,9 +37,21 @@ from StringIO import StringIO
 
 ROOT = os.path.abspath(os.path.dirname(__file__))
 IS_WIN = sys.platform == 'win32'
-GIT_EXE = ROOT+'\\git.bat' if IS_WIN else 'git'
 TEST_MODE = False
 
+
+def win_find_git():
+  for elem in os.environ.get('PATH', '').split(os.pathsep):
+    for candidate in ('git.exe', 'git.bat'):
+      path = os.path.join(elem, candidate)
+      if os.path.isfile(path):
+        return path
+  raise ValueError('Could not find Git on PATH.')
+
+
+GIT_EXE = 'git' if not IS_WIN else win_find_git()
+
+
 FREEZE = 'FREEZE'
 FREEZE_SECTIONS = {
   'indexed': 'soft',
@@ -48,6 +60,14 @@ FREEZE_SECTIONS = {
 FREEZE_MATCHER = re.compile(r'%s.(%s)' % (FREEZE, '|'.join(FREEZE_SECTIONS)))
 
 
+# NOTE: This list is DEPRECATED in favor of the Infra Git wrapper:
+# https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/git
+#
+# New entries should be added to the Git wrapper, NOT to this list. "git_retry"
+# is, similarly, being deprecated in favor of the Git wrapper.
+#
+# ---
+#
 # Retry a git operation if git returns a error response with any of these
 # messages. It's all observed 'bad' GoB responses so far.
 #
@@ -320,7 +340,7 @@ def branch_config_map(option):
     return {}
 
 
-def branches(*args):
+def branches(use_limit=True, *args):
   NO_BRANCH = ('* (no branch', '* (detached', '* (HEAD detached')
 
   key = 'depot-tools.branch-limit'
@@ -330,7 +350,7 @@ def branches(*args):
 
   num = len(raw_branches)
 
-  if num > limit:
+  if use_limit and num > limit:
     die("""\
       Your git repo has too many branches (%d/%d) for this tool to work well.
 

data/vendor/depot_tools/git_drover.py

@@ -9,6 +9,7 @@ import cPickle
 import functools
 import logging
 import os
+import re
 import shutil
 import subprocess
 import sys
@@ -274,7 +275,9 @@ class _Drover(object):
       return True
 
     self._run_git_command(['reset', '--hard'])
-    self._run_git_command(['cl', 'upload'],
+
+    author = self._run_git_command(['log', '-1', '--format=%ae']).strip()
+    self._run_git_command(['cl', 'upload', '--send-mail', '--tbrs', author],
                           error_message='Upload failed',
                           interactive=True)
 
@@ -294,6 +297,9 @@ class _Drover(object):
           interaction. If false, the command will be provided with no input and
           the output is captured.
 
+    Returns:
+      stdout as a string, or stdout interleaved with stderr if self._verbose
+
     Raises:
       Error: The command failed to complete successfully.
     """
@@ -321,6 +327,9 @@ class _Drover(object):
       args: A list of strings containing the args to pass to git.
       stdin: A string to provide on stdin.
 
+    Returns:
+      stdout as a string, or stdout interleaved with stderr if self._verbose
+
     Raises:
       Error: The command failed to complete successfully.
     """

data/vendor/depot_tools/git_footers.py

@@ -13,7 +13,7 @@ from collections import defaultdict
 import git_common as git
 
 
-FOOTER_PATTERN = re.compile(r'^\s*([\w-]+): (.*)$')
+FOOTER_PATTERN = re.compile(r'^\s*([\w-]+): *(.*)$')
 CHROME_COMMIT_POSITION_PATTERN = re.compile(r'^([\w/\-\.]+)@{#(\d+)}$')
 
 
@@ -42,12 +42,25 @@ def parse_footers(message):
   return footer_map
 
 
+def matches_footer_key(line, key):
+  """Returns whether line is a valid footer whose key matches a given one.
+
+  Keys are compared in normalized form.
+  """
+  r = parse_footer(line)
+  if r is None:
+    return False
+  return normalize_name(r[0]) == normalize_name(key)
+
+
 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.
+      There could be fewer parsed_footers than footer lines if some lines in
+      last paragraph are malformed.
   """
   message_lines = list(message.splitlines())
   footer_lines = []
@@ -61,8 +74,8 @@ def split_footers(message):
     footer_lines = []
 
   footer_lines.reverse()
-  footers = map(parse_footer, footer_lines)
-  if not footer_lines or not all(footers):
+  footers = filter(None, map(parse_footer, footer_lines))
+  if not footers:
     return message_lines, [], []
   return message_lines[:-len(footer_lines)], footer_lines, footers
 
@@ -84,13 +97,16 @@ def add_footer_change_id(message, change_id):
                     after_keys=['Bug', 'Issue', 'Test', 'Feature'])
 
 
-def add_footer(message, key, value, after_keys=None):
+def add_footer(message, key, value, after_keys=None, before_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.
+  If after_keys and before_keys are both None (default), appends footer last.
+  If after_keys is provided and matches footers already present, inserts footer
+  as *early* as possible while still appearing after all provided keys, even
+  if doing so conflicts with before_keys.
+  If before_keys is provided, inserts footer as late as possible while still
+  appearing before all provided keys.
+
   For example, given
       message='Header.\n\nAdded: 2016\nBug: 123\nVerified-By: CQ'
       after_keys=['Bug', 'Issue']
@@ -99,25 +115,49 @@ def add_footer(message, key, value, after_keys=None):
   assert key == normalize_name(key), 'Use normalized key'
   new_footer = '%s: %s' % (key, value)
 
-  top_lines, footer_lines, parsed_footers = split_footers(message)
+  top_lines, footer_lines, _ = 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_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
+    after_keys = set(map(normalize_name, after_keys or []))
+    after_indices = [
+        footer_lines.index(x) for x in footer_lines for k in after_keys
+        if matches_footer_key(x, k)]
+    before_keys = set(map(normalize_name, before_keys or []))
+    before_indices = [
+        footer_lines.index(x) for x in footer_lines for k in before_keys
+        if matches_footer_key(x, k)]
+    if after_indices:
+      # after_keys takes precedence, even if there's a conflict.
+      insert_idx = max(after_indices) + 1
+    elif before_indices:
+      insert_idx = min(before_indices)
     else:
-      footer_lines.insert(0, new_footer)
+      insert_idx = len(footer_lines)
+    footer_lines.insert(insert_idx, new_footer)
   return '\n'.join(top_lines + footer_lines)
 
 
+def remove_footer(message, key):
+  """Returns a message with all instances of given footer removed."""
+  key = normalize_name(key)
+  top_lines, footer_lines, _ = split_footers(message)
+  if not footer_lines:
+    return message
+  new_footer_lines = []
+  for line in footer_lines:
+    try:
+      f = normalize_name(parse_footer(line)[0])
+      if f != key:
+        new_footer_lines.append(line)
+    except TypeError:
+      # If the footer doesn't parse (i.e. is malformed), just let it carry over.
+      new_footer_lines.append(line)
+  return '\n'.join(top_lines + new_footer_lines)
+
+
 def get_unique(footers, key):
   key = normalize_name(key)
   values = footers[key]
@@ -152,8 +192,8 @@ def main(args):
   parser = argparse.ArgumentParser(
     formatter_class=argparse.ArgumentDefaultsHelpFormatter
   )
-  parser.add_argument('ref', nargs='?', help="Git ref to retrieve footers from."
-                      " Omit to parse stdin.")
+  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',
@@ -162,14 +202,14 @@ 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.")
+  g.add_argument('--json', help='filename to dump JSON serialized footers to.')
 
   opts = parser.parse_args(args)
 
   if opts.ref:
     message = git.run('log', '-1', '--format=%B', opts.ref)
   else:
-    message = '\n'.join(l for l in sys.stdin)
+    message = sys.stdin.read()
 
   footers = parse_footers(message)
 

data/vendor/depot_tools/git_hyper_blame.py

@@ -312,9 +312,9 @@ def hyper_blame(ignored, filename, revision='HEAD', out=sys.stdout,
       newline = parent_blame[lineno_previous - 1]
 
       # Replace the commit and lineno_then, but not the lineno_now or context.
-      logging.debug('    replacing with %r', newline)
-      line = BlameLine(newline.commit, line.context, lineno_previous,
+      line = BlameLine(newline.commit, line.context, newline.lineno_then,
                        line.lineno_now, True)
+      logging.debug('    replacing with %r', line)
 
     # If any line has a different filename to the file's current name, turn on
     # filename display for the entire blame output.
@@ -345,6 +345,7 @@ def main(args, stdout=sys.stdout, stderr=sys.stderr):
                       type=argparse.FileType('r'), dest='ignore_file',
                       help='a file containing a list of revisions to ignore')
   parser.add_argument('--no-default-ignores', dest='no_default_ignores',
+                      action='store_true',
                       help='Do not ignore commits from .git-blame-ignore-revs.')
   parser.add_argument('revision', nargs='?', default='HEAD', metavar='REVISION',
                       help='revision to look at')

data/vendor/depot_tools/git_map.py

@@ -4,8 +4,9 @@
 # found in the LICENSE file.
 
 """
-Provides an augmented `git log --graph` view. In particular, it also annotates
-commits with branches + tags that point to them. Items are colorized as follows:
+Enhances `git log --graph` view with information on commit branches + tags that
+point to them. Items are colorized as follows:
+
   * Cyan    - Currently checked out branch
   * Green   - Local branch
   * Red     - Remote branches
@@ -37,9 +38,35 @@ RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL
 # Git emits combined color
 BRIGHT_RED = '\x1b[1;31m'
 
+
+def print_help():
+  names = {
+    'Cyan': CYAN,
+    'Green': GREEN,
+    'Magenta': MAGENTA,
+    'Red': RED,
+    'White': WHITE,
+    'Blue background': BLUEBAK,
+  }
+  msg = "usage: git map [-h] [<args>]\n"
+
+  for line in __doc__.splitlines():
+    for key in names.keys():
+      if key in line:
+        msg += line.replace('* ', '* ' + names[key])+RESET+'\n'
+        break
+    else:
+      msg += line + '\n'
+  sys.stdout.write(msg)
+
+
 def main(argv):
+  if '-h' in argv:
+    print_help()
+    return 0
+
   map_extra = get_config_list('depot_tools.map_extra')
-  fmt = '%C(red bold)%h%x09%Creset%C(green)%d%Creset %C(yellow)%ad%Creset ~ %s'
+  fmt = '%C(red bold)%h%x09%Creset%C(green)%d%Creset %C(yellow)%cd%Creset ~ %s'
   log_proc = subprocess2.Popen(
     [GIT_EXE, 'log', '--graph', '--branches', '--tags', root(),
      '--color=always', '--date=short', ('--pretty=format:' + fmt)

data/vendor/depot_tools/git_map_branches.py

@@ -3,8 +3,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Provides a short mapping of all the branches in your local repo, organized
-by their upstream ('tracking branch') layout.
+"""Print dependency tree of branches in local repo.
 
 Example:
 origin/master
@@ -278,6 +277,19 @@ class BranchMapper(object):
       self.__append_branch(child, depth=depth + 1)
 
 
+def print_desc():
+  for line in __doc__.splitlines():
+    starpos = line.find('* ')
+    if starpos == -1 or '-' not in line:
+      print(line)
+    else:
+      _, color, rest = line.split(None, 2)
+      outline = line[:starpos+1]
+      outline += getattr(Fore, color.upper()) + " " + color + " " + Fore.RESET
+      outline += rest
+      print(outline)
+  print('')
+
 def main(argv):
   setup_color.init()
   if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
@@ -287,8 +299,10 @@ def main(argv):
         '.'.join(str(x) for x in MIN_UPSTREAM_TRACK_GIT_VERSION) +
         '. Please consider upgrading.')
 
-  parser = argparse.ArgumentParser(
-      description='Print a a tree of all branches parented by their upstreams')
+  if '-h' in argv:
+    print_desc()
+
+  parser = argparse.ArgumentParser()
   parser.add_argument('-v', action='count',
                       help='Display branch hash and Rietveld URL')
   parser.add_argument('--no-color', action='store_true', dest='nocolor',

data/vendor/depot_tools/git_number.py

@@ -204,8 +204,14 @@ def load_generation_numbers(targets):
 
   if git.tree(REF) is None:
     empty = git.mktree({})
-    commit_hash = git.run('commit-tree', '-m', 'Initial commit from git-number',
-                          empty)
+    commit_hash = git.run(
+        # Git user.name and/or user.email may not be configured, so specifying
+        # them explicitly. They are not used, but requried by Git.
+        '-c', 'user.name=%s' % AUTHOR_NAME,
+        '-c', 'user.email=%s' % AUTHOR_EMAIL,
+        'commit-tree',
+        '-m', 'Initial commit from git-number',
+        empty)
     git.run('update-ref', REF, commit_hash)
 
   with git.ScopedPool(kind=POOL_KIND) as pool:

data/vendor/depot_tools/git_retry.py

@@ -3,8 +3,16 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+
+"""Generic retry wrapper for Git operations. 
+
+This is largely DEPRECATED in favor of the Infra Git wrapper:
+https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/git
+"""
+
 import logging
 import optparse
+import os
 import subprocess
 import sys
 import threading
@@ -111,6 +119,19 @@ class GitRetry(object):
 
 
 def main(args):
+  # If we're using the Infra Git wrapper, do nothing here.
+  # https://chromium.googlesource.com/infra/infra/+/master/go/src/infra/tools/git
+  if 'INFRA_GIT_WRAPPER' in os.environ:
+    # Remove Git's execution path from PATH so that our call-through re-invokes
+    # the Git wrapper.
+    # See crbug.com/721450
+    env = os.environ.copy()
+    git_exec = subprocess.check_output([GIT_EXE, '--exec-path']).strip()
+    env['PATH'] = os.pathsep.join([
+      elem for elem in env.get('PATH', '').split(os.pathsep)
+      if elem != git_exec])
+    return subprocess.call([GIT_EXE] + args, env=env)
+
   parser = optparse.OptionParser()
   parser.disable_interspersed_args()
   parser.add_option('-v', '--verbose',

data/vendor/depot_tools/gn.bat

@@ -4,8 +4,9 @@
 :: found in the LICENSE file.
 setlocal
 
-:: This is required with cygwin only.
-PATH=%~dp0;%PATH%
+:: Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+:: standalone, but allow other PATH manipulations to take priority.
+set PATH=%PATH%;%~dp0
 
 :: Defer control.
-%~dp0python "%~dp0\gn.py" %*
+python "%~dp0\gn.py" %*

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

@@ -23,12 +23,8 @@ verifiers {
 
   try_job {
     buckets {
-      name: "luci.infra.try"
+      name: "luci.infra.depot_tools.try"
       builders { name: "Depot Tools Presubmit" }
-      builders {
-        name: "Recipe Roll Downstream Tester"
-        experiment_percentage: 100
-      }
     }
   }
 }

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

@@ -1,22 +1,24 @@
 {
-  "api_version": 1,
-  "deps": [
-    {
-      "branch": "master",
-      "project_id": "recipe_engine",
-      "revision": "4fcdb75517198a9ca32c7c4aecbe2e6f54b8b6c2",
-      "url": "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
-    }
-  ],
-  "project_id": "depot_tools",
-  "recipes_path": "recipes",
+  "api_version": 2,
   "autoroll_recipe_options": {
-    "trivial": {
-      "tbr_emails": ["iannucci@chromium.org"],
-      "automatic_commit": true
-    },
     "nontrivial": {
       "automatic_commit_dry_run": true
+    },
+    "trivial": {
+      "automatic_commit": true,
+      "tbr_emails": [
+        "iannucci@chromium.org"
+      ]
+    }
+  },
+  "canonical_repo_url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
+  "deps": {
+    "recipe_engine": {
+      "branch": "master",
+      "revision": "de3238ca6d8320585f5dbcf051cd96cbc72d4684",
+      "url": "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
     }
-  }
+  },
+  "project_id": "depot_tools",
+  "recipes_path": "recipes"
 }