libv8 4.5.95.5 → 5.0.71.48.0beta2

data/vendor/depot_tools/repo

@@ -233,7 +233,7 @@ if (ver[0], ver[1]) < MIN_PYTHON_VERSION:
          % sys.version.split(' ')[0], file=sys.stderr)
   sys.exit(1)
 
-home_dot_repo = os.path.expanduser('~/.repoconfig')
+home_dot_repo = os.path.expanduser(os.path.join('~','.repoconfig'))
 gpg_dir = os.path.join(home_dot_repo, 'gnupg')
 
 extra_args = []

data/vendor/depot_tools/rietveld.py

@@ -15,10 +15,14 @@ The following hypothesis are made:
 """
 
 import copy
+import errno
 import json
 import logging
 import re
+import socket
 import ssl
+import StringIO
+import sys
 import time
 import urllib
 import urllib2
@@ -89,7 +93,7 @@ class Rietveld(object):
     url = '/%d/patchset/%d/get_depends_on_patchset' % (issue, patchset)
     resp = None
     try:
-      resp = json.loads(self.get(url))
+      resp = json.loads(self.post(url, []))
     except (urllib2.HTTPError, ValueError):
       # The get_depends_on_patchset endpoint does not exist on this Rietveld
       # instance yet. Ignore the error and proceed.
@@ -145,7 +149,7 @@ class Rietveld(object):
           out.append(patch.FilePatchDelete(filename, state['is_binary']))
         else:
           content = self.get_file_content(issue, patchset, state['id'])
-          if not content:
+          if not content or content == 'None':
             # As a precaution due to a bug in upload.py for git checkout, refuse
             # empty files. If it's empty, it's not a binary file.
             raise patch.UnsupportedPatchFormat(
@@ -310,7 +314,7 @@ class Rietveld(object):
     for key in sorted(three_state_keys):
       value = three_state_keys[key]
       if value is not None:
-        url += '&%s=%d' % (key, int(value) + 1)
+        url += '&%s=%s' % (key, value)
 
     if keys_only:
       url += '&keys_only=True'
@@ -406,39 +410,57 @@ class Rietveld(object):
         if m:
           # Fake an HTTPError exception. Cheezy. :(
           raise urllib2.HTTPError(
-              request_path, int(m.group(1)), msg, None, None)
+              request_path, int(m.group(1)), msg, None, StringIO.StringIO())
         old_error_exit(msg)
       upload.ErrorExit = trap_http_500
 
       for retry in xrange(self._maxtries):
         try:
           logging.debug('%s' % request_path)
-          result = self.rpc_server.Send(request_path, **kwargs)
-          # Sometimes GAE returns a HTTP 200 but with HTTP 500 as the content.
-          # How nice.
-          return result
+          return self.rpc_server.Send(request_path, **kwargs)
         except urllib2.HTTPError, e:
           if retry >= (self._maxtries - 1):
             raise
-          flake_codes = [500, 502, 503]
+          flake_codes = {500, 502, 503}
           if retry_on_404:
-            flake_codes.append(404)
+            flake_codes.add(404)
           if e.code not in flake_codes:
             raise
         except urllib2.URLError, e:
           if retry >= (self._maxtries - 1):
             raise
-          if (not 'Name or service not known' in e.reason and
-              not 'EOF occurred in violation of protocol' in e.reason):
-            # Usually internal GAE flakiness.
+
+          def is_transient():
+            # The idea here is to retry if the error isn't permanent.
+            # Unfortunately, there are so many different possible errors,
+            # that we end up enumerating those that are known to us to be
+            # transient.
+            # The reason can be a string or another exception, e.g.,
+            # socket.error or whatever else.
+            reason_as_str = str(e.reason)
+            for retry_anyway in (
+                'Name or service not known',
+                'EOF occurred in violation of protocol',
+                'timed out',
+                # See http://crbug.com/601260.
+                'urlopen error [Errno 10060] A connection attempt failed',
+                'urlopen error [Errno 104] Connection reset by peer',
+            ):
+              if retry_anyway in reason_as_str:
+                return True
+            return False  # Assume permanent otherwise.
+          if not is_transient():
             raise
-        except ssl.SSLError, e:
+        except socket.error, e:
           if retry >= (self._maxtries - 1):
             raise
           if not 'timed out' in str(e):
             raise
         # If reaching this line, loop again. Uses a small backoff.
         time.sleep(min(10, 1+retry*2))
+    except urllib2.HTTPError as e:
+      print 'Request to %s failed: %s' % (e.geturl(), e.read())
+      raise
     finally:
       upload.ErrorExit = old_error_exit
 
@@ -508,6 +530,11 @@ class OAuthRpcServer(object):
       payload: request is a POST if not None, GET otherwise
       timeout: in seconds
       extra_headers: (dict)
+
+    Returns: the HTTP response body as a string
+
+    Raises:
+      urllib2.HTTPError
     """
     # This method signature should match upload.py:AbstractRpcServer.Send()
     method = 'GET'
