libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/git_mark_merge_base.py

@@ -11,6 +11,8 @@ purposes of the chromium depot_tools git extensions. Passing no arguments will
 just print the effective merge base for the current branch.
 """
 
+from __future__ import print_function
+
 import argparse
 import sys
 
@@ -39,16 +41,16 @@ def main(argv):
     try:
       remove_merge_base(cur)
     except CalledProcessError:
-      print 'No merge base currently exists for %s.' % cur
+      print('No merge base currently exists for %s.' % cur)
     return 0
 
   if opts.merge_base:
     try:
       opts.merge_base = hash_one(opts.merge_base)
     except CalledProcessError:
-      print >> sys.stderr, (
-          'fatal: could not resolve %s as a commit' % (opts.merge_base)
-      )
+      print(
+          'fatal: could not resolve %s as a commit' % opts.merge_base,
+          file=sys.stderr)
       return 1
 
     manual_merge_base(cur, opts.merge_base, upstream(cur))
@@ -57,9 +59,9 @@ def main(argv):
   actual = get_or_create_merge_base(cur)
   if opts.merge_base and opts.merge_base != actual:
     ret = 1
-    print "Invalid merge_base %s" % opts.merge_base
+    print("Invalid merge_base %s" % opts.merge_base)
 
-  print "merge_base(%s): %s" % (cur, actual)
+  print("merge_base(%s): %s" % (cur, actual))
   return ret
 
 

data/vendor/depot_tools/git_nav_downstream.py

@@ -9,9 +9,12 @@ is more than one downstream branch, then this script will prompt you to select
 which branch.
 """
 
+from __future__ import print_function
+
 import argparse
 import sys
 
+import gclient_utils
 from git_common import current_branch, branches, upstream, run, hash_one
 import metrics
 
@@ -36,24 +39,24 @@ def main(args):
     cur = hash_one(cur)
   downstreams = [b for b in branches() if upfn(b) == cur]
   if not downstreams:
-    print "No downstream branches"
+    print("No downstream branches")
     return 1
   elif len(downstreams) == 1:
     run('checkout', downstreams[0], stdout=sys.stdout, stderr=sys.stderr)
   else:
     high = len(downstreams) - 1
     while True:
-      print "Please select a downstream branch"
+      print("Please select a downstream branch")
       for i, b in enumerate(downstreams):
-        print "  %d. %s" % (i, b)
+        print("  %d. %s" % (i, b))
       prompt = "Selection (0-%d)[0]: " % high
       r = opts.pick
       if r:
-        print prompt + r
+        print(prompt + r)
       else:
-        r = raw_input(prompt).strip() or '0'
+        r = gclient_utils.AskForData(prompt).strip() or '0'
       if not r.isdigit() or (0 > int(r) > high):
-        print "Invalid choice."
+        print("Invalid choice.")
       else:
         run('checkout', downstreams[int(r)], stdout=sys.stdout,
             stderr=sys.stderr)

data/vendor/depot_tools/git_new_branch.py

@@ -9,11 +9,44 @@ Create new branch tracking origin/master by default.
 import argparse
 import sys
 
+import git_common
 import subprocess2
 
-from git_common import run, root, set_config, get_or_create_merge_base, tags
-from git_common import hash_one, upstream, set_branch_config, current_branch
 
