libv8 7.3.492.27.3beta1 → 7.4.288.28.0beta1

data/vendor/depot_tools/cit.py

@@ -14,6 +14,8 @@ This tool does a two things:
 
 # TODO(hinoka,iannucci): Pre-pack infra tools in cipd package with vpython spec.
 
+from __future__ import print_function
+
 import argparse
 import sys
 import os
@@ -102,20 +104,20 @@ def get_available_tools():
 
 def usage():
   infra_tools, cipd_tools = get_available_tools()
-  print """usage: cit.py <name of tool> [args for tool]
+  print("""usage: cit.py <name of tool> [args for tool]
 
   Wrapper for maintaining and calling tools in:
     "infra.git/run.py infra.tools.*"
     "infra.git/cipd/*"
 
-  Available infra tools are:"""
+  Available infra tools are:""")
   for tool in infra_tools:
-    print '  * %s' % tool
+    print('  * %s' % tool)
 
-  print """
-  Available cipd tools are:"""
+  print("""
+  Available cipd tools are:""")
   for tool in cipd_tools:
-    print '  * %s' % tool
+    print('  * %s' % tool)
 
 
 def run(args):
@@ -137,7 +139,7 @@ def run(args):
   elif os.path.isfile(cipd_file) and is_exe(cipd_file):
     cmd = [cipd_file]
   else:
-    print >>sys.stderr, 'Unknown tool "%s"' % tool_name
+    print('Unknown tool "%s"' % tool_name, file=sys.stderr)
     return usage()
 
   # Add the remaining arguments.

data/vendor/depot_tools/clang_format.py

@@ -9,6 +9,8 @@ clang-format binaries are pulled down from Google Cloud Storage whenever you
 sync Chrome, to platform-specific locations. This script knows how to locate
 those tools, assuming the script is invoked from inside a Chromium checkout."""
 
+from __future__ import print_function
+
 import gclient_paths
 import os
 import subprocess
@@ -63,7 +65,8 @@ def main(args):
   # redirection can be a little opaque.
   help_syntax = ('-h', '--help', '-help', '-help-list', '--help-list')
   if any(match in args for match in help_syntax):
-    print '\nDepot tools redirects you to the clang-format at:\n    %s\n' % tool
+    print(
+        '\nDepot tools redirects you to the clang-format at:\n    %s\n' % tool)
 
   return subprocess.call([tool] + args)
 

data/vendor/depot_tools/clang_format_merge_driver.py

@@ -14,6 +14,8 @@ See https://git-scm.com/docs/gitattributes ("Defining a custom merge
 driver") for more details.
 """
 
+from __future__ import print_function
+
 import subprocess
 import sys
 
@@ -29,14 +31,14 @@ def main():
   base, current, others, file_name_in_tree = sys.argv[1:5]
 
   if file_name_in_tree == '%P':
-    print >>sys.stderr
-    print >>sys.stderr, 'ERROR: clang-format merge driver needs git 2.5+'
+    print(file=sys.stderr)
+    print('ERROR: clang-format merge driver needs git 2.5+', file=sys.stderr)
     if sys.platform == 'darwin':
-      print >>sys.stderr, 'Upgrade to Xcode 7.2+'
-    print >>sys.stderr
+      print('Upgrade to Xcode 7.2+', file=sys.stderr)
+    print(file=sys.stderr)
     return 1
 
-  print 'Running clang-format 3-way merge driver on ' + file_name_in_tree
+  print('Running clang-format 3-way merge driver on ' + file_name_in_tree)
 
   try:
     tool = clang_format.FindClangFormatToolInChromiumTree()
@@ -56,8 +58,8 @@ def main():
       with open(fpath, 'wb') as output_file:
         output_file.write(output)
   except clang_format.NotFoundError, e:
-    print e
-    print 'Failed to find clang-format. Falling-back on standard 3-way merge'
+    print(e)
+    print('Failed to find clang-format. Falling-back on standard 3-way merge')
 
   return subprocess.call(['git', 'merge-file', '-Lcurrent', '-Lbase', '-Lother',
                           current, base, others])

data/vendor/depot_tools/compile_single_file.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 os
 import subprocess