@@ -523,7 +550,6 @@ class OAuthRpcServer(object):
     try:
       if timeout:
         self._http.timeout = timeout
-      # TODO(pgervais) implement some kind of retry mechanism (see upload.py).
       url = self.host + request_path
       if kwargs:
         url += "?" + urllib.urlencode(kwargs)
@@ -552,6 +578,11 @@ class OAuthRpcServer(object):
           continue
         break
 
+      if ret[0].status >= 300:
+        raise urllib2.HTTPError(
+            request_path, int(ret[0]['status']), ret[1], None,
+            StringIO.StringIO())
+
       return ret[1]
 
     finally:

data/vendor/depot_tools/roll_dep.py

@@ -41,7 +41,34 @@ def is_pristine(root, merge_base='origin/master'):
               check_output(cmd + ['--cached'], cwd=root).strip())
 
 
-def roll(root, deps_dir, key, reviewers, bug):
+def get_log_url(upstream_url, head, master):
+  """Returns an URL to read logs via a Web UI if applicable."""
+  if re.match(r'https://[^/]*\.googlesource\.com/', upstream_url):
+    # gitiles
+    return '%s/+log/%s..%s' % (upstream_url, head[:12], master[:12])
+  if upstream_url.startswith('https://github.com/'):
+    upstream_url = upstream_url.rstrip('/')
+    if upstream_url.endswith('.git'):
+      upstream_url = upstream_url[:-len('.git')]
+    return '%s/compare/%s...%s' % (upstream_url, head[:12], master[:12])
+  return None
+
+
+def should_show_log(upstream_url):
+  """Returns True if a short log should be included in the tree."""
+  # Skip logs for very active projects.
+  if upstream_url.endswith((
+      '/angle/angle.git',
+      '/catapult-project/catapult.git',
+      '/v8/v8.git')):
+    return False
+  if 'webrtc' in upstream_url:
+    return False
+  return True
+
+
+def roll(root, deps_dir, roll_to, key, reviewers, bug, no_log, log_limit,
+         ignore_dirty_tree=False):
   deps = os.path.join(root, 'DEPS')
   try:
     with open(deps, 'rb') as f:
@@ -50,12 +77,12 @@ def roll(root, deps_dir, key, reviewers, bug):
     raise Error('Ensure the script is run in the directory '
                 'containing DEPS file.')
 
-  if not is_pristine(root):
-    raise Error('Ensure %s is clean first.' % root)
+  if not ignore_dirty_tree and not is_pristine(root):
+    raise Error('Ensure %s is clean first (no non-merged commits).' % root)
 
   full_dir = os.path.normpath(os.path.join(os.path.dirname(root), deps_dir))
   if not os.path.isdir(full_dir):
-    raise Error('Directory not found: %s' % deps_dir)
+    raise Error('Directory not found: %s (%s)' % (deps_dir, full_dir))
   head = check_output(['git', 'rev-parse', 'HEAD'], cwd=full_dir).strip()
 
   if not head in deps_content:
@@ -68,7 +95,7 @@ def roll(root, deps_dir, key, reviewers, bug):
     # It happens if the user checked out a branch in the dependency by himself.
     # Fall back to reading the DEPS to figure out the original commit.
     for i in deps_content.splitlines():
-      m = re.match(r'\s+"' + key + '": "([a-z0-9]{40})",', i)
+      m = re.match(r'\s+"' + key + '":.*"([a-z0-9]{40})",', i)
       if m:
         head = m.group(1)
         break
@@ -77,44 +104,61 @@ def roll(root, deps_dir, key, reviewers, bug):
 
   print('Found old revision %s' % head)
 
-  check_call(['git', 'fetch', 'origin'], cwd=full_dir)
-  master = check_output(
-      ['git', 'rev-parse', 'origin/master'], cwd=full_dir).strip()
-  print('Found new revision %s' % master)
+  check_call(['git', 'fetch', 'origin', '--quiet'], cwd=full_dir)
+  roll_to = check_output(['git', 'rev-parse', roll_to], cwd=full_dir).strip()
+  print('Found new revision %s' % roll_to)
 