+def create_new_branch(
+    branch_name, upstream_current=False, upstream=None, inject_current=False):
+  upstream = upstream or git_common.root()
+  try:
+    if inject_current:
+      below = git_common.current_branch()
+      if below is None:
+        raise Exception('no current branch')
+      above = git_common.upstream(below)
+      if above is None:
+        raise Exception('branch %s has no upstream' % (below))
+      git_common.run('checkout', '--track', above, '-b', branch_name)
+      git_common.run('branch', '--set-upstream-to', branch_name, below)
+    elif upstream_current:
+      git_common.run('checkout', '--track', '-b', branch_name)
+    else:
+      if upstream in git_common.tags():
+        # TODO(iannucci): ensure that basis_ref is an ancestor of HEAD?
+        git_common.run(
+            'checkout', '--no-track', '-b', branch_name,
+            git_common.hash_one(upstream))
+        git_common.set_config('branch.%s.remote' % branch_name, '.')
+        git_common.set_config('branch.%s.merge' % branch_name, upstream)
+      else:
+        # TODO(iannucci): Detect unclean workdir then stash+pop if we need to
+        # teleport to a conflicting portion of history?
+        git_common.run('checkout', '--track', upstream, '-b', branch_name)
+    git_common.get_or_create_merge_base(branch_name)
+  except subprocess2.CalledProcessError as cpe:
+    sys.stdout.write(cpe.stdout.decode('utf-8', 'replace'))
+    sys.stderr.write(cpe.stderr.decode('utf-8', 'replace'))
+    return 1
+  sys.stderr.write('Switched to branch %s.\n' % branch_name)
+  return 0
 
 def main(args):
   parser = argparse.ArgumentParser(
@@ -25,7 +58,7 @@ def main(args):
   g.add_argument('--upstream-current', '--upstream_current',
                  action='store_true',
                  help='set upstream branch to current branch.')
-  g.add_argument('--upstream', metavar='REF', default=root(),
+  g.add_argument('--upstream', metavar='REF',
                  help='upstream branch (or tag) to track.')
   g.add_argument('--inject-current', '--inject_current',
                  action='store_true',
@@ -36,36 +69,9 @@ def main(args):
 
   opts = parser.parse_args(args)
 
-  try:
-    if opts.inject_current:
-      below = current_branch()
-      if below is None:
-        raise Exception('no current branch')
-      above = upstream(below)
-      if above is None:
-        raise Exception('branch %s has no upstream' % (below))
-      run('checkout', '--track', above, '-b', opts.branch_name)
-      run('branch', '--set-upstream-to', opts.branch_name, below)
-    elif opts.upstream_current:
-      run('checkout', '--track', '-b', opts.branch_name)
-    else:
-      if opts.upstream in tags():
-        # TODO(iannucci): ensure that basis_ref is an ancestor of HEAD?
-        run('checkout', '--no-track', '-b', opts.branch_name,
-            hash_one(opts.upstream))
-        set_config('branch.%s.remote' % opts.branch_name, '.')
-        set_config('branch.%s.merge' % opts.branch_name, opts.upstream)
-      else:
-        # TODO(iannucci): Detect unclean workdir then stash+pop if we need to
-        # teleport to a conflicting portion of history?
-        run('checkout', '--track', opts.upstream, '-b', opts.branch_name)
-    get_or_create_merge_base(opts.branch_name)
-  except subprocess2.CalledProcessError as cpe:
-    sys.stdout.write(cpe.stdout)
-    sys.stderr.write(cpe.stderr)
-    return 1
-  sys.stderr.write('Switched to branch %s.\n' % opts.branch_name)
-  return 0
+  return create_new_branch(
+      opts.branch_name, opts.upstream_current, opts.upstream,
+      opts.inject_current)
 
 
 if __name__ == '__main__':  # pragma: no cover

data/vendor/depot_tools/git_number.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env vpython3
 # Copyright 2013 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.
@@ -21,6 +21,9 @@ commit's entire history, this script caches all calculated data inside the git
 repo that it operates on in the ref 'refs/number/commits'.
 """
 
+from __future__ import print_function
+from __future__ import division
+
 import binascii
 import collections
 import logging
@@ -41,7 +44,7 @@ AUTHOR_NAME = 'git-number'
 AUTHOR_EMAIL = 'chrome-infrastructure-team@google.com'
 
 # Number of bytes to use for the prefix on our internal number structure.
-# 0 is slow to deserialize. 2 creates way too much bookeeping overhead (would
+# 0 is slow to deserialize. 2 creates way too much bookkeeping overhead (would
 # need to reimplement cache data structures to be a bit more sophisticated than
 # dicts. 1 seems to be just right.
 PREFIX_LEN = 1
@@ -57,7 +60,10 @@ def pathlify(hash_prefix):
   >>> pathlify('\xDE\xAD')
   'de/ad'
   """
-  return '/'.join('%02x' % ord(b) for b in hash_prefix)
+  if sys.version_info.major == 3:
+    return '/'.join('%02x' % b for b in hash_prefix)
+  else:
+    return '/'.join('%02x' % ord(b) for b in hash_prefix)
 
 
 @git.memoize_one(threadsafe=False)
@@ -73,9 +79,9 @@ def get_number_tree(prefix_bytes):
   ref = '%s:%s' % (REF, pathlify(prefix_bytes))
 
   try:
-    raw = buffer(git.run('cat-file', 'blob', ref, autostrip=False))
+    raw = git.run('cat-file', 'blob', ref, autostrip=False, decode=False)
     return dict(struct.unpack_from(CHUNK_FMT, raw, i * CHUNK_SIZE)
-                for i in xrange(len(raw) / CHUNK_SIZE))
+                for i in range(len(raw) // CHUNK_SIZE))
   except subprocess2.CalledProcessError:
     return {}
 
@@ -109,14 +115,15 @@ def intern_number_tree(tree):
   'c552317aa95ca8c3f6aae3357a4be299fbcb25ce'
   """
   with tempfile.TemporaryFile() as f:
-    for k, v in sorted(tree.iteritems()):
+    for k, v in sorted(tree.items()):
       f.write(struct.pack(CHUNK_FMT, k, v))
     f.seek(0)
     return git.intern_f(f)
 
 
-def leaf_map_fn((pre, tree)):
+def leaf_map_fn(pre_tree):
   """Converts a prefix and number tree into a git index line."""
+  pre, tree = pre_tree
   return '100644 blob %s\t%s\0' % (intern_number_tree(tree), pathlify(pre))
 
 
@@ -131,11 +138,11 @@ def finalize(targets):
   if not DIRTY_TREES:
     return
 
-  msg = 'git-number Added %s numbers' % sum(DIRTY_TREES.itervalues())
+  msg = 'git-number Added %s numbers' % sum(DIRTY_TREES.values())
 
   idx = os.path.join(git.run('rev-parse', '--git-dir'), 'number.idx')
   env = os.environ.copy()
-  env['GIT_INDEX_FILE'] = idx
+  env['GIT_INDEX_FILE'] = str(idx)
 
   progress_message = 'Finalizing: (%%(count)d/%d)' % len(DIRTY_TREES)
   with git.ProgressPrinter(progress_message) as inc:
@@ -147,7 +154,7 @@ def finalize(targets):
 
     with git.ScopedPool(kind=POOL_KIND) as leaf_pool:
       for item in leaf_pool.imap(leaf_map_fn, prefixes_trees):
-        updater.stdin.write(item)
+        updater.stdin.write(item.encode())
         inc()
 
     updater.stdin.close()
@@ -157,14 +164,14 @@ def finalize(targets):
     tree_id = git.run('write-tree', env=env)
     commit_cmd = [
         # Git user.name and/or user.email may not be configured, so specifying
-        # them explicitly. They are not used, but requried by Git.
+        # them explicitly. They are not used, but required by Git.
         '-c', 'user.name=%s' % AUTHOR_NAME,
         '-c', 'user.email=%s' % AUTHOR_EMAIL,
         'commit-tree',
         '-m', msg,
         '-p'] + git.hash_multi(REF)
     for t in targets:
-      commit_cmd.extend(['-p', binascii.hexlify(t)])
+      commit_cmd.extend(['-p', binascii.hexlify(t).decode()])
     commit_cmd.append(tree_id)
     commit_hash = git.run(*commit_cmd)
     git.run('update-ref', REF, commit_hash)
@@ -177,7 +184,11 @@ def preload_tree(prefix):
 
 
 def all_prefixes(depth=PREFIX_LEN):
-  for x in (chr(i) for i in xrange(255)):
+  if sys.version_info.major == 3:
+    prefixes = [bytes([i]) for i in range(255)]
+  else:
+    prefixes = [chr(i) for i in range(255)]
+  for x in prefixes:
     # This isn't covered because PREFIX_LEN currently == 1
     if depth > 1:  # pragma: no cover
       for r in all_prefixes(depth - 1):
@@ -206,7 +217,7 @@ def load_generation_numbers(targets):
     empty = git.mktree({})
     commit_hash = git.run(
         # Git user.name and/or user.email may not be configured, so specifying
-        # them explicitly. They are not used, but requried by Git.
+        # them explicitly. They are not used, but required by Git.
         '-c', 'user.name=%s' % AUTHOR_NAME,
         '-c', 'user.email=%s' % AUTHOR_EMAIL,
         'commit-tree',
@@ -225,9 +236,9 @@ def load_generation_numbers(targets):
       # stdout as they're produced). GIL strikes again :/
       cmd = [
         'rev-list', '--topo-order', '--parents', '--reverse', '^' + REF,
-      ] + map(binascii.hexlify, targets)
+      ] + [binascii.hexlify(target).decode() for target in targets]
       for line in git.run(*cmd).splitlines():
-        tokens = map(binascii.unhexlify, line.split())
+        tokens = [binascii.unhexlify(token) for token in line.split()]
         rev_list.append((tokens[0], tokens[1:]))
         inc()
 
@@ -278,7 +289,7 @@ def main():  # pragma: no cover
   if not opts.no_cache:
     finalize(targets)
 
-  print '\n'.join(map(str, map(get_num, targets)))
+  print('\n'.join(map(str, map(get_num, targets))))
   return 0
 
 

data/vendor/depot_tools/git_rebase_update.py

@@ -7,6 +7,8 @@
 Tool to update all branches to have the latest changes from their upstreams.
 """
 
+from __future__ import print_function
+
 import argparse
 import collections
 import logging
@@ -55,12 +57,12 @@ def fetch_remotes(branch_tree):
     dest_spec = fetchspec.partition(':')[2]
     remote_name = key.split('.')[1]
     fetchspec_map[dest_spec] = remote_name
-  for parent in branch_tree.itervalues():
+  for parent in branch_tree.values():
     if parent in tag_set:
       fetch_tags = True
     else:
       full_ref = git.run('rev-parse', '--symbolic-full-name', parent)
-      for dest_spec, remote_name in fetchspec_map.iteritems():
+      for dest_spec, remote_name in fetchspec_map.items():
         if fnmatch(full_ref, dest_spec):
           remotes.add(remote_name)
           break
@@ -76,7 +78,7 @@ def fetch_remotes(branch_tree):
   # TODO(iannucci): Should we fetch git-svn?
 
   if not fetch_args:  # pragma: no cover
-    print 'Nothing to fetch.'
+    print('Nothing to fetch.')
   else:
     git.run_with_stderr('fetch', *fetch_args, stdout=sys.stdout,
                         stderr=sys.stderr)
@@ -90,6 +92,9 @@ def remove_empty_branches(branch_tree):
   reparents = {}
   downstreams = collections.defaultdict(list)
   for branch, parent in git.topo_iter(branch_tree, top_down=False):
+    if git.is_dormant(branch):
+      continue
+
     downstreams[parent].append(branch)
 
     # If branch and parent have the same tree, then branch has to be marked
@@ -119,21 +124,21 @@ def remove_empty_branches(branch_tree):
           reparents[down] = (order, parent, old_parent)
 
   # Apply all reparenting recorded, in order.
-  for branch, value in sorted(reparents.iteritems(), key=lambda x:x[1][0]):
+  for branch, value in sorted(reparents.items(), key=lambda x:x[1][0]):
     _, parent, old_parent = value
     if parent in tag_set:
       git.set_branch_config(branch, 'remote', '.')
       git.set_branch_config(branch, 'merge', 'refs/tags/%s' % parent)
-      print ('Reparented %s to track %s [tag] (was tracking %s)'
-             % (branch, parent, old_parent))
+      print('Reparented %s to track %s [tag] (was tracking %s)' %
+            (branch, parent, old_parent))
     else:
       git.run('branch', '--set-upstream-to', parent, branch)
-      print ('Reparented %s to track %s (was tracking %s)'
-             % (branch, parent, old_parent))
+      print('Reparented %s to track %s (was tracking %s)' % (branch, parent,
+                                                             old_parent))
 
   # Apply all deletions recorded, in order.
-  for branch, _ in sorted(deletions.iteritems(), key=lambda x: x[1]):
-    print git.run('branch', '-d', branch)
+  for branch, _ in sorted(deletions.items(), key=lambda x: x[1]):
+    print(git.run('branch', '-d', branch))
 
 
 def rebase_branch(branch, parent, start_hash):
@@ -156,11 +161,11 @@ def rebase_branch(branch, parent, start_hash):
 
   if git.hash_one(parent) != start_hash:
     # Try a plain rebase first
-    print 'Rebasing:', branch
+    print('Rebasing:', branch)
     rebase_ret = git.rebase(parent, start_hash, branch, abort=True)
     if not rebase_ret.success:
       # TODO(iannucci): Find collapsible branches in a smarter way?
-      print "Failed! Attempting to squash", branch, "...",
+      print("Failed! Attempting to squash", branch, "...", end=' ')
       sys.stdout.flush()
       squash_branch = branch+"_squash_attempt"
       git.run('checkout', '-b', squash_branch)
@@ -172,12 +177,12 @@ def rebase_branch(branch, parent, start_hash):
       git.run('checkout', branch)
       git.run('branch', '-D', squash_branch)
       if squash_ret.success and empty_rebase:
-        print 'Success!'
+        print('Success!')
         git.squash_current_branch(merge_base=start_hash)
         git.rebase(parent, start_hash, branch)
       else:
-        print "Failed!"
-        print
+        print("Failed!")
+        print()
 
         # rebase and leave in mid-rebase state.
         # This second rebase attempt should always fail in the same
@@ -185,17 +190,16 @@ def rebase_branch(branch, parent, start_hash):
         # something very strange has happened.
         second_rebase_ret = git.rebase(parent, start_hash, branch)
         if second_rebase_ret.success: # pragma: no cover
-          print "Second rebase succeeded unexpectedly!"
-          print "Please see: http://crbug.com/425696"
-          print "First rebased failed with:"
-          print rebase_ret.stderr
+          print("Second rebase succeeded unexpectedly!")
+          print("Please see: http://crbug.com/425696")
+          print("First rebased failed with:")
+          print(rebase_ret.stderr)
         else:
-          print "Here's what git-rebase (squashed) had to say:"
-          print
-          print squash_ret.stdout
-          print squash_ret.stderr
-          print textwrap.dedent(
-          """\
+          print("Here's what git-rebase (squashed) had to say:")
+          print()
+          print(squash_ret.stdout)
+          print(squash_ret.stderr)
+          print(textwrap.dedent("""\
           Squashing failed. You probably have a real merge conflict.
 
           Your working copy is in mid-rebase. Either:
@@ -204,10 +208,10 @@ def rebase_branch(branch, parent, start_hash):
                  git config branch.%s.dormant true
 
           And then run `git rebase-update` again to resume.
-          """ % branch)
+          """ % branch))
           return False
   else:
-    print '%s up-to-date' % branch
+    print('%s up-to-date' % branch)
 
   git.remove_merge_base(branch)
   git.get_or_create_merge_base(branch)
@@ -228,6 +232,8 @@ def main(args=None):
   parser.add_argument('branches', nargs='*',
                       help='Branches to be rebased. All branches are assumed '
                            'if none specified.')
+  parser.add_argument('--keep-empty', '-e', action='store_true',
+                      help='Do not automatically delete empty branches.')
   opts = parser.parse_args(args)
 
   if opts.verbose:  # pragma: no cover
@@ -243,10 +249,8 @@ def main(args=None):
   if git.in_rebase():
     # TODO(iannucci): Be able to resume rebase with flags like --continue,
     # etc.
-    print (
-      'Rebase in progress. Please complete the rebase before running '
-      '`git rebase-update`.'
-    )
+    print('Rebase in progress. Please complete the rebase before running '
+          '`git rebase-update`.')
     return 1
 
   return_branch, return_workdir = find_return_branch_workdir()
@@ -254,7 +258,7 @@ def main(args=None):
 
   if git.current_branch() == 'HEAD':
     if git.run('status', '--porcelain'):
-      print 'Cannot rebase-update with detached head + uncommitted changes.'
+      print('Cannot rebase-update with detached head + uncommitted changes.')
       return 1
   else:
     git.freeze()  # just in case there are any local changes.
@@ -267,13 +271,13 @@ def main(args=None):
   if branches_to_rebase:
     skipped = set(skipped).intersection(branches_to_rebase)
   for branch in skipped:
-    print 'Skipping %s: No upstream specified' % branch
+    print('Skipping %s: No upstream specified' % branch)
 
   if not opts.no_fetch:
     fetch_remotes(branch_tree)
 
   merge_base = {}
-  for branch, parent in branch_tree.iteritems():
+  for branch, parent in branch_tree.items():
     merge_base[branch] = git.get_or_create_merge_base(branch, parent)
 
   logging.debug('branch_tree: %s' % pformat(branch_tree))
@@ -288,31 +292,32 @@ def main(args=None):
     if branches_to_rebase and branch not in branches_to_rebase:
       continue
     if git.is_dormant(branch):
-      print 'Skipping dormant branch', branch
+      print('Skipping dormant branch', branch)
     else:
       ret = rebase_branch(branch, parent, merge_base[branch])
       if not ret:
         retcode = 1
 
         if opts.keep_going:
-          print '--keep-going set, continuing with next branch.'
+          print('--keep-going set, continuing with next branch.')
           unrebased_branches.append(branch)
           if git.in_rebase():
             git.run_with_retcode('rebase', '--abort')
           if git.in_rebase():  # pragma: no cover
-            print 'Failed to abort rebase. Something is really wrong.'
+            print('Failed to abort rebase. Something is really wrong.')
             break
         else:
           break
 
   if unrebased_branches:
-    print
-    print 'The following branches could not be cleanly rebased:'
+    print()
+    print('The following branches could not be cleanly rebased:')
     for branch in unrebased_branches:
-      print '  %s' % branch
+      print('  %s' % branch)
 
   if not retcode:
-    remove_empty_branches(branch_tree)
+    if not opts.keep_empty:
+      remove_empty_branches(branch_tree)
 
     # return_branch may not be there any more.
     if return_branch in git.branches():
@@ -321,10 +326,8 @@ def main(args=None):
     else:
       root_branch = git.root()
       if return_branch != 'HEAD':
-        print (
-          "%r was merged with its parent, checking out %r instead."
-          % (return_branch, root_branch)
-        )
+        print("%s was merged with its parent, checking out %s instead." %
+              (git.unicode_repr(return_branch), git.unicode_repr(root_branch)))
       git.run('checkout', root_branch)
 
     # return_workdir may also not be there any more.
@@ -332,10 +335,8 @@ def main(args=None):
       try:
         os.chdir(return_workdir)
       except OSError as e:
-        print (
-          "Unable to return to original workdir %r: %s"
-          % (return_workdir, e)
-        )
+        print(
+            "Unable to return to original workdir %r: %s" % (return_workdir, e))
     git.set_config(STARTING_BRANCH_KEY, '')
     git.set_config(STARTING_WORKDIR_KEY, '')