@@ -47,7 +49,7 @@ def main():
   abs_build_dir = os.path.join(src_dir, options.build_dir)
   src_relpath = os.path.relpath(options.file_path, abs_build_dir)
 
-  print 'Building %s' % options.file_path
+  print('Building %s' % options.file_path)
 
   ninja_exec = 'ninja'
   carets = '^'

data/vendor/depot_tools/dart_format.py

@@ -10,6 +10,8 @@ dartfmt binaries are pulled down during gclient sync in the mojo repo.
 This tool is named dart_format.py instead of dartfmt to parallel
 clang_format.py, which is in this same repository."""
 
+from __future__ import print_function
+
 import os
 import subprocess
 import sys
@@ -42,14 +44,14 @@ def main(args):
   try:
     tool = FindDartFmtToolInChromiumTree()
   except NotFoundError, e:
-    print >> sys.stderr, e
+    print(e, file=sys.stderr)
     sys.exit(1)
 
   # Add some visibility to --help showing where the tool lives, since this
   # redirection can be a little opaque.
   help_syntax = ('-h', '--help', '-help', '-help-list', '--help-list')
   if any(match in args for match in help_syntax):
-    print '\nDepot tools redirects you to the dartfmt at:\n    %s\n' % tool
+    print('\nDepot tools redirects you to the dartfmt at:\n    %s\n' % tool)
 
   return subprocess.call([tool] + sys.argv[1:])
 

data/vendor/depot_tools/depot-tools-auth.py

@@ -11,6 +11,8 @@ Usage:
   depot-tools-auth logout codereview.chromium.org
 """
 
+from __future__ import print_function
+
 import logging
 import optparse
 import sys
@@ -39,7 +41,7 @@ def CMDlogout(parser, args):
   """Revokes cached authentication token and removes it from disk."""
   _, authenticator = parser.parse_args(args)
   done = authenticator.logout()
-  print 'Done.' if done else 'Already logged out.'
+  print('Done.' if done else 'Already logged out.')
   return 0
 
 
@@ -54,12 +56,12 @@ def CMDinfo(parser, args):
 
 def print_token_info(hostname, authenticator):
   token_info = authenticator.get_token_info()
-  print 'Logged in to %s as %s.' % (hostname, token_info['email'])
-  print ''
-  print 'To login with a different email run:'
-  print '  depot-tools-auth login %s' % hostname
-  print 'To logout and purge the authentication token run:'
-  print '  depot-tools-auth logout %s' % hostname
+  print('Logged in to %s as %s.' % (hostname, token_info['email']))
+  print('')
+  print('To login with a different email run:')
+  print('  depot-tools-auth login %s' % hostname)
+  print('To logout and purge the authentication token run:')
+  print('  depot-tools-auth logout %s' % hostname)
 
 
 class OptionParser(optparse.OptionParser):
@@ -89,7 +91,7 @@ def main(argv):
   try:
     return dispatcher.execute(OptionParser(), argv)
   except auth.AuthenticationError as e:
-    print >> sys.stderr, e
+    print(e, file=sys.stderr)
     return 1
 
 

data/vendor/depot_tools/fix_encoding.py

@@ -6,6 +6,8 @@
 multiple platforms with python.
 """
 
+from __future__ import print_function
+
 import codecs
 import locale
 import os
@@ -22,8 +24,9 @@ def complain(message):
   to our wrapper. So be paranoid about catching errors and reporting them
   to sys.__stderr__, so that the user has a higher chance to see them.
   """
-  print >> sys.__stderr__, (
-      isinstance(message, str) and message or repr(message))
+  print(
+      isinstance(message, str) and message or repr(message),
+      file=sys.__stderr__)
 
 
 def fix_default_encoding():

data/vendor/depot_tools/gclient-new-workdir.py

@@ -7,6 +7,8 @@
 #    gclient-new-workdir.py [options] <repository> <new_workdir>
 #
 
+from __future__ import print_function
+
 import argparse
 import os
 import shutil

data/vendor/depot_tools/gclient.py

@@ -1650,12 +1650,11 @@ it or fix the checkout.
               # clean checkout.
               gclient_scm.scm.GIT.CleanupDir(par_scm_root, rel_e_dir)
               assert not os.path.exists(os.path.join(e_dir, '.git'))
