libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/roll-dep

@@ -5,4 +5,17 @@
 
 base_dir=$(dirname "$0")
 
-PYTHONDONTWRITEBYTECODE=1 exec python "$base_dir/roll_dep.py" "$@"
+# Ensure that "depot_tools" is somewhere in PATH so this tool can be used
+# standalone, but allow other PATH manipulations to take priority.
+PATH=$PATH:$base_dir
+
+if [[ $GCLIENT_PY3 = 1 ]]; then
+  # Explicitly run on Python 3
+  PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@"
+elif [[ $GCLIENT_PY3 = 0 ]]; then
+  # Explicitly run on Python 2
+  PYTHONDONTWRITEBYTECODE=1 exec vpython "$base_dir/roll_dep.py" "$@"
+else
+  # Run on Python 2 for now, allows default to be flipped.
+  PYTHONDONTWRITEBYTECODE=1 exec vpython3 "$base_dir/roll_dep.py" "$@"
+fi

data/vendor/depot_tools/roll-dep.bat

@@ -9,4 +9,13 @@ setlocal
 set PATH=%PATH%;%~dp0
 
 :: Defer control.
-python "%~dp0\roll_dep.py" %*
+IF "%GCLIENT_PY3%" == "1" (
+  :: Explicitly run on Python 3
+  call vpython3 "%~dp0\roll_dep.py" %*
+) ELSE IF "%GCLIENT_PY3%" == "0" (
+  :: Explicitly run on Python 2
+  call vpython "%~dp0\roll_dep.py" %*
+) ELSE (
+  :: Run on Python 3, allows default to be flipped.
+  call vpython3 "%~dp0\roll_dep.py" %*
+)

data/vendor/depot_tools/roll_dep.py

@@ -9,9 +9,9 @@ Works only with git checkout and git dependencies.  Currently this
 script will always roll to the tip of to origin/master.
 """
 
+from __future__ import print_function
+
 import argparse
-import collections
-import gclient_eval
 import os
 import re
 import subprocess
@@ -52,7 +52,7 @@ class AlreadyRolledError(Error):
 def check_output(*args, **kwargs):
   """subprocess.check_output() passing shell=True on Windows for git."""
   kwargs.setdefault('shell', NEED_SHELL)
-  return subprocess.check_output(*args, **kwargs)
+  return subprocess.check_output(*args, **kwargs).decode('utf-8')
 
 
 def check_call(*args, **kwargs):
@@ -99,13 +99,15 @@ def gclient(args):
 def generate_commit_message(
     full_dir, dependency, head, roll_to, no_log, log_limit):
   """Creates the commit message for this specific roll."""
-  commit_range = '%s..%s' % (head[:9], roll_to[:9])
+  commit_range = '%s..%s' % (head, roll_to)
+  commit_range_for_header = '%s..%s' % (head[:9], roll_to[:9])
   upstream_url = check_output(
       ['git', 'config', 'remote.origin.url'], cwd=full_dir).strip()
   log_url = get_log_url(upstream_url, head, roll_to)
   cmd = ['git', 'log', commit_range, '--date=short', '--no-merges']
   logs = check_output(
-      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
+      # Args with '=' are automatically quoted.
+      cmd + ['--format=%ad %ae %s', '--'],
       cwd=full_dir).rstrip()
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
   lines = logs.splitlines()
@@ -116,7 +118,7 @@ def generate_commit_message(
   rolls = nb_commits - len(cleaned_lines)
   header = 'Roll %s/ %s (%d commit%s%s)\n\n' % (
       dependency,
-      commit_range,
+      commit_range_for_header,
       nb_commits,
       's' if nb_commits > 1 else '',
       ('; %s trivial rolls' % rolls) if rolls else '')
@@ -125,13 +127,14 @@ def generate_commit_message(
     log_section = log_url + '\n\n'
   log_section += '$ %s ' % ' '.join(cmd)
   log_section += '--format=\'%ad %ae %s\'\n'
+  log_section = log_section.replace(commit_range, commit_range_for_header)
   # It is important that --no-log continues to work, as it is used by
   # internal -> external rollers. Please do not remove or break it.
   if not no_log and should_show_log(upstream_url):
     if len(cleaned_lines) > log_limit:
       # Keep the first N/2 log entries and last N/2 entries.
       lines = logs.splitlines(True)
-      lines = lines[:log_limit/2] + ['(...)\n'] + lines[-log_limit/2:]
+      lines = lines[:log_limit//2] + ['(...)\n'] + lines[-log_limit//2:]
       logs = ''.join(lines)
     log_section += logs
   return header + log_section
@@ -171,7 +174,7 @@ def finalize(commit_msg, current_dir, rolls):
 
   # Pull the dependency to the right revision. This is surprising to users
   # otherwise.
-  for _head, roll_to, full_dir in sorted(rolls.itervalues()):
+  for _head, roll_to, full_dir in sorted(rolls.values()):
     check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
 
 
@@ -218,7 +221,7 @@ def main():
 
   gclient_root = gclient(['root'])
   current_dir = os.getcwd()
-  dependencies = sorted(d.rstrip('/').rstrip('\\') for d in args.dep_path)
+  dependencies = sorted(d.replace('\\', '/').rstrip('/') for d in args.dep_path)
   cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join(
       ' --key ' + k for k in args.key)
   try:
@@ -249,7 +252,7 @@ def main():
 
     logs = []
     setdep_args = []
-    for dependency, (head, roll_to, full_dir) in sorted(rolls.iteritems()):
+    for dependency, (head, roll_to, full_dir) in sorted(rolls.items()):
       log = generate_commit_message(
           full_dir, dependency, head, roll_to, args.no_log, args.log_limit)
       logs.append(log)
@@ -262,6 +265,8 @@ def main():
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 2 if isinstance(e, AlreadyRolledError) else 1
+  except subprocess.CalledProcessError:
+    return 1
 
   print('')
   if not reviewers:

data/vendor/depot_tools/scm.py

@@ -4,16 +4,13 @@
 
 """SCM-specific utility classes."""
 
+import distutils.version
 import glob
 import io
-import logging
 import os
 import platform
 import re
 import sys
-import tempfile
-import time
-from xml.etree import ElementTree
 
 import gclient_utils
 import subprocess2
@@ -117,16 +114,14 @@ class GIT(object):
   def Capture(args, cwd, strip_out=True, **kwargs):
     env = GIT.ApplyEnvVars(kwargs)
     output = subprocess2.check_output(
-        ['git'] + args,
-        cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
+        ['git'] + args, cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
+    output = output.decode('utf-8', 'replace')
     return output.strip() if strip_out else output
 
   @staticmethod
-  def CaptureStatus(files, cwd, upstream_branch):
+  def CaptureStatus(cwd, upstream_branch):
     """Returns git status.
 
