libv8 6.7.288.46.1 → 7.3.492.27.0beta1

data/vendor/depot_tools/roll_dep.py

@@ -18,6 +18,27 @@ import subprocess
 import sys
 
 NEED_SHELL = sys.platform.startswith('win')
+GCLIENT_PATH = os.path.join(
+    os.path.dirname(os.path.abspath(__file__)), 'gclient.py')
+
+
+# Commit subject that will be considered a roll. In the format generated by the
+# git log used, so it's "<year>-<month>-<day> <author> <subject>"
+_ROLL_SUBJECT = re.compile(
+    # Date
+    r'^\d\d\d\d-\d\d-\d\d '
+    # Author
+    r'[^ ]+ '
+    # Subject
+    r'('
+      # Generated by
+      # https://skia.googlesource.com/buildbot/+/master/autoroll/go/repo_manager/deps_repo_manager.go
+      r'Roll [^ ]+ [a-f0-9]+\.\.[a-f0-9]+ \(\d+ commits\)'
+      r'|'
+      # Generated by
+      # https://chromium.googlesource.com/infra/infra/+/master/recipes/recipe_modules/recipe_autoroller/api.py
+      r'Roll recipe dependencies \(trivial\)\.'
+    r')$')
 
 
 class Error(Exception):
@@ -70,22 +91,9 @@ def should_show_log(upstream_url):
   return True
 
 