-              print(('\nWARNING: \'%s\' has been moved from DEPS to a higher '
-                     'level checkout. The git folder containing all the local'
-                     ' branches has been saved to %s.\n'
-                     'If you don\'t care about its state you can safely '
-                     'remove that folder to free up space.') %
-                    (entry, save_dir))
+              print('\nWARNING: \'%s\' has been moved from DEPS to a higher '
+                    'level checkout. The git folder containing all the local'
+                    ' branches has been saved to %s.\n'
+                    'If you don\'t care about its state you can safely '
+                    'remove that folder to free up space.' % (entry, save_dir))
               continue
 
         if scm_root in full_entries:
@@ -1684,9 +1683,9 @@ it or fix the checkout.
                   should_recurse=False,
                   relative=None,
                   condition=None))
-          print(('\nWARNING: \'%s\' is no longer part of this client.\n'
-                 'It is recommended that you manually remove it or use '
-                 '\'gclient sync -D\' next time.') % entry_fixed)
+          print('\nWARNING: \'%s\' is no longer part of this client.\n'
+                'It is recommended that you manually remove it or use '
+                '\'gclient sync -D\' next time.' % entry_fixed)
         else:
           # Delete the entry
           print('\n________ deleting \'%s\' in \'%s\'' % (

data/vendor/depot_tools/gclient_scm.py

@@ -256,9 +256,10 @@ class GitWrapper(SCMWrapper):
   def _GetDiffFilenames(self, base):
     """Returns the names of files modified since base."""
     return self._Capture(
-      # Filter to remove base if it is None.
-      filter(bool, ['-c', 'core.quotePath=false', 'diff', '--name-only', base])
-    ).split()
+        # Filter to remove base if it is None.
+        list(filter(bool, ['-c', 'core.quotePath=false', 'diff', '--name-only',
+                           base])
+        )).split()
 
   def diff(self, options, _args, _file_list):
     _, revision = gclient_utils.SplitUrlRevision(self.url)
@@ -372,25 +373,25 @@ class GitWrapper(SCMWrapper):
                'Candidate refs were %s.' % (commit, remote_refs))
     return None
 
-  def apply_patch_ref(self, patch_repo, patch_ref, target_branch, options,
+  def apply_patch_ref(self, patch_repo, patch_ref, target_ref, options,
                       file_list):
     """Apply a patch on top of the revision we're synced at.
 
     The patch ref is given by |patch_repo|@|patch_ref|, and the current revision
     is |base_rev|.
-    We also need the |target_branch| that the patch was uploaded against. We use
+    We also need the |target_ref| that the patch was uploaded against. We use
     it to find a merge base between |patch_rev| and |base_rev|, so we can find
     what commits constitute the patch:
 
     Graphically, it looks like this:
 
-     ... -> merge_base -> [possibly already landed commits] -> target_branch
+     ... -> merge_base -> [possibly already landed commits] -> target_ref
                        \
                         -> [possibly not yet landed dependent CLs] -> patch_rev
 
     Next, we apply the commits |merge_base..patch_rev| on top of whatever is
     currently checked out, denoted |base_rev|. Typically, it'd be a revision
-    from |target_branch|, but this is not required.
+    from |target_ref|, but this is not required.
 
     Graphically, we cherry pick |merge_base..patch_rev| on top of |base_rev|:
 
@@ -402,7 +403,7 @@ class GitWrapper(SCMWrapper):
     Args:
       patch_repo: The patch origin. e.g. 'https://foo.googlesource.com/bar'
       patch_ref: The ref to the patch. e.g. 'refs/changes/1234/34/1'.
-      target_branch: The branch the patch was uploaded against.
+      target_ref: The ref the patch was uploaded against.
           e.g. 'refs/heads/master' or 'refs/heads/infra/config'.
       options: The options passed to gclient.
       file_list: A list where modified files will be appended.
@@ -416,25 +417,49 @@ class GitWrapper(SCMWrapper):
 
     base_rev = self._Capture(['rev-parse', 'HEAD'])
 
-    if target_branch:
-      # Convert the target branch to a remote ref if possible.
-      remote_ref = scm.GIT.RefToRemoteRef(target_branch, self.remote)
-      if remote_ref:
-        target_branch = ''.join(remote_ref)
+    if not target_ref:
+      target_ref = self._GetTargetBranchForCommit(base_rev) or base_rev
+    elif not target_ref.startswith(('refs/heads/', 'refs/branch-heads/')):
+      # TODO(ehmaldonado): Support all refs.
+      raise gclient_utils.Error(
+          'target_ref must be in refs/heads/** or refs/branch-heads/**. '
+          'Got %s instead.' % target_ref)
+    elif target_ref == 'refs/heads/master':
+      # We handle refs/heads/master separately because bot_update treats it
+      # differently than other refs: it will fetch refs/heads/foo to
+      # refs/heads/foo, but refs/heads/master to refs/remotes/origin/master.
+      # It's not strictly necessary, but it simplifies the rest of the code.
+      target_ref = 'refs/remotes/%s/master' % self.remote
+    elif scm.GIT.IsValidRevision(self.checkout_path, target_ref):
+      # The target ref for the change is already available, so we don't need to
+      # do anything.
+      # This is a common case. When applying a patch to a top-level solution,
+      # bot_update will fetch the target ref for the change and sync the
+      # solution to it.
+      pass
     else:
-      target_branch = self._GetTargetBranchForCommit(base_rev)
-
-    # Fallback to the commit we got.
-    # This means that apply_path_ref will try to find the merge-base between the
-    # patch and the commit (which is most likely the commit) and cherry-pick
-    # everything in between.
-    if not target_branch:
-      target_branch = base_rev
+      # The target ref is not available. We check next for a remote version of
+      # it (e.g. refs/remotes/origin/<branch>) and fetch it if it's not
+      # available.
+      self.Print('%s is not an existing ref.' % target_ref)
+      original_target_ref = target_ref
+      target_ref = ''.join(scm.GIT.RefToRemoteRef(target_ref, self.remote))
+      self.Print('Trying with %s' % target_ref)
+      if not scm.GIT.IsValidRevision(self.checkout_path, target_ref):
+        self.Print(
+            '%s is not an existing ref either. Will proceed to fetch it.'
+            % target_ref)
+        url, _ = gclient_utils.SplitUrlRevision(self.url)
+        mirror = self._GetMirror(url, options, target_ref)
+        if mirror:
+          self._UpdateMirrorIfNotContains(
+              mirror, options, 'branch', target_ref, original_target_ref)
+        self._Fetch(options, refspec=target_ref)
 
     self.Print('===Applying patch ref===')
     self.Print('Patch ref is %r @ %r. Target branch for patch is %r. '
                'Current HEAD is %r. Current dir is %r' % (
-                   patch_repo, patch_ref, target_branch, base_rev,
+                   patch_repo, patch_ref, target_ref, base_rev,
                    self.checkout_path))
     self._Capture(['reset', '--hard'])
     self._Capture(['fetch', patch_repo, patch_ref])
@@ -446,9 +471,9 @@ class GitWrapper(SCMWrapper):
       else:
         # Find the merge-base between the branch_rev and patch_rev to find out
         # the changes we need to cherry-pick on top of base_rev.
-        merge_base = self._Capture(['merge-base', target_branch, patch_rev])
+        merge_base = self._Capture(['merge-base', target_ref, patch_rev])
         self.Print('Merge base of %s and %s is %s' % (
-            target_branch, patch_rev, merge_base))
+            target_ref, patch_rev, merge_base))
         if merge_base == patch_rev:
           # If the merge-base is patch_rev, it means patch_rev is already part
           # of the history, so just check it out.
@@ -467,9 +492,9 @@ class GitWrapper(SCMWrapper):
 
     except subprocess2.CalledProcessError as e:
       self.Print('Failed to apply patch.')
-      self.Print('Patch ref is %r @ %r. Target branch for patch is %r. '
+      self.Print('Patch ref is %r @ %r. Target ref for patch is %r. '
                  'Current HEAD is %r. Current dir is %r' % (
-                     patch_repo, patch_ref, target_branch, base_rev,
+                     patch_repo, patch_ref, target_ref, base_rev,
                      self.checkout_path))
       self.Print('git returned non-zero exit status %s:\n%s' % (
           e.returncode, e.stderr))
@@ -606,7 +631,7 @@ class GitWrapper(SCMWrapper):
     # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
     # This allows devs to use experimental repos which have a different url
     # but whose branch(s) are the same as official repos.
-    if (current_url.rstrip(b'/') != url.rstrip('/') and url != 'git://foo' and
+    if (current_url.rstrip('/') != url.rstrip('/') and url != 'git://foo' and
         subprocess2.capture(
             ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
             cwd=self.checkout_path).strip() != 'False'):
@@ -1282,7 +1307,8 @@ class GitWrapper(SCMWrapper):
     kwargs.setdefault('stderr', subprocess2.PIPE)
     strip = kwargs.pop('strip', True)
     env = scm.GIT.ApplyEnvVars(kwargs)
-    ret = subprocess2.check_output(['git'] + args, env=env, **kwargs)
+    ret = subprocess2.check_output(
+        ['git'] + args, env=env, **kwargs).decode('utf-8')
     if strip:
       ret = ret.strip()
     return ret

data/vendor/depot_tools/gclient_utils.py

@@ -433,10 +433,20 @@ class Annotated(Wrapper):
 
     # Continue lockless.
     obj[0] += out
-    while '\n' in obj[0]:
-      line, remaining = obj[0].split('\n', 1)
-      if line:
-        self._wrapped.write('%d>%s\n' % (index, line))
+    while True:
+      # TODO(agable): find both of these with a single pass.
+      cr_loc = obj[0].find('\r')
+      lf_loc = obj[0].find('\n')
+      if cr_loc == lf_loc == -1:
+        break
+      elif cr_loc == -1 or (lf_loc >= 0 and lf_loc < cr_loc):
+        line, remaining = obj[0].split('\n', 1)
+        if line:
+          self._wrapped.write('%d>%s\n' % (index, line))
+      elif lf_loc == -1 or (cr_loc >= 0 and cr_loc < lf_loc):
+        line, remaining = obj[0].split('\r', 1)
+        if line:
+          self._wrapped.write('%d>%s\r' % (index, line))
       obj[0] = remaining
 
   def flush(self):

data/vendor/depot_tools/gerrit_util.py

@@ -8,6 +8,8 @@ Utilities for requesting information for a gerrit server via https.
 https://gerrit-review.googlesource.com/Documentation/rest-api.html
 """
 
+from __future__ import print_function
+
 import base64
 import contextlib
 import cookielib
@@ -166,10 +168,10 @@ class CookiesAuthenticator(Authenticator):
 
     st = os.stat(path)
     if st.st_mode & (stat.S_IRWXG | stat.S_IRWXO):
-      print >> sys.stderr, (
+      print(
           'WARNING: netrc file %s cannot be used because its file '
           'permissions are insecure.  netrc file permissions should be '
-          '600.' % path)
+          '600.' % path, file=sys.stderr)
     with open(path) as fd:
       content = fd.read()
 
@@ -189,11 +191,11 @@ class CookiesAuthenticator(Authenticator):
     try:
       return netrc.netrc(path)
     except IOError:
-      print >> sys.stderr, 'WARNING: Could not read netrc file %s' % path
+      print('WARNING: Could not read netrc file %s' % path, file=sys.stderr)
       return netrc.netrc(os.devnull)
     except netrc.NetrcParseError as e:
-      print >> sys.stderr, ('ERROR: Cannot use netrc file %s due to a '
-                            'parsing error: %s' % (path, e))
+      print('ERROR: Cannot use netrc file %s due to a parsing error: %s' %
+          (path, e), file=sys.stderr)
       return netrc.netrc(os.devnull)
 
   @classmethod
@@ -786,7 +788,7 @@ def AddReviewers(host, change, reviewers=None, ccs=None, notify=True,
      'reviewer': r,
      'state': state,
      'notify': 'NONE',  # We handled `notify` argument above.
-   })
+    })
 
   conn = CreateHttpConn(host, path, reqtype='POST', body=body)
   # Gerrit will return 400 if one or more of the requested reviewers are