libv8 7.8.279.23.0beta1 → 8.4.255.0

data/vendor/depot_tools/git_cl_completion.sh

@@ -19,7 +19,7 @@
 
 # Parses commands from git cl -h.
 __git_cl_commands () {
-  git cl -h 2> /dev/null | sed -n 's/^\s*\x1b\[32m\(.*\)\x1b\[39m.*$/\1/p'
+  git cl -h 2> /dev/null | sed -n 's/^\s*\x1b\[32m\(\S\+\)\s*\x1b\[39m.*$/\1/p'
 }
 
 # Caches variables in __git_cl_all_commands.
@@ -30,5 +30,19 @@ __git_cl_compute_all_commands () {
 
 _git_cl () {
   __git_cl_compute_all_commands
-  __gitcomp_nl "$(__git_cl_commands)"
+  local subcommands=$(echo "$__git_cl_all_commands" | xargs)
+  local subcommand=$(__git_find_on_cmdline "$subcommands")
+  if [[ -z "$subcommand" ]]; then
+      __gitcomp "$subcommands"
+      return
+  fi
+
+  case "$subcommand,$cur" in
+      upload,--*)
+          __gitcomp_builtin cl_upload
+          ;;
+      "",*)
+          __gitcomp_nl "${__git_cl_all_commands}"
+          ;;
+  esac
 }

data/vendor/depot_tools/git_common.py

@@ -6,12 +6,20 @@
 # Derived from https://gist.github.com/aljungberg/626518
 
 from __future__ import print_function
+from __future__ import unicode_literals
 
 import multiprocessing.pool
+import sys
+import threading
+
 from multiprocessing.pool import IMapIterator
+
 def wrapper(func):
   def wrap(self, timeout=None):
-    return func(self, timeout=timeout or 1e100)
+    default_timeout = (1 << 31 if sys.version_info.major == 2 else
+                       threading.TIMEOUT_MAX)
+    return func(self, timeout=timeout or default_timeout)
+
   return wrap
 IMapIterator.next = wrapper(IMapIterator.next)
 IMapIterator.__next__ = IMapIterator.next
@@ -28,16 +36,19 @@ import re
 import setup_color
 import shutil
 import signal
-import sys
 import tempfile
 import textwrap
-import threading
 
 import subprocess2
 
 from io import BytesIO
 
 
+if sys.version_info.major == 2:
+  # On Python 3, BrokenPipeError is raised instead.
+  BrokenPipeError = IOError
+
+
 ROOT = os.path.abspath(os.path.dirname(__file__))
 IS_WIN = sys.platform == 'win32'
 TEST_MODE = False
@@ -303,11 +314,17 @@ class ProgressPrinter(object):
 def once(function):
   """@Decorates |function| so that it only performs its action once, no matter
   how many times the decorated |function| is called."""
-  def _inner_gen():
-    yield function()
-    while True:
-      yield
-  return _inner_gen().next
+  has_run = [False]
+  def _wrapper(*args, **kwargs):
+    if not has_run[0]:
+      has_run[0] = True
+      function(*args, **kwargs)
+  return _wrapper
+
+
+def unicode_repr(s):
+  result = repr(s)
+  return result[1:] if result.startswith('u') else result
 
 
 ## Git functions
@@ -437,7 +454,7 @@ def freeze():
       die("Cannot freeze unmerged changes!")
     if limit_mb > 0:
       if s.lstat == '?':
