libv8 7.3.492.27.3beta1 → 7.4.288.28.0beta1

data/vendor/depot_tools/git_cache.py

@@ -309,6 +309,23 @@ class Mirror(object):
                            '$GIT_CACHE_PATH is set.')
       return ret
 
+  @staticmethod
+  def _GetMostRecentCacheDirectory(ls_out_set):
+    ready_file_pattern = re.compile(r'.*/(\d+).ready$')
+    ready_dirs = []
+
+    for name in ls_out_set:
+      m = ready_file_pattern.match(name)
+      # Given <path>/<number>.ready,
+      # we are interested in <path>/<number> directory
+      if m and (name[:-len('.ready')] + '/') in ls_out_set:
+        ready_dirs.append((int(m.group(1)), name[:-len('.ready')]))
+
+    if not ready_dirs:
+      return None
+
+    return max(ready_dirs)[1]
+
   def Rename(self, src, dst):
     # This is somehow racy on Windows.
     # Catching OSError because WindowsError isn't portable and
@@ -384,26 +401,14 @@ class Mirror(object):
     # The .ready file is only uploaded when an entire directory has been
     # uploaded to GS.
     _, ls_out, ls_err = gsutil.check_call('ls', self._gs_path)
+    ls_out_set = set(ls_out.strip().splitlines())
+    latest_dir = self._GetMostRecentCacheDirectory(ls_out_set)
 
-    ready_file_pattern = re.compile(r'.*/(\d+).ready$')
-
-    objects = set(ls_out.strip().splitlines())
-    ready_dirs = []
-
-    for name in objects:
-      m = ready_file_pattern.match(name)
-      # Given <path>/<number>.ready,
-      # we are interested in <path>/<number> directory
-
-      if m and (name[:-len('.ready')] + '/') in objects:
-        ready_dirs.append((int(m.group(1)), name[:-len('.ready')]))
-
-    if not ready_dirs:
+    if not latest_dir:
       self.print('No bootstrap file for %s found in %s, stderr:\n  %s' %
                  (self.mirror_path, self.bootstrap_bucket,
                 '  '.join((ls_err or '').splitlines(True))))
       return False
-    latest_dir = max(ready_dirs)[1]
 
     try:
       # create new temporary directory locally
@@ -573,38 +578,49 @@ class Mirror(object):
     gsutil = Gsutil(path=self.gsutil_exe, boto_path=None)
 
     src_name = self.mirror_path
-    dest_name = '%s/%s' % (self._gs_path, gen_number)
-
-    # check to see if folder already exists in gs
-    _, ls_out, ls_err = gsutil.check_call('ls', dest_name)
-    _, ls_out_ready, ls_err_ready = (
-      gsutil.check_call('ls', dest_name + '.ready'))
-
-    # only printing out errors because the folder/ready file
-    # might not exist yet, so it will error no matter what
-    if ls_err:
-      print('Failed to check GS:\n%s' % (ls_err))
-    if ls_err_ready:
-      print('Failed to check GS:\n%s' % (ls_err_ready))
-
-    if not (ls_out == '' and ls_out_ready == ''):
-      print('Cache %s already exists' % dest_name)
+    dest_prefix = '%s/%s' % (self._gs_path, gen_number)
+
+    # ls_out lists contents in the format: gs://blah/blah/123...
+    _, ls_out, _ = gsutil.check_call('ls', self._gs_path)
+
+    # Check to see if folder already exists in gs
+    ls_out_set = set(ls_out.strip().splitlines())
+    if (dest_prefix + '/' in ls_out_set and
+        dest_prefix + '.ready' in ls_out_set):
+      print('Cache %s already exists.' % dest_prefix)
       return
 
     # Run Garbage Collect to compress packfile.
     self.RunGit(['gc', '--prune=all'])
 
-    gsutil.call('-m', 'cp', '-r', src_name, dest_name)
+    gsutil.call('-m', 'cp', '-r', src_name, dest_prefix)
 
-    #TODO(karenqian): prune old caches
-
-    # create .ready file and upload
+    # Create .ready file and upload
     _, ready_file_name =  tempfile.mkstemp(suffix='.ready')
     try:
-      gsutil.call('cp', ready_file_name, '%s.ready' % (dest_name))
+      gsutil.call('cp', ready_file_name, '%s.ready' % (dest_prefix))
     finally:
       os.remove(ready_file_name)
 
+    # remove all other directory/.ready files in the same gs_path
+    # except for the directory/.ready file previously created
+    # which can be used for bootstrapping while the current one is
+    # being uploaded
+    if not prune:
+      return
+    prev_dest_prefix = self._GetMostRecentCacheDirectory(ls_out_set)
+    if not prev_dest_prefix:
+      return
+    for path in ls_out_set:
+      if (path == prev_dest_prefix + '/' or
+          path == prev_dest_prefix + '.ready'):
+        continue
+      if path.endswith('.ready'):
+        gsutil.call('rm', path)
+        continue
+      gsutil.call('-m', 'rm', '-r', path)
+
+
   @staticmethod
   def DeleteTmpPackFiles(path):
     pack_dir = os.path.join(path, 'objects', 'pack')
@@ -869,4 +885,4 @@ if __name__ == '__main__':
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
-    sys.exit(1)
+    sys.exit(1)

data/vendor/depot_tools/git_cl.py

@@ -79,12 +79,29 @@ GIT_HASH_RE = re.compile(r'\b([a-f0-9]{6})[a-f0-9]{34}\b', flags=re.I)
 # Used to redact the cookies from the gitcookies file.
 GITCOOKIES_REDACT_RE = re.compile(r'1/.*')
 
+# The maximum number of traces we will keep. Multiplied by 3 since we store
+# 3 files per trace.
+MAX_TRACES = 3 * 10
+# Message to be displayed to the user to inform where to find the traces for a
+# git-cl upload execution.
 TRACES_MESSAGE = (
-'When filing a bug, be sure to include the traces found at:\n'
-'  %s.zip\n'
-'Consider including the git config and gitcookies,\n'
-'which we have packed for you at:\n'
-'  %s.zip\n')
+'\n'
+'The traces of this git-cl execution have been recorded at:\n'
+'  %(trace_name)s-traces.zip\n'
+'Copies of your gitcookies file and git config have been recorded at:\n'
+'  %(trace_name)s-git-info.zip\n')
+# Format of the message to be stored as part of the traces to give developers a
+# better context when they go through traces.
+TRACES_README_FORMAT = (
+'Date: %(now)s\n'
+'\n'
+'Change: https://%(gerrit_host)s/q/%(change_id)s\n'
+'Title: %(title)s\n'
+'\n'
+'%(description)s\n'
+'\n'
+'Execution time: %(execution_time)s\n'
+'Exit code: %(exit_code)s\n') + TRACES_MESSAGE
 
 COMMIT_BOT_EMAIL = 'commit-bot@chromium.org'
 POSTUPSTREAM_HOOK = '.git/hooks/post-cl-land'
@@ -205,6 +222,12 @@ def time_time():
   return time.time()
 
 
+def datetime_now():
+  # Use this so that it can be mocked in tests without interfering with python
+  # system machinery.
+  return datetime.datetime.now()
+
+
 def ask_for_data(prompt):
   try:
     return raw_input(prompt)
@@ -1998,14 +2021,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       if gerrit_auth == git_auth:
         return
       all_gsrc = cookie_auth.get_auth_header('d0esN0tEx1st.googlesource.com')
-      print((
+      print(
           'WARNING: You have different credentials for Gerrit and git hosts:\n'
           '           %s\n'
           '           %s\n'
           '        Consider running the following command:\n'
           '          git cl creds-check\n'
           '        %s\n'
-          '        %s') %
+          '        %s' %
           (git_host, self._gerrit_host,
            ('Hint: delete creds for .googlesource.com' if all_gsrc else ''),
            cookie_auth.get_new_password_message(git_host)))
@@ -2496,18 +2519,73 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
       else:
         print('OK, will keep Gerrit commit-msg hook in place.')
 
-  def _RunGitPushWithTraces(self, change_desc, refspec, refspec_opts):
+  def _CleanUpOldTraces(self):
+    """Keep only the last |MAX_TRACES| traces."""
+    try:
+      traces = sorted([
+        os.path.join(TRACES_DIR, f)
+        for f in os.listdir(TRACES_DIR)
+        if (os.path.isfile(os.path.join(TRACES_DIR, f))
+            and not f.startswith('tmp'))
+      ])
+      traces_to_delete = traces[:-MAX_TRACES]
+      for trace in traces_to_delete:
+          os.remove(trace)
+    except OSError:
+      print('WARNING: Failed to remove old git traces from\n'
+            '  %s'
+            'Consider removing them manually.' % TRACES_DIR)
+
+  def _WriteGitPushTraces(self, trace_name, traces_dir, git_push_metadata):
+    """Zip and write the git push traces stored in traces_dir."""
     gclient_utils.safe_makedirs(TRACES_DIR)
+    traces_zip = trace_name + '-traces'
+    traces_readme = trace_name + '-README'
+    # Create a temporary dir to store git config and gitcookies in. It will be
+    # compressed and stored next to the traces.
+    git_info_dir = tempfile.mkdtemp()
+    git_info_zip = trace_name + '-git-info'
+
+    git_push_metadata['now'] = datetime_now().strftime('%c')
+    git_push_metadata['trace_name'] = trace_name
+    gclient_utils.FileWrite(
+        traces_readme, TRACES_README_FORMAT % git_push_metadata)
+
+    # Keep only the first 6 characters of the git hashes on the packet
+    # trace. This greatly decreases size after compression.
+    packet_traces = os.path.join(traces_dir, 'trace-packet')
+    if os.path.isfile(packet_traces):
+      contents = gclient_utils.FileRead(packet_traces)
+      gclient_utils.FileWrite(
+          packet_traces, GIT_HASH_RE.sub(r'\1', contents))
+    shutil.make_archive(traces_zip, 'zip', traces_dir)
+
+    # Collect and compress the git config and gitcookies.
+    git_config = RunGit(['config', '-l'])
+    gclient_utils.FileWrite(
+        os.path.join(git_info_dir, 'git-config'),
+        git_config)
+
+    cookie_auth = gerrit_util.Authenticator.get()
+    if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
+      gitcookies_path = cookie_auth.get_gitcookies_path()
+      if os.path.isfile(gitcookies_path):
+        gitcookies = gclient_utils.FileRead(gitcookies_path)
+        gclient_utils.FileWrite(
+            os.path.join(git_info_dir, 'gitcookies'),
+            GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
+    shutil.make_archive(git_info_zip, 'zip', git_info_dir)
+
+    gclient_utils.rmtree(git_info_dir)
 
+  def _RunGitPushWithTraces(
+      self, change_desc, refspec, refspec_opts, git_push_metadata):
+    """Run git push and collect the traces resulting from the execution."""
     # Create a temporary directory to store traces in. Traces will be compressed
     # and stored in a 'traces' dir inside depot_tools.
     traces_dir = tempfile.mkdtemp()
-    trace_name = os.path.basename(traces_dir)
-    traces_zip = os.path.join(TRACES_DIR, trace_name + '-traces')
-    # Create a temporary dir to store git config and gitcookies in. It will be
-    # compressed and stored next to the traces.
-    git_info_dir = tempfile.mkdtemp()
-    git_info_zip = os.path.join(TRACES_DIR, trace_name + '-git-info')
+    trace_name = os.path.join(
+        TRACES_DIR, datetime_now().strftime('%Y%m%dT%H%M%S.%f'))
 
     env = os.environ.copy()
     env['GIT_REDACT_COOKIES'] = 'o,SSO,GSSO_Uberproxy'
@@ -2518,9 +2596,10 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
 
     try:
       push_returncode = 0
+      remote_url = self.GetRemoteUrl()
       before_push = time_time()
       push_stdout = gclient_utils.CheckCallAndFilter(
-          ['git', 'push', self.GetRemoteUrl(), refspec],
+          ['git', 'push', remote_url, refspec],
           env=env,
           print_stdout=True,
           # Flush after every line: useful for seeing progress when running as
@@ -2532,8 +2611,15 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
                    'for the reason of the failure.\n'
                    'Hint: run command below to diagnose common Git/Gerrit '
                    'credential problems:\n'
-                   '  git cl creds-check\n' +
-                   TRACES_MESSAGE % (traces_zip, git_info_zip),
+                   '  git cl creds-check\n'
+                   '\n'
+                   'If git-cl is not working correctly, file a bug under the '
+                   'Infra>SDK component including the files below.\n'
+                   'Review the files before upload, since they might contain '
+                   'sensitive information.\n'
+                   'Set the Restrict-View-Google label so that they are not '
+                   'publicly accessible.\n'
+                   + TRACES_MESSAGE % {'trace_name': trace_name},
                    change_desc)
     finally:
       execution_time = time_time() - before_push
@@ -2544,31 +2630,11 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
         'arguments': metrics_utils.extract_known_subcommand_args(refspec_opts),
       })
 