-def get_gclient_root():
-  gclient = os.path.join(
-      os.path.dirname(os.path.abspath(__file__)), 'gclient.py')
-  return check_output([sys.executable, gclient, 'root']).strip()
-
-
-def get_deps(root):
-  """Returns the path and the content of the DEPS file."""
-  deps_path = os.path.join(root, 'DEPS')
-  try:
-    with open(deps_path, 'rb') as f:
-      deps_content = f.read()
-  except (IOError, OSError):
-    raise Error('Ensure the script is run in the directory '
-                'containing DEPS file.')
-  return deps_path, deps_content
+def gclient(args):
+  """Executes gclient with the given args and returns the stdout."""
+  return check_output([sys.executable, GCLIENT_PATH] + args).strip()
 
 
 def generate_commit_message(
@@ -101,10 +109,7 @@ def generate_commit_message(
       cwd=full_dir).rstrip()
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
   lines = logs.splitlines()
-  cleaned_lines = [
-      l for l in lines
-      if not l.endswith('recipe-roller Roll recipe dependencies (trivial).')
-  ]
+  cleaned_lines = [l for l in lines if not _ROLL_SUBJECT.match(l)]
   logs = '\n'.join(cleaned_lines) + '\n'
 
   nb_commits = len(lines)
@@ -124,17 +129,19 @@ def generate_commit_message(
   # 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 log entries.
-      logs = ''.join(logs.splitlines(True)[:log_limit]) + '(...)\n'
+      # 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:]
+      logs = ''.join(lines)
     log_section += logs
   return header + log_section
 
 
-def calculate_roll(full_dir, dependency, gclient_dict, roll_to):
+def calculate_roll(full_dir, dependency, roll_to):
   """Calculates the roll for a dependency by processing gclient_dict, and
   fetching the dependency via git.
   """
-  head = gclient_eval.GetRevision(gclient_dict, dependency)
+  head = gclient(['getdep', '-r', dependency])
   if not head:
     raise Error('%s is unpinned.' % dependency)
   check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
@@ -142,7 +149,7 @@ def calculate_roll(full_dir, dependency, gclient_dict, roll_to):
   return head, roll_to
 
 
-def gen_commit_msg(logs, cmdline, rolls, reviewers, bug):
+def gen_commit_msg(logs, cmdline, reviewers, bug):
   """Returns the final commit message."""
   commit_msg = ''
   if len(logs) > 1:
@@ -150,25 +157,21 @@ def gen_commit_msg(logs, cmdline, rolls, reviewers, bug):
   commit_msg += '\n\n'.join(logs)
   commit_msg += '\nCreated with:\n  ' + cmdline + '\n'
   commit_msg += 'R=%s\n' % ','.join(reviewers) if reviewers else ''
-  commit_msg += 'BUG=%s\n' % bug if bug else ''
+  commit_msg += '\nBug: %s\n' % bug if bug else ''
   return commit_msg
 
 
-def finalize(commit_msg, deps_path, deps_content, rolls, is_relative, root_dir):
-  """Edits the DEPS file, commits it, then uploads a CL."""
+def finalize(commit_msg, current_dir, rolls):
+  """Commits changes to the DEPS file, then uploads a CL."""
   print('Commit message:')
   print('\n'.join('    ' + i for i in commit_msg.splitlines()))
 
-  with open(deps_path, 'wb') as f:
-    f.write(deps_content)
-  current_dir = os.path.dirname(deps_path)
   check_call(['git', 'add', 'DEPS'], cwd=current_dir)
   check_call(['git', 'commit', '--quiet', '-m', commit_msg], cwd=current_dir)
 
   # Pull the dependency to the right revision. This is surprising to users
   # otherwise.
-  for dependency, (_head, roll_to) in sorted(rolls.iteritems()):
-    full_dir = os.path.normpath(os.path.join(root_dir, dependency))
+  for _head, roll_to, full_dir in sorted(rolls.itervalues()):
     check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
 
 
@@ -213,7 +216,7 @@ def main():
       if not '@' in r:
         reviewers[i] = r + '@chromium.org'
 
-  gclient_root = get_gclient_root()
+  gclient_root = gclient(['root'])
   current_dir = os.getcwd()
   dependencies = sorted(d.rstrip('/').rstrip('\\') for d in args.dep_path)
   cmdline = 'roll-dep ' + ' '.join(dependencies) + ''.join(
@@ -224,17 +227,17 @@ def main():
           'Ensure %s is clean first (no non-merged commits).' % current_dir)
     # First gather all the information without modifying anything, except for a
     # git fetch.
-    deps_path, deps_content = get_deps(current_dir)
-    gclient_dict = gclient_eval.Exec(deps_content, deps_path)
-    is_relative = gclient_dict.get('use_relative_paths', False)
-    root_dir = current_dir if is_relative else gclient_root
     rolls = {}
     for dependency in dependencies:
-      full_dir = os.path.normpath(os.path.join(root_dir, dependency))
+      full_dir = os.path.normpath(os.path.join(gclient_root, dependency))
       if not os.path.isdir(full_dir):
-        raise Error('Directory not found: %s (%s)' % (dependency, full_dir))
-      head, roll_to = calculate_roll(
-          full_dir, dependency, gclient_dict, args.roll_to)
+        print('Dependency %s not found at %s' % (dependency, full_dir))
+        full_dir = os.path.normpath(os.path.join(current_dir, dependency))
+        print('Will look for relative dependency at %s' % full_dir)
+        if not os.path.isdir(full_dir):
+          raise Error('Directory not found: %s (%s)' % (dependency, full_dir))
+
+      head, roll_to = calculate_roll(full_dir, dependency, args.roll_to)
       if roll_to == head:
         if len(dependencies) == 1:
           raise AlreadyRolledError('No revision to roll!')
@@ -242,20 +245,20 @@ def main():
       else:
         print(
             '%s: Rolling from %s to %s' % (dependency, head[:10], roll_to[:10]))
-        rolls[dependency] = (head, roll_to)
+        rolls[dependency] = (head, roll_to, full_dir)
 
     logs = []
-    for dependency, (head, roll_to) in sorted(rolls.iteritems()):
-      full_dir = os.path.normpath(os.path.join(root_dir, dependency))
+    setdep_args = []
+    for dependency, (head, roll_to, full_dir) in sorted(rolls.iteritems()):
       log = generate_commit_message(
           full_dir, dependency, head, roll_to, args.no_log, args.log_limit)
       logs.append(log)
-      gclient_eval.SetRevision(gclient_dict, dependency, roll_to)
+      setdep_args.extend(['-r', '{}@{}'.format(dependency, roll_to)])
 
-    deps_content = gclient_eval.RenderDEPSFile(gclient_dict)
+    gclient(['setdep'] + setdep_args)
 
-    commit_msg = gen_commit_msg(logs, cmdline, rolls, reviewers, args.bug)
-    finalize(commit_msg, deps_path, deps_content, rolls, is_relative, root_dir)
+    commit_msg = gen_commit_msg(logs, cmdline, reviewers, args.bug)
+    finalize(commit_msg, current_dir, rolls)
   except Error as e:
     sys.stderr.write('error: %s\n' % e)
     return 2 if isinstance(e, AlreadyRolledError) else 1

data/vendor/depot_tools/scm.py

@@ -4,8 +4,8 @@
 
 """SCM-specific utility classes."""
 
-import cStringIO
 import glob
+import io
 import logging
 import os
 import platform
@@ -20,8 +20,9 @@ import subprocess2
 
 
 def ValidateEmail(email):
-  return (re.match(r"^[a-zA-Z0-9._%-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
-          is not None)
+  return (
+      re.match(r"^[a-zA-Z0-9._%\-+]+@[a-zA-Z0-9._%-]+.[a-zA-Z]{2,6}$", email)
+      is not None)
 
 
 def GetCasedPath(path):
@@ -50,7 +51,7 @@ def GenFakeDiff(filename):
   filename = filename.replace(os.sep, '/')
   nb_lines = len(file_content)
   # We need to use / since patch on unix will fail otherwise.
-  data = cStringIO.StringIO()
+  data = io.StringIO()
   data.write("Index: %s\n" % filename)
   data.write('=' * 67 + '\n')
   # Note: Should we use /dev/null instead?
@@ -225,7 +226,7 @@ class GIT(object):
     return remote, upstream_branch
 
   @staticmethod
-  def RefToRemoteRef(ref, remote=None):
+  def RefToRemoteRef(ref, remote):
     """Convert a checkout ref to the equivalent remote ref.
 
     Returns:
@@ -239,10 +240,24 @@ class GIT(object):
     m = re.match('^(refs/(remotes/)?)?branch-heads/', ref or '')
     if m:
       return ('refs/remotes/branch-heads/', ref.replace(m.group(0), ''))
-    if remote:
-      m = re.match('^((refs/)?remotes/)?%s/|(refs/)?heads/' % remote, ref or '')
-      if m:
-        return ('refs/remotes/%s/' % remote, ref.replace(m.group(0), ''))
+
+    m = re.match('^((refs/)?remotes/)?%s/|(refs/)?heads/' % remote, ref or '')
+    if m:
+      return ('refs/remotes/%s/' % remote, ref.replace(m.group(0), ''))
+
+    return None
+
+  @staticmethod
+  def RemoteRefToRef(ref, remote):
+    assert remote, 'A remote must be given'
+    if not ref or not ref.startswith('refs/'):
+      return None
+    if not ref.startswith('refs/remotes/'):
+      return ref
+    if ref.startswith('refs/remotes/branch-heads/'):
+      return 'refs' + ref[len('refs/remotes'):]
+    if ref.startswith('refs/remotes/%s/' % remote):
+      return 'refs/heads' + ref[len('refs/remotes/%s' % remote):]
     return None
 
   @staticmethod
@@ -255,6 +270,15 @@ class GIT(object):
         upstream_branch = ''.join(remote_ref)
     return upstream_branch
 
+  @staticmethod
+  def IsAncestor(cwd, maybe_ancestor, ref):
+    """Verifies if |maybe_ancestor| is an ancestor of |ref|."""
+    try:
+      GIT.Capture(['merge-base', '--is-ancestor', maybe_ancestor, ref], cwd=cwd)
+      return True
+    except subprocess2.CalledProcessError:
+      return False
+
   @staticmethod
   def GetOldContents(cwd, filename, branch=None):
     if not branch:
@@ -345,20 +369,11 @@ class GIT(object):
 
     sha_only: Fail unless rev is a sha hash.
     """
-    # 'git rev-parse foo' where foo is *any* 40 character hex string will return
-    # the string and return code 0. So strip one character to force 'git
-    # rev-parse' to do a hash table look-up and returns 128 if the hash is not
-    # present.
-    lookup_rev = rev
-    if re.match(r'^[0-9a-fA-F]{40}$', rev):
-      lookup_rev = rev[:-1]
     try:
-      sha = GIT.Capture(['rev-parse', lookup_rev], cwd=cwd).lower()
-      if lookup_rev != rev:
-        # Make sure we get the original 40 chars back.
-        return rev.lower() == sha
+      sha = GIT.Capture(['rev-parse', '--verify', '%s^{commit}' % rev],
+                        cwd=cwd)
       if sha_only:
-        return sha.startswith(rev.lower())
+        return sha == rev.lower()
       return True
     except subprocess2.CalledProcessError:
       return False
@@ -368,9 +383,9 @@ class GIT(object):
     """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)
+      matched = re.search(r'version ([0-9\.]+)', current_version.decode())
       cls.current_version = matched.group(1)
-    current_version_list = map(only_int, cls.current_version.split('.'))
+    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:

data/vendor/depot_tools/setup_color.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 os
 import sys
 from third_party import colorama
@@ -90,5 +92,5 @@ def init():
 
 if __name__ == '__main__':
   init()
-  print 'IS_TTY:', IS_TTY
-  print 'OUT_TYPE:', OUT_TYPE
+  print('IS_TTY:', IS_TTY)
+  print('OUT_TYPE:', OUT_TYPE)

data/vendor/depot_tools/split_cl.py

@@ -19,6 +19,13 @@ import owners_finder
 import git_common as git
 
 
+# If a call to `git cl split` will generate more than this number of CLs, the
+# command will prompt the user to make sure they know what they're doing. Large
+# numbers of CLs generated by `git cl split` have caused infrastructure issues
+# in the past.
+CL_SPLIT_FORCE_LIMIT = 10
+
+
 def ReadFile(file_path):
   """Returns the content of |file_path|."""
   with open(file_path) as f:
@@ -67,7 +74,8 @@ def AddUploadedByGitClSplitToDescription(description):
 
 
 def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
-             description, comment, reviewers, changelist, cmd_upload):
+             description, comment, reviewers, changelist, cmd_upload,
+             cq_dry_run, enable_auto_submit):
   """Uploads a CL with all changes to |files| in |refactor_branch|.
 
   Args:
@@ -81,6 +89,8 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
     reviewers: A set of reviewers for the CL.
     changelist: The Changelist class.
     cmd_upload: The function associated with the git cl upload command.
+    cq_dry_run: If CL uploads should also do a cq dry run.
+    enable_auto_submit: If CL uploads should also enable auto submit.
   """
   # Create a branch.
   if not CreateBranchForDirectory(
@@ -107,9 +117,13 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
     os.remove(tmp_file.name)
 
   # Upload a CL.
-  upload_args = ['-f', '--cq-dry-run', '-r', ','.join(reviewers)]
+  upload_args = ['-f', '-r', ','.join(reviewers)]
+  if cq_dry_run:
+    upload_args.append('--cq-dry-run')
   if not comment:
     upload_args.append('--send-mail')
+  if enable_auto_submit:
+    upload_args.append('--enable-auto-submit')
   print 'Uploading CL for ' + directory + '.'
   cmd_upload(upload_args)
   if comment:
@@ -156,7 +170,8 @@ def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
   print
 
 
-def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run):
+def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
+            cq_dry_run, enable_auto_submit):
   """"Splits a branch into smaller branches and uploads CLs.
 
   Args:
@@ -165,6 +180,8 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run):
     changelist: The Changelist class.
     cmd_upload: The function associated with the git cl upload command.
     dry_run: Whether this is a dry run (no branches or CLs created).
+    cq_dry_run: If CL uploads should also do a cq dry run.
+    enable_auto_submit: If CL uploads should also enable auto submit.
 
   Returns:
     0 in case of success. 1 in case of error.
@@ -198,6 +215,16 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run):
     num_cls = len(files_split_by_owners)
     print('Will split current branch (' + refactor_branch + ') into ' +
           str(num_cls) + ' CLs.\n')
+    if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
+      print (
+        'This will generate "%r" CLs. This many CLs can potentially generate'
+        ' too much load on the build infrastructure. Please email'
+        ' infra-dev@chromium.org to ensure that this won\'t  break anything.'
+        ' The infra team reserves the right to cancel your jobs if they are'
+        ' overloading the CQ.') % num_cls
+      answer = raw_input('Proceed? (y/n):')
+      if answer.lower() != 'y':
+        return 0
 
     for cl_index, (directory, files) in \
         enumerate(files_split_by_owners.iteritems(), 1):
@@ -212,7 +239,8 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run):
                     reviewers)
       else:
         UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