-    @files can be a string (one file) or a list of files.
-
     Returns an array of (status, file) tuples."""
     if upstream_branch is None:
       upstream_branch = GIT.GetUpstreamBranch(cwd)
@@ -134,12 +129,6 @@ class GIT(object):
         raise gclient_utils.Error('Cannot determine upstream branch')
     command = ['-c', 'core.quotePath=false', 'diff',
                '--name-status', '--no-renames', '-r', '%s...' % upstream_branch]
-    if not files:
-      pass
-    elif isinstance(files, basestring):
-      command.append(files)
-    else:
-      command.extend(files)
     status = GIT.Capture(command, cwd)
     results = []
     if status:
@@ -147,7 +136,7 @@ class GIT(object):
         # 3-way merges can cause the status can be 'MMM' instead of 'M'. This
         # can happen when the user has 2 local branches and he diffs between
         # these 2 branches instead diffing to upstream.
-        m = re.match('^(\w)+\t(.+)$', statusline)
+        m = re.match(r'^(\w)+\t(.+)$', statusline)
         if not m:
           raise gclient_utils.Error(
               'status currently unsupported: %s' % statusline)
@@ -155,6 +144,33 @@ class GIT(object):
         results.append(('%s      ' % m.group(1)[0], m.group(2)))
     return results
 
+  @staticmethod
+  def GetConfig(cwd, key, default=None):
+    try:
+      return GIT.Capture(['config', key], cwd=cwd)
+    except subprocess2.CalledProcessError:
+      return default
+
+  @staticmethod
+  def GetBranchConfig(cwd, branch, key, default=None):
+    assert branch, 'A branch must be given'
+    key = 'branch.%s.%s' % (branch, key)
+    return GIT.GetConfig(cwd, key, default)
+
+  @staticmethod
+  def SetConfig(cwd, key, value=None):
+    if value is None:
+      args = ['config', '--unset', key]
+    else:
+      args = ['config', key, value]
+    GIT.Capture(args, cwd=cwd)
+
+  @staticmethod
+  def SetBranchConfig(cwd, branch, key, value=None):
+    assert branch, 'A branch must be given'
+    key = 'branch.%s.%s' % (branch, key)
+    GIT.SetConfig(cwd, key, value)
+
   @staticmethod
   def IsWorkTreeDirty(cwd):
     return GIT.Capture(['status', '-s'], cwd=cwd) != ''
@@ -162,10 +178,7 @@ class GIT(object):
   @staticmethod
   def GetEmail(cwd):
     """Retrieves the user email address if known."""
-    try:
-      return GIT.Capture(['config', 'user.email'], cwd=cwd)
-    except subprocess2.CalledProcessError:
-      return ''
+    return GIT.GetConfig(cwd, 'user.email', '')
 
   @staticmethod
   def ShortBranchName(branch):
@@ -175,55 +188,49 @@ class GIT(object):
   @staticmethod
   def GetBranchRef(cwd):
     """Returns the full branch reference, e.g. 'refs/heads/master'."""
-    return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
+    try:
+      return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
+    except subprocess2.CalledProcessError:
+      return None
 
   @staticmethod
   def GetBranch(cwd):
     """Returns the short branch name, e.g. 'master'."""
-    return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
+    branchref = GIT.GetBranchRef(cwd)
+    if branchref:
+      return GIT.ShortBranchName(branchref)
+    return None
+
+  @staticmethod
+  def GetRemoteBranches(cwd):
+    return GIT.Capture(['branch', '-r'], cwd=cwd).split()
 
   @staticmethod
-  def FetchUpstreamTuple(cwd):
-    """Returns a tuple containg remote and remote ref,
+  def FetchUpstreamTuple(cwd, branch=None):
+    """Returns a tuple containing remote and remote ref,
        e.g. 'origin', 'refs/heads/master'
     """