-  if master == head:
+  if roll_to == head:
     raise Error('No revision to roll!')
 
-  commit_range = '%s..%s' % (head[:9], master[:9])
+  commit_range = '%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(
-      ['git', 'log', commit_range, '--date=short', '--format=%ad %ae %s'],
-      cwd=full_dir).strip()
+      cmd + ['--format=%ad %ae %s'], # Args with '=' are automatically quoted.
+      cwd=full_dir)
   logs = re.sub(r'(?m)^(\d\d\d\d-\d\d-\d\d [^@]+)@[^ ]+( .*)$', r'\1\2', logs)
-  cmd = 'git log %s --date=short --format=\'%%ad %%ae %%s\'' % commit_range
+  nb_commits = logs.count('\n')
+
+  header = 'Roll %s/ %s (%d commit%s).\n\n' % (
+      deps_dir,
+      commit_range,
+      nb_commits,
+      's' if nb_commits > 1 else '')
+
+  log_section = ''
+  if log_url:
+    log_section = log_url + '\n\n'
+  log_section += '$ %s ' % ' '.join(cmd)
+  log_section += '--format=\'%ad %ae %s\'\n'
+  if not no_log and should_show_log(upstream_url):
+    if logs.count('\n') > log_limit:
+      # Keep the first N log entries.
+      logs = ''.join(logs.splitlines(True)[:log_limit]) + '(...)\n'
+    log_section += logs
+  log_section += '\n'
+
   reviewer = 'R=%s\n' % ','.join(reviewers) if reviewers else ''
   bug = 'BUG=%s\n' % bug if bug else ''
-  msg = (
-      'Roll %s/ to %s.\n'
-      '\n'
-      '$ %s\n'
-      '%s\n\n'
-      '%s'
-      '%s') % (
-          deps_dir,
-          master,
-          cmd,
-          logs,
-          reviewer,
-          bug)
+  msg = header + log_section + reviewer + bug
 
   print('Commit message:')
   print('\n'.join('    ' + i for i in msg.splitlines()))
-  deps_content = deps_content.replace(head, master)
+  deps_content = deps_content.replace(head, roll_to)
   with open(deps, 'wb') as f:
     f.write(deps_content)
   check_call(['git', 'add', 'DEPS'], cwd=root)
-  check_call(['git', 'commit', '-m', msg], cwd=root)
+  check_call(['git', 'commit', '--quiet', '-m', msg], cwd=root)
+
+  # Pull the dependency to the right revision. This is surprising to users
+  # otherwise.
+  check_call(['git', 'checkout', '--quiet', roll_to], cwd=full_dir)
+
   print('')
   if not reviewers:
     print('You forgot to pass -r, make sure to insert a R=foo@example.com line')
@@ -126,13 +170,26 @@ def roll(root, deps_dir, key, reviewers, bug):
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
-  parser.add_argument('-r', '--reviewer',
+  parser.add_argument(
+      '--ignore-dirty-tree', action='store_true',
+      help='Roll anyways, even if there is a diff.')
+  parser.add_argument(
+      '-r', '--reviewer',
       help='To specify multiple reviewers, use comma separated list, e.g. '
            '-r joe,jane,john. Defaults to @chromium.org')
-  parser.add_argument('-b', '--bug')
-  parser.add_argument('dep_path', help='path to dependency')
+  parser.add_argument('-b', '--bug', help='Associate a bug number to the roll')
+  parser.add_argument(
+      '--no-log', action='store_true',
+      help='Do not include the short log in the commit message')
+  parser.add_argument(
+      '--log-limit', type=int, default=100,
+      help='Trim log after N commits (default: %(default)s)')
+  parser.add_argument(
+      '--roll-to', default='origin/master',
+      help='Specify the new commit to roll to (default: %(default)s)')
+  parser.add_argument('dep_path', help='Path to dependency')
   parser.add_argument('key', nargs='?',
-      help='regexp for dependency in DEPS file')
+      help='Regexp for dependency in DEPS file')
   args = parser.parse_args()
 
   reviewers = None
@@ -145,10 +202,14 @@ def main():
   try:
     roll(
         os.getcwd(),
-        args.dep_path,
+        args.dep_path.rstrip('/').rstrip('\\'),
+        args.roll_to,
         args.key,
-        reviewers=reviewers,
-        bug=args.bug)
+        reviewers,
+        args.bug,
+        args.no_log,
+        args.log_limit,
+        args.ignore_dirty_tree)
 
   except Error as e:
     sys.stderr.write('error: %s\n' % e)