-                 description, comment, reviewers, changelist, cmd_upload)
+                 description, comment, reviewers, changelist, cmd_upload,
+                 cq_dry_run, enable_auto_submit)
 
     # Go back to the original branch.
     git.run('checkout', refactor_branch)

data/vendor/depot_tools/subprocess2.py

@@ -7,16 +7,34 @@
 In theory you shouldn't need anything else in subprocess, or this module failed.
 """
 
-import cStringIO
+import codecs
 import errno
+import io
 import logging
 import os
-import Queue
+
+try:
+  import Queue
+except ImportError:  # For Py3 compatibility
+  import queue as Queue
+
 import subprocess
 import sys
 import time
 import threading
 
+# Cache the string-escape codec to ensure subprocess can find it later.
+# See crbug.com/912292#c2 for context.
+if sys.version_info.major == 2:
+  codecs.lookup('string-escape')
+
+# TODO(crbug.com/953884): Remove this when python3 migration is done.
+try:
+  basestring
+except NameError:
+  # pylint: disable=redefined-builtin
+  basestring = str
+
 
 # Constants forwarded from subprocess.
 PIPE = subprocess.PIPE
@@ -244,7 +262,7 @@ class Popen(subprocess.Popen):
     try:
       with self.popen_lock:
         super(Popen, self).__init__(args, **kwargs)
-    except OSError, e:
+    except OSError as e:
       if e.errno == errno.EAGAIN and sys.platform == 'cygwin':
         # Convert fork() emulation failure into a CygwinRebaseError().
         raise CygwinRebaseError(
@@ -281,7 +299,7 @@ class Popen(subprocess.Popen):
 
     def write_stdin():
       try:
-        stdin_io = cStringIO.StringIO(input)
+        stdin_io = io.BytesIO(input)
         while True:
           data = stdin_io.read(1024)
           if data: