libv8 4.5.95.5 → 5.0.71.48.0beta2

data/vendor/depot_tools/luci_hacks/trigger_luci_job.py

@@ -0,0 +1,128 @@
+#!/usr/bin/env python
+# Copyright (c) 2015 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.
+
+
+"""Tool to send a recipe job to run on Swarming."""
+
+
+import argparse
+import base64
+import json
+import os
+import re
+import subprocess
+import sys
+import zlib
+
+
+SWARMING_URL = 'https://chromium.googlesource.com/external/swarming.client.git'
+CLIENT_LOCATION = os.path.expanduser('~/.swarming_client')
+THIS_DIR = os.path.dirname(os.path.abspath(__file__))
+ISOLATE = os.path.join(THIS_DIR, 'luci_recipe_run.isolate')
+
+# This is put in place in order to not need to parse this information from
+# master.cfg.  In the LUCI future this would all be stored in a luci.cfg
+# file alongside the repo.
+RECIPE_MAPPING = {
+    'Infra Linux Trusty 64 Tester':
+        ('tryserver.infra', 'infra/infra_repo_trybot', 'Ubuntu-14.04'),
+    'Infra Linux Precise 32 Tester':
+        ('tryserver.infra', 'infra/infra_repo_trybot', 'Ubuntu-12.04'),
+    'Infra Mac Tester':
+        ('tryserver.infra', 'infra/infra_repo_trybot', 'Mac'),
+    'Infra Win Tester':
+        ('tryserver.infra', 'infra/infra_repo_trybot', 'Win'),
+    'Infra Windows Tester':
+        ('tryserver.infra', 'infra/infra_repo_trybot', 'Win'),
+    'Infra Presubmit':
+        ('tryserver.infra', 'run_presubmit', 'Linux')
+}
+
+
+def parse_args(args):
+  # Once Clank switches to bot_update, bot_update would no longer require
+  # master/builder detection, and we can remove the master/builder from the args
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--builder', required=True)
+  parser.add_argument('--issue',required=True)
+  parser.add_argument('--patchset', required=True)
+  parser.add_argument('--revision', default='HEAD')
+  parser.add_argument('--patch_project')
+
+  return parser.parse_args(args)
+
+
+def ensure_swarming_client():
+  if not os.path.exists(CLIENT_LOCATION):
+    parent, target = os.path.split(CLIENT_LOCATION)
+    subprocess.check_call(['git', 'clone', SWARMING_URL, target], cwd=parent)
+  else:
+    subprocess.check_call(['git', 'pull'], cwd=CLIENT_LOCATION)
+
+
+def archive_isolate(isolate):
+  isolate_py = os.path.join(CLIENT_LOCATION, 'isolate.py')
+  cmd = [
+      sys.executable, isolate_py, 'archive',
+      '--isolated=%sd' % isolate,
+      '--isolate-server', 'https://isolateserver.appspot.com',
+      '--isolate=%s' % isolate]
+  out = subprocess.check_output(cmd)
+  return out.split()[0].strip()
+
+
+def trigger_swarm(isolated, platform, build_props, factory_props):
+  # TODO: Make this trigger DM instead.
+  swarm_py = os.path.join(CLIENT_LOCATION, 'swarming.py')
+  build_props_gz = base64.b64encode(zlib.compress(json.dumps(build_props)))
+  fac_props_gz = base64.b64encode(zlib.compress(json.dumps(factory_props)))
+  cmd = [
+      sys.executable, swarm_py, 'trigger', isolated,
+      '--isolate-server', 'isolateserver.appspot.com',
+      '--swarming', 'chromium-swarm-dev.appspot.com',
+      '-d', 'os', platform,
+      '--',
+      '--factory-properties-gz=%s' % fac_props_gz,
+      '--build-properties-gz=%s' % build_props_gz
+  ]
+  out = subprocess.check_output(cmd)
+  m = re.search(
+      r'https://chromium-swarm-dev.appspot.com/user/task/(.*)', out)
+  return m.group(1)
+
+
+def trigger(builder, revision, issue, patchset, project):
+  """Constructs/uploads an isolated file and send the job to swarming."""
+  master, recipe, platform = RECIPE_MAPPING[builder]
+  build_props = {
+    'buildnumber': 1,
+    'buildername': builder,
+    'recipe': recipe,
+    'mastername': master,
+    'slavename': 'fakeslave',
+    'revision': revision,
+    'patch_project': project,
+  }
+  if issue:
+    build_props['issue'] = issue
+  if patchset:
+    build_props['patchset'] = patchset
+  factory_props = {
+    'recipe': recipe
+  }
+  ensure_swarming_client()
+  arun_isolated = archive_isolate(ISOLATE)
+  task = trigger_swarm(arun_isolated, platform, build_props, factory_props)
+  print 'https://luci-milo.appspot.com/swarming/%s' % task
+
+
+def main(args):
+  args = parse_args(args)
+  trigger(args.builder, args.revision, args.issue,
+          args.patchset, args.patch_project)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))

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