-    remote = '.'
-    branch = GIT.GetBranch(cwd)
     try:
-      upstream_branch = GIT.Capture(
-          ['config', '--local', 'branch.%s.merge' % branch], cwd=cwd)
+      branch = branch or GIT.GetBranch(cwd)
     except subprocess2.CalledProcessError:
-      upstream_branch = None
-    if upstream_branch:
-      try:
-        remote = GIT.Capture(
-            ['config', '--local', 'branch.%s.remote' % branch], cwd=cwd)
-      except subprocess2.CalledProcessError:
-        pass
-    else:
-      try:
-        upstream_branch = GIT.Capture(
-            ['config', '--local', 'rietveld.upstream-branch'], cwd=cwd)
-      except subprocess2.CalledProcessError:
-        upstream_branch = None
+      pass
+    if branch:
+      upstream_branch = GIT.GetBranchConfig(cwd, branch, 'merge')
       if upstream_branch:
-        try:
-          remote = GIT.Capture(
-              ['config', '--local', 'rietveld.upstream-remote'], cwd=cwd)
-        except subprocess2.CalledProcessError:
-          pass
-      else:
-        # Else, try to guess the origin remote.
-        remote_branches = GIT.Capture(['branch', '-r'], cwd=cwd).split()
-        if 'origin/master' in remote_branches:
-          # Fall back on origin/master if it exits.
-          remote = 'origin'
-          upstream_branch = 'refs/heads/master'
-        else:
-          # Give up.
-          remote = None
-          upstream_branch = None
-    return remote, upstream_branch
+        remote = GIT.GetBranchConfig(cwd, branch, 'remote', '.')
+        return remote, upstream_branch
+
+    upstream_branch = GIT.GetConfig(cwd, 'rietveld.upstream-branch')
+    if upstream_branch:
+      remote = GIT.GetConfig(cwd, 'rietveld.upstream-remote', '.')
+      return remote, upstream_branch
+
+    # Else, try to guess the origin remote.
+    if 'origin/master' in GIT.GetRemoteBranches(cwd):
+      # Fall back on origin/master if it exits.
+      return 'origin', 'refs/heads/master'
+
+    return None, None
 
   @staticmethod
   def RefToRemoteRef(ref, remote):
@@ -329,6 +336,12 @@ class GIT(object):
                '--name-only', branch + "..." + branch_head]
     return GIT.Capture(command, cwd=cwd).splitlines(False)
 
+  @staticmethod
+  def GetAllFiles(cwd):
+    """Returns the list of all files under revision control."""
+    command = ['-c', 'core.quotePath=false', 'ls-files', '--', '.']
+    return GIT.Capture(command, cwd=cwd).splitlines(False)
+
   @staticmethod
   def GetPatchName(cwd):
     """Constructs a name for this patch."""
@@ -363,33 +376,40 @@ class GIT(object):
     """Cleans up untracked file inside |relative_dir|."""
     return bool(GIT.Capture(['clean', '-df', relative_dir], cwd=cwd))
 
