libv8 6.3.292.48.1 → 6.7.288.46.0

data/vendor/depot_tools/git_common.py

@@ -435,25 +435,25 @@ def freeze():
     if limit_mb > 0:
       if s.lstat == '?':
         untracked_bytes += os.stat(os.path.join(root_path, 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.
+  if limit_mb > 0 and 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.
+      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.
+      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/exclude
-          file. See `git help ignore` for the format of this file.
+      You should add untracked data that you want to ignore to your repo's
+        .git/info/exclude
+      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)
+      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')
@@ -1047,4 +1047,7 @@ def clone_file(repository, new_workdir, link, operation):
   link_dir = os.path.dirname(os.path.join(new_workdir, link))
   if not os.path.exists(link_dir):
     os.makedirs(link_dir)
-  operation(os.path.join(repository, link), os.path.join(new_workdir, link))
+  src = os.path.join(repository, link)
+  if os.path.islink(src):
+    src = os.path.realpath(src)
+  operation(src, os.path.join(new_workdir, link))

data/vendor/depot_tools/git_footers.py

@@ -15,6 +15,7 @@ import git_common as git
 
 FOOTER_PATTERN = re.compile(r'^\s*([\w-]+): *(.*)$')
 CHROME_COMMIT_POSITION_PATTERN = re.compile(r'^([\w/\-\.]+)@{#(\d+)}$')
+FOOTER_KEY_BLACKLIST = set(['http', 'https'])
 
 
 def normalize_name(header):
@@ -24,10 +25,9 @@ def normalize_name(header):
 def parse_footer(line):
   """Returns footer's (key, value) if footer is valid, else None."""
   match = FOOTER_PATTERN.match(line)
-  if match:
+  if match and match.group(1) not in FOOTER_KEY_BLACKLIST:
     return (match.group(1), match.group(2))
-  else:
-    return None
+  return None
 
 
 def parse_footers(message):
@@ -57,17 +57,27 @@ def split_footers(message):
   """Returns (non_footer_lines, footer_lines, parsed footers).
 
   Guarantees that:
-    (non_footer_lines + footer_lines) == message.splitlines().
+    (non_footer_lines + footer_lines) ~= message.splitlines(), with at
+      most one new newline, if the last paragraph is text followed by footers.
     parsed_footers is parse_footer applied on each line of footer_lines.
       There could be fewer parsed_footers than footer lines if some lines in
       last paragraph are malformed.
   """
   message_lines = list(message.splitlines())
   footer_lines = []
+  maybe_footer_lines = []
   for line in reversed(message_lines):
     if line == '' or line.isspace():
       break
-    footer_lines.append(line)
+    elif parse_footer(line):
+      footer_lines.extend(maybe_footer_lines)
+      maybe_footer_lines = []
+      footer_lines.append(line)
+    else:
+      # We only want to include malformed lines if they are preceeded by
+      # well-formed lines. So keep them in holding until we see a well-formed
+      # line (case above).
+      maybe_footer_lines.append(line)
   else:
     # The whole description was consisting of footers,
     # which means those aren't footers.
@@ -77,6 +87,10 @@ def split_footers(message):
   footers = filter(None, map(parse_footer, footer_lines))
   if not footers:
     return message_lines, [], []
+  if maybe_footer_lines:
+    # If some malformed lines were left over, add a newline to split them
+    # from the well-formed ones.
+    return message_lines[:-len(footer_lines)] + [''], footer_lines, footers
   return message_lines[:-len(footer_lines)], footer_lines, footers
 
 

data/vendor/depot_tools/git_hyper_blame.py

@@ -94,6 +94,11 @@ def parse_blame(blameoutput):
     yield BlameLine(commit, context, lineno_then, lineno_now, False)
 
 
+def num_codepoints(s):
+  """Gets the length of a UTF-8 byte string, in Unicode codepoints."""
+  return len(s.decode('utf-8', errors='replace'))
+
+
 def print_table(table, colsep=' ', rowsep='\n', align=None, out=sys.stdout):
   """Print a 2D rectangular array, aligning columns with spaces.
 
@@ -107,9 +112,10 @@ def print_table(table, colsep=' ', rowsep='\n', align=None, out=sys.stdout):
   colwidths = None
   for row in table:
     if colwidths is None:
-      colwidths = [len(x) for x in row]
+      colwidths = [num_codepoints(x) for x in row]
     else:
-      colwidths = [max(colwidths[i], len(x)) for i, x in enumerate(row)]
+      colwidths = [max(colwidths[i], num_codepoints(x))
+                   for i, x in enumerate(row)]
 
   if align is None:  # pragma: no cover
     align = 'l' * len(colwidths)
@@ -117,7 +123,7 @@ def print_table(table, colsep=' ', rowsep='\n', align=None, out=sys.stdout):
   for row in table:
     cells = []
     for i, cell in enumerate(row):
-      padding = ' ' * (colwidths[i] - len(cell))
+      padding = ' ' * (colwidths[i] - num_codepoints(cell))
       if align[i] == 'r':
         cell = padding + cell
       elif i < len(row) - 1:

data/vendor/depot_tools/git_new_branch.py

@@ -2,7 +2,6 @@
 # Copyright 2014 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.
-
 """
 Create new branch tracking origin/master by default.
 """
@@ -13,7 +12,7 @@ import sys
 import subprocess2
 
 from git_common import run, root, set_config, get_or_create_merge_base, tags
-from git_common import hash_one
+from git_common import hash_one, upstream, set_branch_config, current_branch
 
 
 def main(args):
@@ -28,13 +27,26 @@ def main(args):
                  help='set upstream branch to current branch.')
   g.add_argument('--upstream', metavar='REF', default=root(),
                  help='upstream branch (or tag) to track.')
+  g.add_argument('--inject-current', '--inject_current',
+                 action='store_true',
+                 help='new branch adopts current branch\'s upstream,' +
+                 ' and new branch becomes current branch\'s upstream.')
   g.add_argument('--lkgr', action='store_const', const='lkgr', dest='upstream',
                  help='set basis ref for new branch to lkgr.')
 
   opts = parser.parse_args(args)
 
   try:
-    if opts.upstream_current:
+    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():

data/vendor/depot_tools/git_upstream_diff.py

@@ -21,10 +21,15 @@ def main(args):
                       help=(
                         'Print a colorized wordwise diff '
                         'instead of line-wise diff'))
-  parser.add_argument('branch', nargs='?', default=current_branch,
-                      help='Show changes from a different branch')
+  parser.add_argument('--branch', default=current_branch,
+                      help='Show changes from a different branch. Passing '
+                           '"HEAD" is the same as omitting this option (it '
+                           'diffs against the current branch)')
   opts, extra_args = parser.parse_known_args(args)
 
+  if opts.branch == 'HEAD':
+    opts.branch = current_branch
+
   if not opts.branch or opts.branch == 'HEAD':
     print 'fatal: Cannot perform git-upstream-diff while not on a branch'
     return 1

data/vendor/depot_tools/gsutil.py

@@ -156,7 +156,7 @@ def parse_args():
   bin_dir = os.environ.get('DEPOT_TOOLS_GSUTIL_BIN_DIR', DEFAULT_BIN_DIR)
 
   parser = argparse.ArgumentParser()
-  parser.add_argument('--force-version', default='4.28')
+  parser.add_argument('--force-version', default='4.30')
   parser.add_argument('--clean', action='store_true',
       help='Clear any existing gsutil package, forcing a new download.')
   parser.add_argument('--fallback', default=DEFAULT_FALLBACK_GSUTIL)

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

@@ -23,9 +23,8 @@ verifiers {
       builders { name: "Skia downstream Recipe Roll tester from Depot Tools" }
       builders { name: "Skia Buildbot downstream Recipe Roll tester from Depot Tools" }
     }
-
     buckets {
-      name: "master.internal.infra.try"
+      name: "luci.infra-internal.try"
       builders { name: "build_limited Roll Tester (depot_tools)" }
       builders { name: "release_scripts Roll Tester (depot_tools)" }
     }

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

@@ -15,7 +15,7 @@
   "deps": {
     "recipe_engine": {
       "branch": "master",
-      "revision": "32e6ba22dd1c75f8b3276bb86112d10542d5e32b",
+      "revision": "94bb0a758456a5df6891677a8cf2876c07ea5f0c",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },

data/vendor/depot_tools/luci-auth

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Copyright 2018 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.
+
+MYPATH=$(dirname "${BASH_SOURCE[0]}")
+
+source "$MYPATH/cipd_bin_setup.sh"
+cipd_bin_setup &> /dev/null
+
+exec "$MYPATH/.cipd_bin/luci-auth" "$@"
+

data/vendor/depot_tools/luci-auth.bat

@@ -0,0 +1,8 @@
+@echo off
+:: Copyright 2018 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.
+
+call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
+"%~dp0\.cipd_bin\luci-auth.exe" %*
+

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

@@ -771,14 +771,6 @@ ease the development 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-cherry-pick-upload.html">git-cherry-pick-upload(1)</a>
-</dt>
-<dd>
-<p>
-Upload the diff between a revision and its parent to rietveld.
-</p>
-</dd>
-<dt class="hdlist1">
 <a href="git-cl.html">git-cl(1)</a>
 </dt>
 <dd>

data/vendor/depot_tools/man/html/git-upstream-diff.html

@@ -755,7 +755,7 @@ git-upstream-diff(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git upstream-diff</em> [--wordwise] [branch] [&lt;extra args for git-diff&gt;*]</pre>
+<pre class="content"><em>git upstream-diff</em> [--wordwise] [--branch branch] [&lt;extra args for git-diff&gt;*]</pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -763,7 +763,10 @@ git-upstream-diff(1) Manual Page
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Shows a diff between a branch and its upstream. If the branch is omitted, the tool shows the diff for the current branch. This is <em>roughly</em> the same as:</p></div>
+<div class="paragraph"><p>Shows a diff between a branch and its upstream. If the --branch option is
+omitted or "HEAD", the tool shows the diff for the current branch. Any
+additional arguments are passed through to the underlying git-diff command. This
+is <em>roughly</em> the same as:</p></div>
 <div class="listingblock">
 <div class="content">
 <pre><code>git diff --patience -C -C branch@{upstream}  <b>&lt;1&gt;</b> <b>&lt;2&gt;</b></code></pre>
@@ -789,6 +792,20 @@ you&#8217;ll still see an accurate diff compared to just diffing against
 <div class="paragraph"><p>The <code>--wordwise</code> option also allows <code>git-diff</code> to do word-by-word comparison
 in a semi-intelligent way. However, sometimes it can produce surprising results,
 so it is disabled by default.</p></div>
+<div class="paragraph"><p>Since any additional options are passed through to git-diff unchanged, you can
+use this as a general replacement for <code>git diff</code> for things like:</p></div>
+<div class="listingblock">
+<div class="content">
+<pre><code>$ # See what changed in a file on the current branch
+$ git upstream-diff some/file.py
+...
+
+$ # Omit deleted files from the diff
+$ git upstream-diff --diff-filter d
+...
+
+$ # etc.</code></pre>
+</div></div>
 </div>
 </div>
 <div class="sect1">
@@ -895,7 +912,7 @@ from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools.git">
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2017-11-03 14:35:37 PDT
+Last updated 2018-06-20 00:12:01 PDT
 </div>
 </div>
 </body>

data/vendor/depot_tools/man/man1/git-upstream-diff.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: git-upstream-diff
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
-.\"      Date: 11/03/2017
+.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
+.\"      Date: 06/20/2018
 .\"    Manual: Chromium depot_tools Manual
-.\"    Source: depot_tools 9c2758a5
+.\"    Source: depot_tools 79d42dfb
 .\"  Language: English
 .\"
-.TH "GIT\-UPSTREAM\-DIFF" "1" "11/03/2017" "depot_tools 9c2758a5" "Chromium depot_tools Manual"
+.TH "GIT\-UPSTREAM\-DIFF" "1" "06/20/2018" "depot_tools 79d42dfb" "Chromium depot_tools Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -32,12 +32,12 @@ git-upstream-diff \- Print a diff of the current branch, compared to its upstrea
 .SH "SYNOPSIS"
 .sp
 .nf
-\fIgit upstream\-diff\fR [\-\-wordwise] [branch] [<extra args for git\-diff>*]
+\fIgit upstream\-diff\fR [\-\-wordwise] [\-\-branch branch] [<extra args for git\-diff>*]
 .fi
 .sp
 .SH "DESCRIPTION"
 .sp
-Shows a diff between a branch and its upstream\&. If the branch is omitted, the tool shows the diff for the current branch\&. This is \fIroughly\fR the same as:
+Shows a diff between a branch and its upstream\&. If the \-\-branch option is omitted or "HEAD", the tool shows the diff for the current branch\&. Any additional arguments are passed through to the underlying git\-diff command\&. This is \fIroughly\fR the same as:
 .sp
 .if n \{\
 .RS 4
@@ -60,6 +60,27 @@ uses the patience\-diff algorithm, which tends to produce nicer diffs in many ca
 The difference is that branch@{upstream} is actually the tagged merge base of your branch (See \fBgit-rebase-update\fR(1))\&. This means that if your upstream branch was rebased, but you haven\(cqt yet rebased the current branch on top of it, you\(cqll still see an accurate diff compared to just diffing against @{upstream}\&.
 .sp
 The \-\-wordwise option also allows git\-diff to do word\-by\-word comparison in a semi\-intelligent way\&. However, sometimes it can produce surprising results, so it is disabled by default\&.
+.sp
+Since any additional options are passed through to git\-diff unchanged, you can use this as a general replacement for git diff for things like:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+$ # See what changed in a file on the current branch
+$ git upstream\-diff some/file\&.py
+\&.\&.\&.
+
+$ # Omit deleted files from the diff
+$ git upstream\-diff \-\-diff\-filter d
+\&.\&.\&.
+
+$ # etc\&.
+.fi
+.if n \{\
+.RE
+.\}
+.sp
 .SH "OPTIONS"
 .PP
 \-\-wordwise

data/vendor/depot_tools/man/man7/depot_tools.7

@@ -42,11 +42,6 @@ A listing of both categories of tools follows\&.
 .sp
 A tutorial for these tools can be found at \fBdepot_tools_tutorial\fR(7)\&.
 .PP
-\fBgit-cherry-pick-upload\fR(1)
-.RS 4
-Upload the diff between a revision and its parent to rietveld\&.
-.RE
-.PP
 \fBgit-cl\fR(1)
 .RS 4
 Interact with code reviews on Gerrit and Rietveld

data/vendor/depot_tools/man/man7/depot_tools_tutorial.7

@@ -222,13 +222,13 @@ Clone the \fIdepot_tools\fR repository:
 .\}
 .sp
 .sp
-Add \fIdepot_tools\fR to the \fIend\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools:
+Add \fIdepot_tools\fR to the \fIfront\fR of your PATH (you will probably want to put this in your ~/\&.bashrc or ~/\&.zshrc)\&. Assuming you cloned \fIdepot_tools\fR to /path/to/depot_tools:
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-\fB$ export PATH=$PATH:/path/to/depot_tools\fR
+\fB$ export PATH=/path/to/depot_tools:$PATH\fR
 .fi
 .if n \{\
 .RE

data/vendor/depot_tools/man/src/git-upstream-diff.txt

@@ -9,12 +9,15 @@ include::_git-upstream-diff_desc.helper.txt[]
 SYNOPSIS
 --------
 [verse]
-'git upstream-diff' [--wordwise] [branch] [<extra args for git-diff>*]
+'git upstream-diff' [--wordwise] [--branch branch] [<extra args for git-diff>*]
 
 DESCRIPTION
 -----------
 
-Shows a diff between a branch and its upstream. If the branch is omitted, the tool shows the diff for the current branch. This is 'roughly' the same as:
+Shows a diff between a branch and its upstream. If the --branch option is
+omitted or "HEAD", the tool shows the diff for the current branch. Any
+additional arguments are passed through to the underlying git-diff command. This
+is 'roughly' the same as:
 
 ----
 git diff --patience -C -C branch@{upstream}  <1> <2>
@@ -33,6 +36,21 @@ The `--wordwise` option also allows `git-diff` to do word-by-word comparison
 in a semi-intelligent way. However, sometimes it can produce surprising results,
 so it is disabled by default.
 
+Since any additional options are passed through to git-diff unchanged, you can
+use this as a general replacement for `git diff` for things like:
+
+----
+$ # See what changed in a file on the current branch
+$ git upstream-diff some/file.py
+...
+
+$ # Omit deleted files from the diff
+$ git upstream-diff --diff-filter d
+...
+
+$ # etc.
+----
+
 
 OPTIONS
 -------
@@ -40,7 +58,7 @@ OPTIONS
 --wordwise::
   Print a colorized word-wise diff instead of a line-wise diff.
 
-[branch]
+--branch branch::
   Show a diff between the specified branch and its upstream, instead of using
   the current branch.