@@ -804,6 +804,14 @@ Freeze all changes on a branch (indexed and unindexed).
 </p>
 </dd>
 <dt class="hdlist1">
+<a href="git-hyper-blame.html">git-hyper-blame(1)</a>
+</dt>
+<dd>
+<p>
+Like git blame, but with the ability to ignore or bypass certain commits.
+</p>
+</dd>
+<dt class="hdlist1">
 <a href="git-map-branches.html">git-map-branches(1)</a>
 </dt>
 <dd>
@@ -919,7 +927,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 2014-09-09 14:15:07 PDT
+Last updated 2016-01-28 16:40:21 AEDT
 </div>
 </div>
 </body>

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

@@ -886,7 +886,7 @@ in your <code>~/.bashrc</code> or <code>~/.zshrc</code>). Assuming you cloned <e
 <div class="sect3">
 <h4 id="_windows">WINDOWS</h4>
 <div class="paragraph"><p>Download the <em>depot_tools</em>
-<a href="https://src.chromium.org/svn/trunk/tools/depot_tools.zip">bundle</a> and
+<a href="https://storage.googleapis.com/chrome-infra/depot_tools.zip">bundle</a> and
 extract it somewhere.</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -902,7 +902,7 @@ autoupdate itself. You can use &#8220;Extract all&#8230;&#8221; from the context
 bundle to <code>C:\workspace\depot_tools</code>:</p></div>
 <div class="dlist"><dl>
 <dt class="hdlist1">
-With Administrator access: 
+With Administrator access:
 </dt>
 <dd>
 <p>
@@ -911,7 +911,7 @@ With Administrator access:
 <div class="paragraph"><p>Modify the PATH system variable to include <code>C:\workspace\depot_tools</code>.</p></div>
 </dd>
 <dt class="hdlist1">
-Without Administrator access: 
+Without Administrator access:
 </dt>
 <dd>
 <p>
@@ -1581,7 +1581,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 2015-01-13 15:27:56 PST
+Last updated 2016-04-01 14:13:51 PST
 </div>
 </div>
 </body>

data/vendor/depot_tools/man/html/git-drover.html

@@ -755,7 +755,11 @@ git-drover(1) Manual Page
 <h2 id="_synopsis">SYNOPSIS</h2>
 <div class="sectionbody">
 <div class="verseblock">
-<pre class="content"><em>git drover</em></pre>
+<pre class="content"><em>git drover</em> --branch &lt;branch&gt;
+           (--cherry-pick &lt;change&gt; | --continue [path_to_workdir] |
+            --abort [path_to_workdir])
+           [--parent_checkout &lt;path-to-existing-checkout&gt;]
+           [--verbose] [--dry-run]</pre>
 <div class="attribution">
 </div></div>
 </div>
@@ -763,8 +767,83 @@ git-drover(1) Manual Page
 <div class="sect1">
 <h2 id="_description">DESCRIPTION</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><code>git drover</code> is NOT IMPLEMENTED yet. See the EXAMPLE section for the equivalent
-sequence of commands to run.</p></div>
+<div class="paragraph"><p><code>git drover</code> applies a commit to a release branch. It creates a new workdir from
+an existing checkout to avoid downloading a new checkout without affecting the
+existing checkout.</p></div>
+<div class="paragraph"><p><code>git drover</code> does not support reverts. See the EXAMPLE section for the
+equivalent sequence of commands to run.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_options">OPTIONS</h2>
+<div class="sectionbody">
+<div class="dlist"><dl>
+<dt class="hdlist1">
+--branch &lt;branch&gt;
+</dt>
+<dd>
+<p>
+  The branch to cherry-pick the commit to.
+</p>
+</dd>
+<dt class="hdlist1">
+--cherry-pick &lt;commit&gt;
+</dt>
+<dd>
+<p>
+  The commit to cherry-pick.
+</p>
+</dd>
+<dt class="hdlist1">
+--continue [path_to_workdir]
+</dt>
+<dd>
+<p>
+  Continue a cherry-pick that required manual resolution. The path to the drover
+  workdir is optional. If unspecified, the current directory is used.
+</p>
+</dd>
+<dt class="hdlist1">
+--abort [path_to_workdir]
+</dt>
+<dd>
+<p>
+  Abort a cherry-pick that required manual resolution and clean up its workdir.
+  The path to the drover workdir is optional. If unspecified, the current
+  directory is used.
+</p>
+</dd>
+<dt class="hdlist1">
+--parent_checkout
+</dt>
+<dd>
+<p>
+  The path to the chromium checkout to use as the source for a creating
+  git-new-workdir workdir to use for cherry-picking. If unspecified, the current
+  directory is used.
+</p>
+</dd>
+<dt class="hdlist1">
+-v
+</dt>
+<dt class="hdlist1">
+--verbose
+</dt>
+<dd>
+<p>
+  Enable verbose logging.
+</p>
+</dd>
+<dt class="hdlist1">
+--dry-run
+</dt>
+<dd>
+<p>
+  Skip landing the cherry-pick. Just ensure that the commit can be cherry-picked
+  into the branch.
+</p>
+</dd>
+</dl></div>
 </div>
 </div>
 <div class="sect1">