+  @staticmethod
+  def ResolveCommit(cwd, rev):
+    # We do this instead of rev-parse --verify rev^{commit}, since on Windows
+    # git can be either an executable or batch script, each of which requires
+    # escaping the caret (^) a different way.
+    if gclient_utils.IsFullGitSha(rev):
+      # git-rev parse --verify FULL_GIT_SHA always succeeds, even if we don't
+      # have FULL_GIT_SHA locally. Removing the last character forces git to
+      # check if FULL_GIT_SHA refers to an object in the local database.
+      rev = rev[:-1]
+    try:
+      return GIT.Capture(['rev-parse', '--quiet', '--verify', rev], cwd=cwd)
+    except subprocess2.CalledProcessError:
+      return None
+
   @staticmethod
   def IsValidRevision(cwd, rev, sha_only=False):
     """Verifies the revision is a proper git revision.
 
     sha_only: Fail unless rev is a sha hash.
     """
-    try:
-      sha = GIT.Capture(['rev-parse', '--verify', '%s^{commit}' % rev],
-                        cwd=cwd)
-      if sha_only:
-        return sha == rev.lower()
-      return True
-    except subprocess2.CalledProcessError:
+    sha = GIT.ResolveCommit(cwd, rev)
+    if sha is None:
       return False
+    if sha_only:
+      return sha == rev.lower()
+    return True
 
   @classmethod
   def AssertVersion(cls, min_version):
     """Asserts git's version is at least min_version."""
     if cls.current_version is None:
       current_version = cls.Capture(['--version'], '.')
-      matched = re.search(r'version ([0-9\.]+)', current_version.decode())
-      cls.current_version = matched.group(1)
-    current_version_list = list(map(only_int, cls.current_version.split('.')))
-    for min_ver in map(int, min_version.split('.')):
-      ver = current_version_list.pop(0)
-      if ver < min_ver:
-        return (False, cls.current_version)
-      elif ver > min_ver:
-        return (True, cls.current_version)
-    return (True, cls.current_version)
+      matched = re.search(r'git version (.+)', current_version)
+      cls.current_version = distutils.version.LooseVersion(matched.group(1))
+    min_version = distutils.version.LooseVersion(min_version)
+    return (min_version <= cls.current_version, cls.current_version)

data/vendor/depot_tools/setup_color.py

@@ -5,13 +5,43 @@
 
 from __future__ import print_function
 
+import ctypes
 import os
+import platform
+import subprocess
 import sys
 from third_party import colorama
 
 IS_TTY = None
 OUT_TYPE = 'unknown'
 
+
+def enable_native_ansi():
+  """Enables native ANSI sequences in console. Windows 10 only.
+
+  Returns whether successful.
+  """
+  kernel32 = ctypes.windll.kernel32
+  ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x04
+
+  out_handle = kernel32.GetStdHandle(subprocess.STD_OUTPUT_HANDLE)
+
+  # GetConsoleMode fails if the terminal isn't native.
+  mode = ctypes.wintypes.DWORD()
+  if kernel32.GetConsoleMode(out_handle, ctypes.byref(mode)) == 0:
+    return False
+
+  if not (mode.value & ENABLE_VIRTUAL_TERMINAL_PROCESSING):
+    if kernel32.SetConsoleMode(
+        out_handle, mode.value | ENABLE_VIRTUAL_TERMINAL_PROCESSING) == 0:
+      print(
+          'kernel32.SetConsoleMode to enable ANSI sequences failed',
+          file=sys.stderr)
+      return False
+
+  return True
+
+
 def init():
   # should_wrap instructs colorama to wrap stdout/stderr with an ASNI colorcode
   # interpreter that converts them to SetConsoleTextAttribute calls. This only
@@ -30,7 +60,6 @@ def init():
     OUT_TYPE = 'file (win)'
 
     import msvcrt
-    import ctypes
     h = msvcrt.get_osfhandle(sys.stdout.fileno())
     # h is the win32 HANDLE for stdout.
     ftype = ctypes.windll.kernel32.GetFileType(h)
@@ -67,7 +96,7 @@ def init():
         _fields_ = [('Name', UNICODE_STRING),
                     ('NameBuffer', ctypes.c_wchar_p)]
 
-      buf = ctypes.create_string_buffer('\0', 1024)
+      buf = ctypes.create_string_buffer(1024)
       # Ask NT what the name of the object our stdout HANDLE is. It would be
       # possible to use GetFileInformationByHandleEx, but it's only available
       # on Vista+. If you're reading this in 2017 or later, feel free to
@@ -88,6 +117,11 @@ def init():
     # This is non-windows, so we trust isatty.
     OUT_TYPE = 'pipe or file'
 
+  # Enable native ANSI color codes on Windows 10.
+  if IS_TTY and platform.release() == '10':
+    if enable_native_ansi():
+      should_wrap = False
+
   colorama.init(wrap=should_wrap)
 
 if __name__ == '__main__':