libv8 5.1.281.59.1 → 5.2.361.43.0

data/vendor/depot_tools/git_common.py

@@ -32,8 +32,10 @@ import threading
 
 import subprocess2
 
-ROOT = os.path.abspath(os.path.dirname(__file__))
+from StringIO import StringIO
+
 
+ROOT = os.path.abspath(os.path.dirname(__file__))
 IS_WIN = sys.platform == 'win32'
 GIT_EXE = ROOT+'\\git.bat' if IS_WIN else 'git'
 TEST_MODE = False
@@ -90,6 +92,12 @@ GIT_TRANSIENT_ERRORS = (
     # crbug.com/430343
     # TODO(dnj): Resync with Chromite.
     r'The requested URL returned error: 5\d+',
+
+    r'Connection reset by peer',
+
+    r'Unable to look up',
+
+    r'Couldn\'t resolve host',
 )
 
 GIT_TRANSIENT_ERRORS_RE = re.compile('|'.join(GIT_TRANSIENT_ERRORS),
@@ -281,6 +289,10 @@ def once(function):
 
 ## Git functions
 
+def die(message, *args):
+  print >> sys.stderr, textwrap.dedent(message % args)
+  sys.exit(1)
+
 
 def blame(filename, revision=None, porcelain=False, *_args):
   command = ['blame']
@@ -293,23 +305,14 @@ def blame(filename, revision=None, porcelain=False, *_args):
 
 
 def branch_config(branch, option, default=None):
-  return config('branch.%s.%s' % (branch, option), default=default)
-
-
-def config_regexp(pattern):
-  if IS_WIN: # pragma: no cover
-    # this madness is because we call git.bat which calls git.exe which calls
-    # bash.exe (or something to that effect). Each layer divides the number of
-    # ^'s by 2.
-    pattern = pattern.replace('^', '^' * 8)
-  return run('config', '--get-regexp', pattern).splitlines()
+  return get_config('branch.%s.%s' % (branch, option), default=default)
 
 
 def branch_config_map(option):
   """Return {branch: <|option| value>} for all branches."""
   try:
     reg = re.compile(r'^branch\.(.*)\.%s$' % option)
-    lines = config_regexp(reg.pattern)
+    lines = get_config_regexp(reg.pattern)
     return {reg.match(k).group(1): v for k, v in (l.split() for l in lines)}
   except subprocess2.CalledProcessError:
     return {}
@@ -319,23 +322,22 @@ def branches(*args):
   NO_BRANCH = ('* (no branch', '* (detached', '* (HEAD detached')
 
   key = 'depot-tools.branch-limit'
-  limit = 20
-  try:
-    limit = int(config(key, limit))
-  except ValueError:
-    pass
+  limit = get_config_int(key, 20)
 
   raw_branches = run('branch', *args).splitlines()
 
   num = len(raw_branches)
+
   if num > limit:
-    print >> sys.stderr, textwrap.dedent("""\
-    Your git repo has too many branches (%d/%d) for this tool to work well.
+    die("""\
+      Your git repo has too many branches (%d/%d) for this tool to work well.
 
-    You may adjust this limit by running:
+      You may adjust this limit by running:
       git config %s <new_limit>
-    """ % (num, limit, key))
-    sys.exit(1)
+
+      You may also try cleaning up your old branches by running:
+      git cl archive
+      """, num, limit, key)
 
   for line in raw_branches:
     if line.startswith(NO_BRANCH):
@@ -343,20 +345,37 @@ def branches(*args):
     yield line.split()[-1]
 
 
-def config(option, default=None):
+def get_config(option, default=None):
   try:
     return run('config', '--get', option) or default
   except subprocess2.CalledProcessError:
     return default
 
 
-def config_list(option):
+def get_config_int(option, default=0):
+  assert isinstance(default, int)
+  try:
+    return int(get_config(option, default))
+  except ValueError:
+    return default
+
+
+def get_config_list(option):
   try:
     return run('config', '--get-all', option).split()
   except subprocess2.CalledProcessError:
     return []
 
 
+def get_config_regexp(pattern):
+  if IS_WIN: # pragma: no cover
+    # this madness is because we call git.bat which calls git.exe which calls
+    # bash.exe (or something to that effect). Each layer divides the number of
+    # ^'s by 2.
+    pattern = pattern.replace('^', '^' * 8)
+  return run('config', '--get-regexp', pattern).splitlines()
+
+
 def current_branch():
   try:
     return run('rev-parse', '--abbrev-ref', 'HEAD')
@@ -381,6 +400,36 @@ def diff(oldrev, newrev, *args):
 
 def freeze():
   took_action = False
+  key = 'depot-tools.freeze-size-limit'
+  MB = 2**20
+  limit_mb = get_config_int(key, 100)
+  untracked_bytes = 0
+
+  for f, s in status():
+    if is_unmerged(s):
+      die("Cannot freeze unmerged changes!")
+    if limit_mb > 0:
+      if s.lstat == '?':
+        untracked_bytes += os.stat(f).st_size
+      if untracked_bytes > limit_mb * MB:
+        die("""\
+          You appear to have too much untracked+unignored data in your git
+          checkout: %.1f / %d MB.
+
+          Run `git status` to see what it is.
+
+          In addition to making many git commands slower, this will prevent
+          depot_tools from freezing your in-progress changes.
+
+          You should add untracked data that you want to ignore to your repo's
+            .git/info/excludes
+          file. See `git help ignore` for the format of this file.
+
+          If this data is indended as part of your commit, you may adjust the
+          freeze limit by running:
+            git config %s <new_limit>
+          Where <new_limit> is an integer threshold in megabytes.""",
+          untracked_bytes / (MB * 1.0), limit_mb, key)
 
   try:
     run('commit', '--no-verify', '-m', FREEZE + '.indexed')
@@ -388,15 +437,24 @@ def freeze():
   except subprocess2.CalledProcessError:
     pass
 
+  add_errors = False
+  try:
+    run('add', '-A', '--ignore-errors')
+  except subprocess2.CalledProcessError:
+    add_errors = True
+
   try:
-    run('add', '-A')
     run('commit', '--no-verify', '-m', FREEZE + '.unindexed')
     took_action = True
   except subprocess2.CalledProcessError:
     pass
 
+  ret = []
+  if add_errors:
+    ret.append('Failed to index some unindexed files.')
   if not took_action:
-    return 'Nothing to freeze.'
+    ret.append('Nothing to freeze.')
+  return ' '.join(ret) or None
 
 
 def get_branch_tree():
@@ -491,6 +549,13 @@ def is_dormant(branch):
   return branch_config(branch, 'dormant', 'false') != 'false'
 
 
+def is_unmerged(stat_value):
+  return (
+      'U' in (stat_value.lstat, stat_value.rstat) or
+      ((stat_value.lstat == stat_value.rstat) and stat_value.lstat in 'AD')
+  )
+
+
 def manual_merge_base(branch, base, parent):
   set_branch_config(branch, 'base', base)
   set_branch_config(branch, 'base-upstream', parent)
@@ -567,7 +632,7 @@ def repo_root():
 
 
 def root():
-  return config('depot-tools.upstream', 'origin/master')
+  return get_config('depot-tools.upstream', 'origin/master')
 
 
 @contextlib.contextmanager
@@ -691,7 +756,8 @@ def get_dirty_files():
 def is_dirty_git_tree(cmd):
   dirty = get_dirty_files()
   if dirty:
-    print 'Cannot %s with a dirty tree. You must commit locally first.' % cmd
+    print 'Cannot %s with a dirty tree. '\
+          'Commit, freeze or stash your changes first.' % cmd
     print 'Uncommitted files: (git diff-index --name-status HEAD)'
     print dirty[:4096]
     if len(dirty) > 4096: # pragma: no cover
@@ -700,6 +766,45 @@ def is_dirty_git_tree(cmd):
   return False
 
 
+def status():
+  """Returns a parsed version of git-status.
+
+  Returns a generator of (current_name, (lstat, rstat, src)) pairs where:
+    * current_name is the name of the file
+    * lstat is the left status code letter from git-status
+    * rstat is the left status code letter from git-status
+    * src is the current name of the file, or the original name of the file
+      if lstat == 'R'
+  """
+  stat_entry = collections.namedtuple('stat_entry', 'lstat rstat src')
+
+  def tokenizer(stream):
+    acc = StringIO()
+    c = None
+    while c != '':
+      c = stream.read(1)
+      if c in (None, '', '\0'):
+        if acc.len:
+          yield acc.getvalue()
+          acc = StringIO()
+      else:
+        acc.write(c)
+
+  def parser(tokens):
+    while True:
+      # Raises StopIteration if it runs out of tokens.
+      status_dest = next(tokens)
+      stat, dest = status_dest[:2], status_dest[3:]
+      lstat, rstat = stat
+      if lstat == 'R':
+        src = next(tokens)
+      else:
+        src = dest
+      yield (dest, stat_entry(lstat, rstat, src))
+
+  return parser(tokenizer(run_stream('status', '-z', bufsize=-1)))
+
+
 def squash_current_branch(header=None, merge_base=None):
   header = header or 'git squash commit.'
   merge_base = merge_base or get_or_create_merge_base(current_branch())

data/vendor/depot_tools/git_drover.py

@@ -265,8 +265,9 @@ class _Drover(object):
     repo_status = self._run_git_command(['status', '--porcelain']).splitlines()
     extra_files = [f[3:] for f in repo_status if f[:2] == ' D']
     if extra_files:
-      self._run_git_command(['update-index', '--skip-worktree', '--'] +
-                            extra_files)
+      self._run_git_command_with_stdin(
+          ['update-index', '--skip-worktree', '--stdin'],
+          stdin='\n'.join(extra_files) + '\n')
 
   def _upload_and_land(self):
     if self._dry_run:
@@ -314,6 +315,32 @@ class _Drover(object):
       else:
         raise Error('Command %r failed: %s' % (' '.join(args), e))
 
+  def _run_git_command_with_stdin(self, args, stdin):
+    """Runs a git command with a provided stdin.
+
+    Args:
+      args: A list of strings containing the args to pass to git.
+      stdin: A string to provide on stdin.
+
+    Raises:
+      Error: The command failed to complete successfully.
+    """
+    cwd = self._workdir if self._workdir else self._parent_repo
+    logging.debug('Running git %s (cwd %r)', ' '.join('%s' % arg
+                                                      for arg in args), cwd)
+
+    # Discard stderr unless verbose is enabled.
+    stderr = None if self._verbose else _DEV_NULL_FILE
+
+    try:
+      popen = subprocess.Popen(['git'] + args, shell=False, cwd=cwd,
+                               stderr=stderr, stdin=subprocess.PIPE)
+      popen.communicate(stdin)
+      if popen.returncode != 0:
+        raise Error('Command %r failed' % ' '.join(args))
+    except OSError as e:
+      raise Error('Command %r failed: %s' % (' '.join(args), e))
+
 
 def cherry_pick_change(branch, revision, parent_repo, dry_run, verbose=False):
   """Cherry-picks a change into a branch.

data/vendor/depot_tools/git_map.py

@@ -18,7 +18,7 @@ import sys
 
 import subprocess2
 
-from git_common import current_branch, branches, tags, config_list, GIT_EXE
+from git_common import current_branch, branches, tags, get_config_list, GIT_EXE
 from git_common import get_or_create_merge_base, root
 
 from third_party import colorama
@@ -38,7 +38,7 @@ RESET = colorama.Fore.RESET + colorama.Back.RESET + colorama.Style.RESET_ALL
 BRIGHT_RED = '\x1b[1;31m'
 
 def main(argv):
-  map_extra = config_list('depot_tools.map_extra')
+  map_extra = get_config_list('depot_tools.map_extra')
   fmt = '%C(red bold)%h%x09%Creset%C(green)%d%Creset %C(yellow)%ad%Creset ~ %s'
   log_proc = subprocess2.Popen(
     [GIT_EXE, 'log', '--graph', '--branches', '--tags', root(),

data/vendor/depot_tools/git_map_branches.py

@@ -140,7 +140,8 @@ class BranchMapper(object):
       # retrieved.
       for cl, status in status_info:
         self.__status_info[cl.GetBranch()] = (cl.GetIssueURL(),
-                                              color_for_status(status))
+                                              color_for_status(status),
+                                              status)
 
     roots = set()
 
@@ -260,13 +261,16 @@ class BranchMapper(object):
 
     # The Rietveld issue associated with the branch.
     if self.verbosity >= 2:
-      (url, color) = ('', '') if self.__is_invalid_parent(branch) \
-                              else self.__status_info[branch]
-      line.append(url or '', color=color)
+      (url, color, status) = ('', '', '') if self.__is_invalid_parent(branch) \
+          else self.__status_info[branch]
+      if self.verbosity > 2:
+        line.append('{} ({})'.format(url, status) if url else '', color=color)
+      else:
+        line.append(url or '', color=color)
 
     # The subject of the most recent commit on the branch.
     if self.show_subject:
-      line.append(run('log', '-n1', '--format=%s', branch))
+      line.append(run('log', '-n1', '--format=%s', branch, '--'))
 
     self.output.append(line)
 

data/vendor/depot_tools/git_rebase_update.py

@@ -31,8 +31,8 @@ def find_return_branch_workdir():
   These values may persist across multiple invocations of rebase-update, if
   rebase-update runs into a conflict mid-way.
   """
-  return_branch = git.config(STARTING_BRANCH_KEY)
-  workdir = git.config(STARTING_WORKDIR_KEY)
+  return_branch = git.get_config(STARTING_BRANCH_KEY)
+  workdir = git.get_config(STARTING_WORKDIR_KEY)
   if not return_branch:
     workdir = os.getcwd()
     git.set_config(STARTING_WORKDIR_KEY, workdir)
@@ -49,7 +49,7 @@ def fetch_remotes(branch_tree):
   remotes = set()
   tag_set = git.tags()
   fetchspec_map = {}
-  all_fetchspec_configs = git.config_regexp(r'^remote\..*\.fetch')
+  all_fetchspec_configs = git.get_config_regexp(r'^remote\..*\.fetch')
   for fetchspec_config in all_fetchspec_configs:
     key, _, fetchspec = fetchspec_config.partition(' ')
     dest_spec = fetchspec.partition(':')[2]

data/vendor/depot_tools/git_upstream_diff.py

@@ -11,7 +11,7 @@ import subprocess2
 import git_common as git
 
 def main(args):
-  default_args = git.config_list('depot-tools.upstream-diff.default-args')
+  default_args = git.get_config_list('depot-tools.upstream-diff.default-args')
   args = default_args + args
 
   parser = argparse.ArgumentParser()

data/vendor/depot_tools/infra/config/OWNERS

@@ -1,5 +1,6 @@
 set noparent
 iannucci@chromium.org
+nodir@chromium.org
 phajdan.jr@chromium.org
 sergiyb@chromium.org
 tandrii@chromium.org

data/vendor/depot_tools/infra/config/cq.cfg

@@ -4,24 +4,29 @@
 version: 1
 cq_name: "depot_tools"
 cq_status_url: "https://chromium-cq-status.appspot.com"
+git_repo_url: "https://chromium.googlesource.com/chromium/tools/depot_tools"
 
+gerrit {}
 rietveld {
   url: "https://codereview.chromium.org"
-  project_bases: "^https?\\:\\/\\/chromium\\.googlesource\\.com\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
-  project_bases: "^https?\\:\\/\\/chromium\\.googlesource\\.com\\/a\\/chromium\\/tools\\/depot_tools(?:\\.git)?\\@[a-zA-Z0-9\\-_\\.]+$"
 }
 
 verifiers {
   reviewer_lgtm {
     committer_list: "project-infra-committers"
+    dry_run_access_list: "project-infra-tryjob-access"
   }
 
   try_job {
     buckets {
-      name: "tryserver.infra"
+      name: "master.tryserver.infra"
       builders {
         name: "Depot Tools Presubmit"
       }
+      builders {
+        name: "Depot Tools Presubmit (Swarming)"
+        experiment_percentage: 100
+      }
       builders {
         name: "Recipe Roll Downstream Tester"
         experiment_percentage: 100

data/vendor/depot_tools/infra/config/recipes.cfg

@@ -5,5 +5,5 @@ deps {
   project_id: "recipe_engine"
   url: "https://chromium.googlesource.com/external/github.com/luci/recipes-py.git"
   branch: "master"
-  revision: "da26a351b7034d37e55acd468fa90c8ee3a1ada0"
+  revision: "ece774fd870a6b883cdd0f541a686ec3ca581613"
 }

data/vendor/depot_tools/man/html/depot_tools.html

@@ -756,7 +756,7 @@ depot_tools(7) Manual Page
 <div class="sectionbody">
 <div class="paragraph"><p>The Chromium depot_tools suite contains many tools to assist/augment the
 Chromium development environment. The tools may be downloaded from
-<a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">here</a>.</p></div>
+<a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
 <div class="paragraph"><p>There are two primary categories of tools. Some of these tools are <em>essential</em>
 to the development flow, in the sense that you cannot successfully develop
 Chromium without them.</p></div>
@@ -771,6 +771,14 @@ ease the develpment workflow.</p></div>
 <div class="paragraph"><p>A tutorial for these tools can be found at <a href="depot_tools_tutorial.html">depot_tools_tutorial(7)</a>.</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
+<a href="git-auto-svn.html">git-auto-svn(1)</a>
+</dt>
+<dd>
+<p>
+Automatically set up git-svn metadata for a repo mirrored from SVN.
+</p>
+</dd>
+<dt class="hdlist1">
 <a href="git-cherry-pick-upload.html">git-cherry-pick-upload(1)</a>
 </dt>
 <dd>
@@ -927,7 +935,7 @@ Print a diff of the current branch, compared to its upstream.
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2016-01-28 16:40:21 AEDT
+Last updated 2016-07-21 10:09:00 PDT
 </div>
 </div>
 </body>