-        untracked_bytes += os.stat(os.path.join(root_path, f)).st_size
+        untracked_bytes += os.lstat(os.path.join(root_path, f)).st_size
   if limit_mb > 0 and untracked_bytes > limit_mb * MB:
     die("""\
       You appear to have too much untracked+unignored data in your git
@@ -452,7 +469,7 @@ def freeze():
         .git/info/exclude
       file. See `git help ignore` for the format of this file.
 
-      If this data is indended as part of your commit, you may adjust the
+      If this data is intended as part of your commit, you may adjust the
       freeze limit by running:
         git config %s <new_limit>
       Where <new_limit> is an integer threshold in megabytes.""",
@@ -597,8 +614,8 @@ def mktree(treedict):
     treedict - { name: (mode, type, ref) }
   """
   with tempfile.TemporaryFile() as f:
-    for name, (mode, typ, ref) in treedict.iteritems():
-      f.write('%s %s %s\t%s\0' % (mode, typ, ref, name))
+    for name, (mode, typ, ref) in treedict.items():
+      f.write(('%s %s %s\t%s\0' % (mode, typ, ref, name)).encode('utf-8'))
     f.seek(0)
     return run('mktree', '-z', stdin=f)
 
@@ -612,7 +629,7 @@ def parse_commitrefs(*commitrefs):
     * 'cool_branch~2'
   """
   try:
-    return map(binascii.unhexlify, hash_multi(*commitrefs))
+    return [binascii.unhexlify(h) for h in hash_multi(*commitrefs)]
   except subprocess2.CalledProcessError:
     raise BadCommitRefException(commitrefs)
 
@@ -645,7 +662,8 @@ def rebase(parent, start, branch, abort=False):
   except subprocess2.CalledProcessError as cpe:
     if abort:
       run_with_retcode('rebase', '--abort')  # ignore failure
-    return RebaseRet(False, cpe.stdout, cpe.stderr)
+    return RebaseRet(False, cpe.stdout.decode('utf-8', 'replace'),
+                     cpe.stderr.decode('utf-8', 'replace'))
 
 
 def remove_merge_base(branch):
@@ -658,8 +676,16 @@ def repo_root():
   return run('rev-parse', '--show-toplevel')
 
 
+def upstream_default():
+  """Returns the default branch name of the origin repository."""
+  try:
+    return run('rev-parse', '--abbrev-ref', 'origin/HEAD')
+  except subprocess2.CalledProcessError:
+    return 'origin/master'
+
+
 def root():
-  return get_config('depot-tools.upstream', 'origin/master')
+  return get_config('depot-tools.upstream', upstream_default())
 
 
 @contextlib.contextmanager
@@ -668,9 +694,13 @@ def less():  # pragma: no cover
 
   Automatically checks if sys.stdout is a non-TTY stream. If so, it avoids
   running less and just yields sys.stdout.
+
+  The returned PIPE is opened on binary mode.
   """
   if not setup_color.IS_TTY:
-    yield sys.stdout
+    # On Python 3, sys.stdout doesn't accept bytes, and sys.stdout.buffer must
+    # be used.
+    yield getattr(sys.stdout, 'buffer', sys.stdout)
     return
 
   # Run with the same options that git uses (see setup_pager in git repo).
@@ -682,7 +712,11 @@ def less():  # pragma: no cover
     proc = subprocess2.Popen(cmd, stdin=subprocess2.PIPE)
     yield proc.stdin
   finally:
-    proc.stdin.close()
+    try:
+      proc.stdin.close()
+    except BrokenPipeError:
+      # BrokenPipeError is raised if proc has already completed,
+      pass
     proc.wait()
 
 
@@ -733,7 +767,7 @@ def run_stream_with_retcode(*cmd, **kwargs):
     retcode = proc.wait()
     if retcode != 0:
       raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(),
-                                           None, None)
+                                           b'', b'')
 
 
 def run_with_stderr(*cmd, **kwargs):
@@ -751,6 +785,7 @@ def run_with_stderr(*cmd, **kwargs):
   kwargs.setdefault('shell', False)
   autostrip = kwargs.pop('autostrip', True)
   indata = kwargs.pop('indata', None)
+  decode = kwargs.pop('decode', True)
 
   cmd = (GIT_EXE, '-c', 'color.ui=never') + cmd
   proc = subprocess2.Popen(cmd, **kwargs)
@@ -760,8 +795,12 @@ def run_with_stderr(*cmd, **kwargs):
     raise subprocess2.CalledProcessError(retcode, cmd, os.getcwd(), ret, err)
 
   if autostrip:
-    ret = (ret or '').strip()
-    err = (err or '').strip()
+    ret = (ret or b'').strip()
+    err = (err or b'').strip()
+
+  if decode:
+    ret = ret.decode('utf-8', 'replace')
+    err = err.decode('utf-8', 'replace')
 
   return ret, err
 
@@ -777,7 +816,7 @@ def set_config(option, value, scope='local'):
 def get_dirty_files():
   # Make sure index is up-to-date before running diff-index.
   run_with_retcode('update-index', '--refresh', '-q')
-  return run('diff-index', '--name-status', 'HEAD')
+  return run('diff-index', '--ignore-submodules', '--name-status', 'HEAD')
 
 
 def is_dirty_git_tree(cmd):
@@ -810,9 +849,9 @@ def status():
   def tokenizer(stream):
     acc = BytesIO()
     c = None
-    while c != '':
+    while c != b'':
       c = stream.read(1)
-      if c in (None, '', '\0'):
+      if c in (None, b'', b'\0'):
         if len(acc.getvalue()):
           yield acc.getvalue()
           acc = BytesIO()
@@ -821,12 +860,14 @@ def status():
 
   def parser(tokens):
     while True:
-      # Raises StopIteration if it runs out of tokens.
-      status_dest = next(tokens)
+      try:
+        status_dest = next(tokens).decode('utf-8')
+      except StopIteration:
+        return
       stat, dest = status_dest[:2], status_dest[3:]
       lstat, rstat = stat
       if lstat == 'R':
-        src = next(tokens)
+        src = next(tokens).decode('utf-8')
       else:
         src = dest
       yield (dest, stat_entry(lstat, rstat, src))
@@ -848,7 +889,7 @@ def squash_current_branch(header=None, merge_base=None):
     # nothing to commit at this point.
     print('Nothing to commit; squashed branch is empty')
     return False
-  run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg)
+  run('commit', '--no-verify', '-a', '-F', '-', indata=log_msg.encode('utf-8'))
   return True
 
 
@@ -858,7 +899,8 @@ def tags(*args):
 
 def thaw():
   took_action = False
-  for sha in (s.strip() for s in run_stream('rev-list', 'HEAD').xreadlines()):
+  for sha in run_stream('rev-list', 'HEAD').readlines():
+    sha = sha.strip().decode('utf-8')
     msg = run('show', '--format=%f%b', '-s', 'HEAD')
     match = FREEZE_MATCHER.match(msg)
     if not match:
@@ -899,7 +941,7 @@ def topo_iter(branch_tree, top_down=True):
   # TODO(iannucci): There is probably a more efficient way to do these.
   if top_down:
     while branch_tree:
-      this_pass = [(b, p) for b, p in branch_tree.iteritems()
+      this_pass = [(b, p) for b, p in branch_tree.items()
                    if p not in branch_tree]
       assert this_pass, "Branch tree has cycles: %r" % branch_tree
       for branch, parent in sorted(this_pass):
@@ -907,11 +949,11 @@ def topo_iter(branch_tree, top_down=True):
         del branch_tree[branch]
   else:
     parent_to_branches = collections.defaultdict(set)
-    for branch, parent in branch_tree.iteritems():
+    for branch, parent in branch_tree.items():
       parent_to_branches[parent].add(branch)
 
     while branch_tree:
-      this_pass = [(b, p) for b, p in branch_tree.iteritems()
+      this_pass = [(b, p) for b, p in branch_tree.items()
                    if not parent_to_branches[b]]
       assert this_pass, "Branch tree has cycles: %r" % branch_tree
       for branch, parent in sorted(this_pass):
@@ -1014,7 +1056,9 @@ def get_branches_info(include_tracking_status):
     if info.upstream not in info_map and info.upstream not in missing_upstreams:
       missing_upstreams[info.upstream] = None
 
-  return dict(info_map.items() + missing_upstreams.items())
+  result = info_map.copy()
+  result.update(missing_upstreams)
+  return result
 
 
 def make_workdir_common(repository, new_workdir, files_to_symlink,
@@ -1039,6 +1083,7 @@ def make_workdir(repository, new_workdir):
     'refs',
     'remotes',
     'rr-cache',
+    'shallow',
   ]
   make_workdir_common(repository, new_workdir, GIT_DIRECTORY_WHITELIST,
                       ['HEAD'])

data/vendor/depot_tools/git_drover.py

@@ -4,8 +4,9 @@
 # found in the LICENSE file.
 """git drover: A tool for merging changes to release branches."""
 
+from __future__ import print_function
+
 import argparse
-import cPickle
 import functools
 import logging
 import os
@@ -16,7 +17,12 @@ import sys
 import tempfile
 
 import git_common
+import gclient_utils
 
+if sys.version_info.major == 2:
+  import cPickle
+else:
+  import pickle as cPickle
 
 class Error(Exception):
   pass
@@ -181,7 +187,7 @@ class _Drover(object):
     result = ''
     while result not in ('y', 'n'):
       try:
-        result = raw_input('%s Continue (y/n)? ' % message)
+        result = gclient_utils.AskForData('%s Continue (y/n)? ' % message)
       except EOFError:
         result = 'n'
     return result == 'y'
@@ -266,9 +272,9 @@ class _Drover(object):
         ['-c', 'core.quotePath=false', 'status', '--porcelain']).splitlines()
     extra_files = [f[3:] for f in repo_status if f[:2] == ' D']
     if extra_files:
+      stdin = '\n'.join(extra_files) + '\n'
       self._run_git_command_with_stdin(
-          ['update-index', '--skip-worktree', '--stdin'],
-          stdin='\n'.join(extra_files) + '\n')
+          ['update-index', '--skip-worktree', '--stdin'], stdin=stdin.encode())
 
   def _upload_and_land(self):
     if self._dry_run:
@@ -282,9 +288,9 @@ class _Drover(object):
                           error_message='Upload failed',
                           interactive=True)
 
-    if not self._confirm('About to land on %s.' % self._branch):
+    if not self._confirm('About to start CQ on %s.' % self._branch):
       return False
-    self._run_git_command(['cl', 'land', '--bypass-hooks'], interactive=True)
+    self._run_git_command(['cl', 'set-commit'], interactive=True)
     return True
 
   def _run_git_command(self, args, error_message=None, interactive=False):
@@ -314,7 +320,10 @@ class _Drover(object):
     stderr = None if self._verbose else _DEV_NULL_FILE
 
     try:
-      return run(['git'] + args, shell=False, cwd=cwd, stderr=stderr)
+      rv = run(['git'] + args, shell=False, cwd=cwd, stderr=stderr)
+      if not interactive and sys.version_info.major == 3:
+        return rv.decode('utf-8', 'ignore')
+      return rv
     except (OSError, subprocess.CalledProcessError) as e:
       if error_message:
         raise Error(error_message)
@@ -452,7 +461,7 @@ def main():
                          options.parent_checkout, options.dry_run,
                          options.verbose)
   except Error as e:
-    print 'Error:', e.message
+    print('Error:', e.message)
     sys.exit(128)
 
 

data/vendor/depot_tools/git_find_releases.py

@@ -11,6 +11,8 @@ Note that it uses the "cherry picked from" annotation to find merges, so it will
 only work on merges that followed the "use cherry-pick -x" instructions.
 """
 
+from __future__ import print_function
+
 import optparse
 import re
 import sys
@@ -33,9 +35,9 @@ def GetMergesForCommit(sha1):
                   'cherry picked from commit %s' % sha1).splitlines()]
 
 