@@ -777,12 +856,9 @@ sequence of commands to run.</p></div>
 at least once to fetch the branches.</p></div>
 <div class="sect3">
 <h4 id="_merge_example">Merge Example</h4>
-<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
-<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
-
-# Here's a commit (from some.committer) that we want to 'drover'.
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
-commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b
+<span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</span>
 Author:     some.committer &lt;some.committer@chromium.org&gt;
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
 Commit:     some.committer &lt;some.committer@chromium.org&gt;
@@ -790,37 +866,69 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
     This change needs to go to branch 9999
 
-# Checkout the branch we want to 'drover' to.
-<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
-Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
-
 # Now do the 'drover'.
-# IMPORTANT!!! Do Not leave off the '-x' flag
-<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b</span>
-[drover_9999 19d3d0b] This change needs to go to branch 9999
- Author: some.committer &lt;some.committer@chromium.org&gt;
- Date: Thu Apr 10 08:54:46 2014 +0000
- 1 file changed, 1 insertion(+)
- create mode 100644 modified_file
+<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick f7448045de01b54914db8b902ca77fbbf42b3146</span>
+Going to cherry-pick
+"""
+<span style="color: #e7e71c">commit f7448045de01b54914db8b902ca77fbbf42b3146</span>
+Author: some.committer &lt;some.committer@chromium.org&gt;
+Date:   Thu Apr 10 08:54:46 2014 +0000
 
-# That took the code authored by some.committer and committed it to
-# the branch by the person who drovered it (i.e. you).
+    This change needs to go to branch 9999
+"""
+to 9999. Continue (y/n)? y
+
+# A cl is uploaded to rietveld, where it can be reviewed before landing.
+
+About to land on 9999. Continue (y/n)? y
+# The cherry-pick cl is landed on the branch 9999.
+</code></pre></div></div><p><div class="paragraph"></p></div>
+</div>
+<div class="sect3">
+<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Here's a commit (from some.committer) that we want to 'drover'.
 <span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
-commit 19d3d0b9d8f802df8e2fd563cbc919679d310ecd
+<span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</span>
 Author:     some.committer &lt;some.committer@chromium.org&gt;
 AuthorDate: Thu Apr 10 08:54:46 2014 +0000
-Commit:     you &lt;you@chromium.org&gt;
-CommitDate: Thu Apr 10 09:11:36 2014 +0000
+Commit:     some.committer &lt;some.committer@chromium.org&gt;
+CommitDate: Thu Apr 10 08:54:46 2014 +0000
 
     This change needs to go to branch 9999
 
-    (cherry picked from commit 4a00a0c3c1bb01f11b42cb70f3ad587026cec02b)
+# Now do the 'drover'.
+<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick ca8e437616d853cb10008a252b54cfed928f157c</span>
+Going to cherry-pick
+"""
+<span style="color: #e7e71c">commit ca8e437616d853cb10008a252b54cfed928f157c</span>
+Author: some.committer &lt;some.committer@chromium.org&gt;
+Date:   Thu Apr 10 08:54:46 2014 +0000
 
-# Looks good. Ship it!
-<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
-# Wait for LGTM or TBR it.
-<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
-# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
+    This change needs to go to branch 9999
+"""
+to 9999. Continue (y/n)? y
+
+Error: Patch failed to apply.
+
+A workdir for this cherry-pick has been created in
+  /tmp/drover_9999
+
+To continue, resolve the conflicts there and run
+  git drover --continue /tmp/drover_9999
+
+To abort this cherry-pick run
+  git drover --abort /tmp/drover_9999
+
+<span style="font-weight: bold; color: #ffffff">$ pushd /tmp/drover_9999</span>
+# Manually resolve conflicts.
+<span style="font-weight: bold; color: #ffffff">$ git add path/to/file_with_conflicts</span>
+<span style="font-weight: bold; color: #ffffff">$ popd</span>
+<span style="font-weight: bold; color: #ffffff">$ git drover --continue /tmp/drover_9999</span>
+
+# A cl is uploaded to rietveld, where it can be reviewed before landing.
+
+About to land on 9999. Continue (y/n)? y
+# The cherry-pick cl is landed on the branch 9999.
 </code></pre></div></div><p><div class="paragraph"></p></div>
 </div>
 <div class="sect3">