-      if push_returncode != 0:
-        # Keep only the first 6 characters of the git hashes on the packet
-        # trace. This greatly decreases size after compression.
-        packet_traces = os.path.join(traces_dir, 'trace-packet')
-        contents = gclient_utils.FileRead(packet_traces)
-        gclient_utils.FileWrite(
-            packet_traces, GIT_HASH_RE.sub(r'\1', contents))
-        shutil.make_archive(traces_zip, 'zip', traces_dir)
+      git_push_metadata['execution_time'] = execution_time
+      git_push_metadata['exit_code'] = push_returncode
+      self._WriteGitPushTraces(trace_name, traces_dir, git_push_metadata)
 
-        # Collect and compress the git config and gitcookies.
-        git_config = RunGit(['config', '-l'])
-        gclient_utils.FileWrite(
-            os.path.join(git_info_dir, 'git-config'),
-            git_config)
-
-        cookie_auth = gerrit_util.Authenticator.get()
-        if isinstance(cookie_auth, gerrit_util.CookiesAuthenticator):
-          gitcookies_path = cookie_auth.get_gitcookies_path()
-          gitcookies = gclient_utils.FileRead(gitcookies_path)
-          gclient_utils.FileWrite(
-              os.path.join(git_info_dir, 'gitcookies'),
-              GITCOOKIES_REDACT_RE.sub('REDACTED', gitcookies))
-        shutil.make_archive(git_info_zip, 'zip', git_info_dir)
-
-      gclient_utils.rmtree(git_info_dir)
+      self._CleanUpOldTraces()
       gclient_utils.rmtree(traces_dir)
 
     return push_stdout
@@ -2822,7 +2888,14 @@ class _GerritChangelistImpl(_ChangelistCodereviewBase):
           'spaces not allowed in refspec: "%s"' % refspec_suffix)
     refspec = '%s:refs/for/%s%s' % (ref_to_push, branch, refspec_suffix)
 
-    push_stdout = self._RunGitPushWithTraces(change_desc, refspec, refspec_opts)
+    git_push_metadata = {
+        'gerrit_host': self._GetGerritHost(),
+        'title': title or '<untitled>',
+        'change_id': change_id,
+        'description': change_desc.description,
+    }
+    push_stdout = self._RunGitPushWithTraces(
+        change_desc, refspec, refspec_opts, git_push_metadata)
 
     if options.squash:
       regex = re.compile(r'remote:\s+https?://[\w\-\.\+\/#]*/(\d+)\s.*')

data/vendor/depot_tools/git_drover.py

@@ -4,6 +4,8 @@
 # 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
@@ -452,7 +454,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
@@ -43,16 +45,16 @@ 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
 

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
@@ -229,23 +231,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
 
 

data/vendor/depot_tools/git_freezer.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 sys
 import optparse
 
@@ -26,7 +28,7 @@ def main(args):
   dispatcher = subcommand.CommandDispatcher(__name__)
   ret = dispatcher.execute(optparse.OptionParser(), args)
   if ret:
-    print ret
+    print(ret)
   return 0