-def main():
+def main(args):
   parser = optparse.OptionParser(usage=sys.modules[__name__].__doc__)
-  _, args = parser.parse_args()
+  _, args = parser.parse_args(args)
 
   if len(args) == 0:
     parser.error('Need at least one commit.')
@@ -43,23 +45,23 @@ def main():
   for arg in args:
     commit_name = GetNameForCommit(arg)
     if not commit_name:
-      print '%s not found' % arg
+      print('%s not found' % arg)
       return 1
-    print 'commit %s was:' % arg
-    print '  initially in ' + commit_name
+    print('commit %s was:' % arg)
+    print('  initially in ' + commit_name)
     merges = GetMergesForCommit(arg)
     for merge in merges:
-      print '  merged to ' + GetNameForCommit(merge) + ' (as ' + merge + ')'
+      print('  merged to ' + GetNameForCommit(merge) + ' (as ' + merge + ')')
     if not merges:
-      print 'No merges found. If this seems wrong, be sure that you did:'
-      print '  git fetch origin && gclient sync --with_branch_heads'
+      print('No merges found. If this seems wrong, be sure that you did:')
+      print('  git fetch origin && gclient sync --with_branch_heads')
 
   return 0
 
 
 if __name__ == '__main__':
   try:
-    sys.exit(main())
+    sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)