@@ -834,30 +942,78 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
 
 # Here's the commit we want to revert.
 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
-commit 590b333cbc04d13da67b2a1c5282835d4f27e398
+<span style="color: #e7e71c">commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b</span>
 Author: some.committer &lt;some.committer@chromium.org&gt;
 Date:   Thu Apr 10 08:54:46 2014 +0000
 
     This change is horribly broken.
 
 # Now do the revert.
-<span style="font-weight: bold; color: #ffffff">$ git revert 590b333cbc04d13da67b2a1c5282835d4f27e398</span>
+<span style="font-weight: bold; color: #ffffff">$ git revert 98d544a18e19bb80be9d4a8094efda8ab1d2534b</span>
 
 # That reverted the change and committed the revert.
 <span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
-commit 6f541155a9adf98f4e7f94dd561d022fb022d43f
+<span style="color: #e7e71c">commit 0fc5e9101886dcb1aebbb9434d0df9341f0dedfe</span>
 Author: you &lt;you@chromium.org&gt;
 Date:   Thu Apr 10 09:11:36 2014 +0000
 
     Revert "This change is horribly broken."
 
-    This reverts commit 590b333cbc04d13da67b2a1c5282835d4f27e398.
+    This reverts commit 98d544a18e19bb80be9d4a8094efda8ab1d2534b.
 
 # As with old drover, reverts are generally OK to commit without LGTM.
 <span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
 <span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
 </code></pre></div></div><p><div class="paragraph"></p></div>
 </div>
+<div class="sect3">
+<h4 id="_manual_merge_example">Manual Merge Example</h4>
+<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code># Make sure we have the most up-to-date branch sources.
+<span style="font-weight: bold; color: #ffffff">$ git fetch</span>
+
+# Here's a commit (from some.committer) that we want to 'drover'.
+<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
+<span style="color: #e7e71c">commit b27fff7b167964750303f60222e79f3932f438e0</span>
+Author:     some.committer &lt;some.committer@chromium.org&gt;
+AuthorDate: Thu Apr 10 08:54:46 2014 +0000
+Commit:     some.committer &lt;some.committer@chromium.org&gt;
+CommitDate: Thu Apr 10 08:54:46 2014 +0000
+
+    This change needs to go to branch 9999
+
+# Checkout the branch we want to 'drover' to.
+<span style="font-weight: bold; color: #ffffff">$ git checkout -b drover_9999 branch-heads/9999</span>
+Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
+
+# Now do the 'drover'.
+# IMPORTANT!!! Do Not leave off the '-x' flag
+<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b27fff7b167964750303f60222e79f3932f438e0</span>
+[drover_9999 bd8dc1c] This change needs to go to branch 9999
+ Author: some.committer &lt;some.committer@chromium.org&gt;
+ Date: Thu Apr 10 08:54:46 2014 +0000
+ 1 file changed, 1 insertion(+)
+ create mode 100644 modified_file
+
+# That took the code authored by some.committer and committed it to
+# the branch by the person who drovered it (i.e. you).
+<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
+<span style="color: #e7e71c">commit bd8dc1c0678913e36b2b06855810803a2e0ab906</span>
+Author:     some.committer &lt;some.committer@chromium.org&gt;
+AuthorDate: Thu Apr 10 08:54:46 2014 +0000
+Commit:     you &lt;you@chromium.org&gt;
+CommitDate: Thu Apr 10 09:11:36 2014 +0000
+
+    This change needs to go to branch 9999
+
+    (cherry picked from commit b27fff7b167964750303f60222e79f3932f438e0)
+
+# Looks good. Ship it!
+<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
+# Wait for LGTM or TBR it.
+<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
+# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
+</code></pre></div></div><p><div class="paragraph"></p></div>
+</div>
 </div>
 </div>
 </div>
@@ -879,7 +1035,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 2014-09-09 13:42:13 PDT
+Last updated 2015-10-20 18:00:26 AEDT
 </div>
 </div>
 </body>