data/vendor/depot_tools/scm.py

@@ -1040,10 +1040,10 @@ class SVN(object):
       auth_dir = os.path.join(os.environ['APPDATA'], 'Subversion', 'auth',
                               'svn.simple')
     else:
-      if not 'HOME' in os.environ:
+      auth_dir = os.path.expanduser(
+          os.path.join('~', '.subversion', 'auth', 'svn.simple'))
+      if not os.path.exists(auth_dir):
         return None
-      auth_dir = os.path.join(os.environ['HOME'], '.subversion', 'auth',
-                              'svn.simple')
     for credfile in os.listdir(auth_dir):
       cred_info = SVN.ReadSimpleAuth(os.path.join(auth_dir, credfile))
       if regexp.match(cred_info.get('svn:realmstring')):

data/vendor/depot_tools/setup_color.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+# Copyright (c) 2016 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+import os
+import sys
+from third_party import colorama
+
+IS_TTY = None
+OUT_TYPE = 'unknown'
+
+def init():
+  # should_wrap instructs colorama to wrap stdout/stderr with an ASNI colorcode
+  # interpreter that converts them to SetConsoleTextAttribute calls. This only
+  # should be True in cases where we're connected to cmd.exe's console. Setting
+  # this to True on non-windows systems has no effect.
+  should_wrap = False
+  global IS_TTY, OUT_TYPE
+  IS_TTY = sys.stdout.isatty()
+  if IS_TTY:
+    # Yay! We detected a console in the normal way. It doesn't really matter
+    # if it's windows or not, we win.
+    OUT_TYPE = 'console'
+    should_wrap = True
+  elif sys.platform.startswith('win'):
+    # assume this is some sort of file
+    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)
+    if ftype == 2: # FILE_TYPE_CHAR
+      # This is a normal cmd console, but we'll only get here if we're running
+      # inside a `git command` which is actually git->bash->command. Not sure
+      # why isatty doesn't detect this case.
+      OUT_TYPE = 'console (cmd via msys)'
+      IS_TTY = True
+      should_wrap = True
+    elif ftype == 3: # FILE_TYPE_PIPE
+      OUT_TYPE = 'pipe (win)'
+      # This is some kind of pipe on windows. This could either be a real pipe
+      # or this could be msys using a pipe to emulate a pty. We use the same
+      # algorithm that msys-git uses to determine if it's connected to a pty or
+      # not.
+
+      # This function and the structures are defined in the MSDN documentation
+      # using the same names.
+      def NT_SUCCESS(status):
+        # The first two bits of status are the severity. The success
+        # severities are 0 and 1, and the !success severities are 2 and 3.
+        # Therefore since ctypes interprets the default restype of the call
+        # to be an 'C int' (which is guaranteed to be signed 32 bits), All
+        # success codes are positive, and all !success codes are negative.
+        return status >= 0
+
+      class UNICODE_STRING(ctypes.Structure):
+        _fields_ = [('Length', ctypes.c_ushort),
+                    ('MaximumLength', ctypes.c_ushort),
+                    ('Buffer', ctypes.c_wchar_p)]
+
+      class OBJECT_NAME_INFORMATION(ctypes.Structure):
+        _fields_ = [('Name', UNICODE_STRING),
+                    ('NameBuffer', ctypes.c_wchar_p)]
+
+      buf = ctypes.create_string_buffer('\0', 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
+      # refactor this out.
+      #
+      # The '1' here is ObjectNameInformation
+      if NT_SUCCESS(ctypes.windll.ntdll.NtQueryObject(h, 1, buf, len(buf)-2,
+                    None)):
+        out = OBJECT_NAME_INFORMATION.from_buffer(buf)
+        name = out.Name.Buffer.split('\\')[-1]
+        IS_TTY = name.startswith('msys-') and '-pty' in name
+        if IS_TTY:
+          OUT_TYPE = 'bash (msys)'
+    else:
+      # A normal file, or an unknown file type.
+      pass
+  else:
+    # This is non-windows, so we trust isatty.
+    OUT_TYPE = 'pipe or file'
+
+  colorama.init(wrap=should_wrap)
+
+if __name__ == '__main__':
+  init()
+  print 'IS_TTY:', IS_TTY
+  print 'OUT_TYPE:', OUT_TYPE