data/vendor/depot_tools/git_footers.py

@@ -3,6 +3,8 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+from __future__ import print_function
+
 import argparse
 import json
 import re
@@ -15,7 +17,7 @@ import git_common as git
 
 FOOTER_PATTERN = re.compile(r'^\s*([\w-]+): *(.*)$')
 CHROME_COMMIT_POSITION_PATTERN = re.compile(r'^([\w/\-\.]+)@{#(\d+)}$')
-FOOTER_KEY_BLACKLIST = set(['http', 'https'])
+FOOTER_KEY_BLOCKLIST = set(['http', 'https'])
 
 
 def normalize_name(header):
@@ -25,7 +27,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 and match.group(1) not in FOOTER_KEY_BLACKLIST:
+  if match and match.group(1) not in FOOTER_KEY_BLOCKLIST:
     return (match.group(1), match.group(2))
   return None
 
@@ -74,7 +76,7 @@ def split_footers(message):
       maybe_footer_lines = []
       footer_lines.append(line)
     else:
-      # We only want to include malformed lines if they are preceeded by
+      # We only want to include malformed lines if they are preceded by
       # well-formed lines. So keep them in holding until we see a well-formed
       # line (case above).
       maybe_footer_lines.append(line)
@@ -84,7 +86,7 @@ def split_footers(message):
     footer_lines = []
 
   footer_lines.reverse()
-  footers = filter(None, map(parse_footer, footer_lines))
+  footers = [footer for footer in map(parse_footer, footer_lines) if footer]
   if not footers:
     return message_lines, [], []
   if maybe_footer_lines:
@@ -128,6 +130,8 @@ def add_footer(message, key, value, after_keys=None, before_keys=None):
   """
   assert key == normalize_name(key), 'Use normalized key'
   new_footer = '%s: %s' % (key, value)
+  if not FOOTER_PATTERN.match(new_footer):
+    raise ValueError('Invalid footer %r' % new_footer)
 
   top_lines, footer_lines, _ = split_footers(message)
   if not footer_lines:
@@ -229,23 +233,23 @@ def main(args):
 
   if opts.key:
     for v in footers.get(normalize_name(opts.key), []):
-      print v
+      print(v)
   elif opts.position:
     pos = get_position(footers)
-    print '%s@{#%s}' % (pos[0], pos[1] or '?')
+    print('%s@{#%s}' % (pos[0], pos[1] or '?'))
   elif opts.position_ref:
-    print get_position(footers)[0]
+    print(get_position(footers)[0])
   elif opts.position_num:
     pos = get_position(footers)
     assert pos[1], 'No valid position for commit'
-    print pos[1]
+    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]:
-        print '%s: %s' % (k, v)
+        print('%s: %s' % (k, v))
   return 0