libv8 5.1.281.59.1 → 5.2.361.43.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.travis.yml +0 -7
- data/CHANGELOG.md +9 -1
- data/README.md +41 -23
- data/Rakefile +1 -1
- data/ext/libv8/builder.rb +1 -1
- data/ext/libv8/compiler/apple_llvm.rb +5 -4
- data/ext/libv8/compiler/clang.rb +5 -4
- data/ext/libv8/compiler/gcc.rb +5 -4
- data/ext/libv8/compiler/generic_compiler.rb +11 -1
- data/lib/libv8/version.rb +1 -1
- data/patches/0001-Build-a-standalone-static-library.patch +26 -0
- data/patches/{0002-Disable-building-tests.patch → 0002-Don-t-compile-unnecessary-stuff.patch} +31 -34
- data/patches/0003-Use-the-fPIC-flag-for-the-static-library.patch +10 -10
- data/patches/0004-Reinterpret-thread-hash-for-FreeBSD-too.patch +25 -0
- data/release/armhf-linux/Vagrantfile +95 -0
- data/release/armhf-linux/initrd.img +0 -0
- data/release/armhf-linux/vmlinuz +0 -0
- data/release/{x86_64-freebsd10 → x86_64-freebsd-10}/Vagrantfile +3 -1
- data/spec/compiler/apple_llvm_spec.rb +10 -3
- data/spec/compiler/clang_spec.rb +7 -0
- data/spec/compiler_spec.rb +1 -1
- data/spec/support/compiler_helpers.rb +3 -1
- data/vendor/depot_tools/{README → README.md} +33 -12
- data/vendor/depot_tools/checkout.py +7 -2
- data/vendor/depot_tools/cit.py +51 -13
- data/vendor/depot_tools/cpplint.py +27 -5
- data/vendor/depot_tools/git_cl.py +370 -290
- data/vendor/depot_tools/git_common.py +133 -28
- data/vendor/depot_tools/git_drover.py +29 -2
- data/vendor/depot_tools/git_map.py +2 -2
- data/vendor/depot_tools/git_map_branches.py +9 -5
- data/vendor/depot_tools/git_rebase_update.py +3 -3
- data/vendor/depot_tools/git_upstream_diff.py +1 -1
- data/vendor/depot_tools/infra/config/OWNERS +1 -0
- data/vendor/depot_tools/infra/config/cq.cfg +8 -3
- data/vendor/depot_tools/infra/config/recipes.cfg +1 -1
- data/vendor/depot_tools/man/html/depot_tools.html +10 -2
- data/vendor/depot_tools/man/html/depot_tools_tutorial.html +14 -15
- data/vendor/depot_tools/man/html/git-auto-svn.html +2 -2
- data/vendor/depot_tools/man/html/git-cherry-pick-upload.html +2 -11
- data/vendor/depot_tools/man/html/git-drover.html +19 -17
- data/vendor/depot_tools/man/html/git-footers.html +2 -2
- data/vendor/depot_tools/man/html/git-freeze.html +17 -4
- data/vendor/depot_tools/man/html/git-hyper-blame.html +2 -2
- data/vendor/depot_tools/man/html/git-map-branches.html +2 -2
- data/vendor/depot_tools/man/html/git-map.html +3 -3
- data/vendor/depot_tools/man/html/git-mark-merge-base.html +2 -2
- data/vendor/depot_tools/man/html/git-nav-downstream.html +7 -7
- data/vendor/depot_tools/man/html/git-nav-upstream.html +4 -4
- data/vendor/depot_tools/man/html/git-new-branch.html +2 -2
- data/vendor/depot_tools/man/html/git-rebase-update.html +2 -2
- data/vendor/depot_tools/man/html/git-rename-branch.html +2 -2
- data/vendor/depot_tools/man/html/git-reparent-branch.html +2 -2
- data/vendor/depot_tools/man/html/git-retry.html +2 -2
- data/vendor/depot_tools/man/html/git-squash-branch.html +4 -4
- data/vendor/depot_tools/man/html/git-thaw.html +2 -2
- data/vendor/depot_tools/man/html/git-upstream-diff.html +2 -2
- data/vendor/depot_tools/man/man1/git-auto-svn.1 +4 -4
- data/vendor/depot_tools/man/man1/git-cherry-pick-upload.1 +5 -14
- data/vendor/depot_tools/man/man1/git-drover.1 +21 -19
- data/vendor/depot_tools/man/man1/git-footers.1 +5 -5
- data/vendor/depot_tools/man/man1/git-freeze.1 +12 -6
- data/vendor/depot_tools/man/man1/git-hyper-blame.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map-branches.1 +5 -7
- data/vendor/depot_tools/man/man1/git-map.1 +5 -5
- data/vendor/depot_tools/man/man1/git-mark-merge-base.1 +4 -4
- data/vendor/depot_tools/man/man1/git-nav-downstream.1 +9 -9
- data/vendor/depot_tools/man/man1/git-nav-upstream.1 +6 -6
- data/vendor/depot_tools/man/man1/git-new-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-rebase-update.1 +4 -4
- data/vendor/depot_tools/man/man1/git-rename-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-reparent-branch.1 +4 -4
- data/vendor/depot_tools/man/man1/git-retry.1 +4 -4
- data/vendor/depot_tools/man/man1/git-squash-branch.1 +6 -6
- data/vendor/depot_tools/man/man1/git-thaw.1 +4 -4
- data/vendor/depot_tools/man/man1/git-upstream-diff.1 +4 -4
- data/vendor/depot_tools/man/man7/depot_tools.7 +9 -4
- data/vendor/depot_tools/man/man7/depot_tools_tutorial.7 +14 -15
- data/vendor/depot_tools/man/src/depot_tools_tutorial.txt +1 -2
- data/vendor/depot_tools/man/src/git-freeze.txt +15 -0
- data/vendor/depot_tools/man/src/make_docs.sh +4 -4
- data/vendor/depot_tools/owners.py +50 -46
- data/vendor/depot_tools/owners_finder.py +6 -19
- data/vendor/depot_tools/presubmit_canned_checks.py +2 -1
- data/vendor/depot_tools/presubmit_support.py +8 -10
- data/vendor/depot_tools/recipe_modules/bot_update/api.py +69 -55
- data/vendor/depot_tools/recipe_modules/bot_update/example.expected/tryjob_fail.json +1 -0
- data/vendor/depot_tools/recipe_modules/bot_update/example.expected/tryjob_fail_patch.json +1 -0
- data/vendor/depot_tools/recipe_modules/bot_update/example.expected/tryjob_fail_patch_download.json +1 -0
- data/vendor/depot_tools/recipe_modules/bot_update/resources/bot_update.py +2 -0
- data/vendor/depot_tools/recipe_modules/gclient/api.py +0 -17
- data/vendor/depot_tools/recipe_modules/gclient/config.py +9 -8
- data/vendor/depot_tools/recipe_modules/gclient/example.py +1 -1
- data/vendor/depot_tools/recipe_modules/git/api.py +20 -4
- data/vendor/depot_tools/recipe_modules/git/example.expected/can_fail_build.json +1 -0
- data/vendor/depot_tools/recipe_modules/git/example.expected/count-objects_with_bad_output_fails_build.json +1 -0
- data/vendor/depot_tools/recipe_modules/git/example.expected/git-cache-checkout.json +189 -0
- data/vendor/depot_tools/recipe_modules/git/example.expected/platform_win.json +2 -1
- data/vendor/depot_tools/recipe_modules/git/example.expected/rebase_failed.json +1 -0
- data/vendor/depot_tools/recipe_modules/git/example.py +6 -1
- data/vendor/depot_tools/recipe_modules/git_cl/api.py +13 -0
- data/vendor/depot_tools/recipe_modules/git_cl/example.expected/basic.json +17 -0
- data/vendor/depot_tools/recipe_modules/git_cl/example.py +3 -0
- data/vendor/depot_tools/recipe_modules/infra_paths/example.expected/paths_swarmbucket_linux.json +14 -0
- data/vendor/depot_tools/recipe_modules/infra_paths/example.expected/paths_swarmbucket_mac.json +14 -0
- data/vendor/depot_tools/recipe_modules/infra_paths/example.expected/paths_swarmbucket_win.json +14 -0
- data/vendor/depot_tools/recipe_modules/infra_paths/example.py +1 -1
- data/vendor/depot_tools/recipe_modules/infra_paths/path_config.py +23 -10
- data/vendor/depot_tools/recipe_modules/tryserver/api.py +5 -3
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_git_patch.json +1 -0
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_rietveld_patch.json +1 -0
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_rietveld_patch_new.json +1 -0
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_svn_patch.json +1 -0
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_wrong_patch.json +3 -1
- data/vendor/depot_tools/recipe_modules/tryserver/example.expected/with_wrong_patch_new.json +3 -1
- data/vendor/depot_tools/recipes.py +56 -27
- data/vendor/depot_tools/rietveld.py +10 -0
- data/vendor/depot_tools/third_party/httplib2/README.chromium +3 -3
- data/vendor/depot_tools/third_party/httplib2/__init__.py +31 -15
- data/vendor/depot_tools/third_party/upload.py +54 -45
- data/vendor/depot_tools/update_depot_tools +16 -70
- data/vendor/depot_tools/update_depot_tools.bat +4 -18
- data/vendor/depot_tools/win_toolchain/get_toolchain_if_necessary.py +10 -6
- metadata +15 -8
- data/patches/0001-Build-standalone-static-library.patch +0 -26
- data/vendor/depot_tools/git_utils/git-tree-prune +0 -122
@@ -902,7 +902,7 @@ autoupdate itself. You can use “Extract all…” from the context
|
|
902
902
|
bundle to <code>C:\workspace\depot_tools</code>:</p></div>
|
903
903
|
<div class="dlist"><dl>
|
904
904
|
<dt class="hdlist1">
|
905
|
-
With Administrator access:
|
905
|
+
With Administrator access:
|
906
906
|
</dt>
|
907
907
|
<dd>
|
908
908
|
<p>
|
@@ -911,7 +911,7 @@ With Administrator access:
|
|
911
911
|
<div class="paragraph"><p>Modify the PATH system variable to include <code>C:\workspace\depot_tools</code>.</p></div>
|
912
912
|
</dd>
|
913
913
|
<dt class="hdlist1">
|
914
|
-
Without Administrator access:
|
914
|
+
Without Administrator access:
|
915
915
|
</dt>
|
916
916
|
<dd>
|
917
917
|
<p>
|
@@ -982,7 +982,7 @@ commands:</p></div>
|
|
982
982
|
<div class="content">
|
983
983
|
<pre><code><strong><span class="white">$</span></strong> # get the code
|
984
984
|
<strong><span class="white">$</span></strong> # In an empty directory:
|
985
|
-
<strong><span class="white">$ fetch {chromium
|
985
|
+
<strong><span class="white">$ fetch {chromium,...}</span></strong>
|
986
986
|
|
987
987
|
<strong><span class="white">$</span></strong> # Update third_party repos and run pre-compile hooks
|
988
988
|
<strong><span class="white">$ gclient sync</span></strong>
|
@@ -1006,7 +1006,6 @@ commands:</p></div>
|
|
1006
1006
|
<div class="listingblock">
|
1007
1007
|
<div class="content">
|
1008
1008
|
<pre><code><strong><span class="white">$ fetch chromium</span></strong> # Basic checkout for desktop Chromium
|
1009
|
-
<strong><span class="white">$ fetch blink</span></strong> # Chromium code with Blink checked out to tip-of-tree
|
1010
1009
|
<strong><span class="white">$ fetch android</span></strong> # Chromium checkout for Android platform
|
1011
1010
|
<strong><span class="white">$ fetch ios</span></strong> # Chromium checkout for iOS platform</code></pre>
|
1012
1011
|
</div></div>
|
@@ -1245,7 +1244,7 @@ It was a Domo-Kuun.
|
|
1245
1244
|
[fix_typo 615ffa7] Fix terrible typo.
|
1246
1245
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
1247
1246
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1248
|
-
<span style="
|
1247
|
+
* <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> fix_typo</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
|
1249
1248
|
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
1250
1249
|
* <span style="font-weight: bold; color: #e42e16">41290e0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ don't use glibc-specific execinfo.h on uclibc builds
|
1251
1250
|
* <span style="font-weight: bold; color: #e42e16">a76fde7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ [fsp] Add requestUnmount() method together with the request manager.
|
@@ -1314,7 +1313,7 @@ It was a Domo-<span style="color: #e42e16">Banana</span><span style="color: #19c
|
|
1314
1313
|
</code></pre></div></div><p><div class="paragraph"> Since we got lgtm, let the CQ land it.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cl set_commit</span>
|
1315
1314
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1316
1315
|
* <span style="font-weight: bold; color: #e42e16">0e2e52e </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
|
1317
|
-
<span style="color: #e42e16">|</span> <span style="
|
1316
|
+
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> fix_typo</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
|
1318
1317
|
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
|
1319
1318
|
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
|
1320
1319
|
* <span style="font-weight: bold; color: #e42e16">beec6f4 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Make ReflectorImpl use mailboxes<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(chap2, fix_typo)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
@@ -1338,7 +1337,7 @@ state without impacting any branches by performing another checkout.
|
|
1338
1337
|
If you want to create a new branch to retain commits you create, you may
|
1339
1338
|
do so (now or later) by using -b with the checkout command again. Example:
|
1340
1339
|
|
1341
|
-
git checkout -b
|
1340
|
+
git checkout -b <new-branch-name>
|
1342
1341
|
|
1343
1342
|
HEAD is now at beec6f4... Make ReflectorImpl use mailboxes
|
1344
1343
|
<span style="font-weight: bold; color: #ffffff">$ git nav-downstream</span>
|
@@ -1391,7 +1390,7 @@ EOF
|
|
1391
1390
|
[chap2 ceef712] Finish chapter 2
|
1392
1391
|
1 file changed, 6 insertions(+)
|
1393
1392
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1394
|
-
<span style="
|
1393
|
+
* <span style="font-weight: bold; color: #e42e16">ceef712 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> chap2</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2
|
1395
1394
|
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
|
1396
1395
|
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
|
1397
1396
|
<span style="color: #e42e16">|</span><span style="color: #e42e16">/</span>
|
@@ -1416,7 +1415,7 @@ EOF
|
|
1416
1415
|
[chap3 7d4238a] beginning of chapter 3
|
1417
1416
|
1 file changed, 4 insertions(+)
|
1418
1417
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1419
|
-
<span style="
|
1418
|
+
* <span style="font-weight: bold; color: #e42e16">7d4238a </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
|
1420
1419
|
* <span style="font-weight: bold; color: #e42e16">ceef712 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">chap2</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
1421
1420
|
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">2c0ad9c </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fix_typo</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Fix typo for good!
|
1422
1421
|
<span style="color: #e42e16">|</span> * <span style="font-weight: bold; color: #e42e16">615ffa7 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
|
@@ -1436,13 +1435,13 @@ Rebasing: chap2
|
|
1436
1435
|
Rebasing: fix_typo
|
1437
1436
|
Failed! Attempting to squash fix_typo ... Success!
|
1438
1437
|
Rebasing: chap3
|
1439
|
-
Deleted branch fix_typo (was 5d26fec).
|
1440
1438
|
Reparented chap3 to track origin/master (was tracking chap2)
|
1439
|
+
Deleted branch fix_typo (was 5d26fec).
|
1441
1440
|
Deleted branch chap2 (was 5d26fec).
|
1442
1441
|
</code></pre></div></div><p><div class="paragraph"> Well look at that. The CQ landed our typo and chapter2 branches already and git rebase-update cleaned them up for us.</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
|
1443
1442
|
... truncated output ...
|
1444
1443
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1445
|
-
<span style="
|
1444
|
+
* <span style="font-weight: bold; color: #e42e16">93fe917 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
|
1446
1445
|
* <span style="font-weight: bold; color: #e42e16">5d26fec </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Finish chapter 2<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
1447
1446
|
* <span style="font-weight: bold; color: #e42e16">df7fefb </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Revert 255617, due to it not tracking use of the link doctor page properly.
|
1448
1447
|
* <span style="font-weight: bold; color: #e42e16">4b39cda </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Fix terrible typo.
|
@@ -1471,7 +1470,7 @@ Rebasing: chap2
|
|
1471
1470
|
There was an poignant pause.
|
1472
1471
|
|
1473
1472
|
CHAPTER 3:
|
1474
|
-
<span style="color: #19c518">++<<<<<<<
|
1473
|
+
<span style="color: #19c518">++<<<<<<< 59cdb7335b1c3a159ecc22214441cbe2194de25c</span>
|
1475
1474
|
<span style="color: #19c518"> +Hilariousness! This chapter is awesome!</span>
|
1476
1475
|
<span style="color: #19c518">++=======</span>
|
1477
1476
|
<span style="color: #19c518">+ Mr. Usagi felt that something wasn't right. Shortly after the Domo-Kun left he</span>
|
@@ -1500,7 +1499,7 @@ chap3 up-to-date
|
|
1500
1499
|
<span style="font-weight: bold; color: #ffffff">$ gclient sync</span>
|
1501
1500
|
... truncated output ...
|
1502
1501
|
<span style="font-weight: bold; color: #ffffff">$ git map</span>
|
1503
|
-
<span style="
|
1502
|
+
* <span style="font-weight: bold; color: #e42e16">1cb4f5b </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> chap3</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ beginning of chapter 3
|
1504
1503
|
* <span style="font-weight: bold; color: #e42e16">59cdb73 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">origin/master</span><span style="color: #19c518">, </span><span style="color: #e42e16">origin/HEAD</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Refactor data interchange format.<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(chap3)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
1505
1504
|
* <span style="font-weight: bold; color: #e42e16">34676a3 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Ensure FS is exited for all not-in-same-page navigations.
|
1506
1505
|
* <span style="font-weight: bold; color: #e42e16">7d4784e </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ Add best chapter2 ever!
|
@@ -1574,14 +1573,14 @@ LKGR
|
|
1574
1573
|
<div class="sectionbody">
|
1575
1574
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
1576
1575
|
assist with the development of chromium and related projects. Download the tools
|
1577
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
1576
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
1578
1577
|
</div>
|
1579
1578
|
</div>
|
1580
1579
|
</div>
|
1581
1580
|
<div id="footnotes"><hr /></div>
|
1582
1581
|
<div id="footer">
|
1583
1582
|
<div id="footer-text">
|
1584
|
-
Last updated 2016-
|
1583
|
+
Last updated 2016-07-21 10:09:00 PDT
|
1585
1584
|
</div>
|
1586
1585
|
</div>
|
1587
1586
|
</body>
|
@@ -823,14 +823,14 @@ git auto-svn</code></pre>
|
|
823
823
|
<div class="sectionbody">
|
824
824
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
825
825
|
assist with the development of chromium and related projects. Download the tools
|
826
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
826
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
827
827
|
</div>
|
828
828
|
</div>
|
829
829
|
</div>
|
830
830
|
<div id="footnotes"><hr /></div>
|
831
831
|
<div id="footer">
|
832
832
|
<div id="footer-text">
|
833
|
-
Last updated
|
833
|
+
Last updated 2016-07-21 10:09:00 PDT
|
834
834
|
</div>
|
835
835
|
</div>
|
836
836
|
</body>
|
@@ -774,15 +774,6 @@ as if it were generated by <code>git cherry-pick -x</code>.</p></div>
|
|
774
774
|
<h2 id="_example">EXAMPLE</h2>
|
775
775
|
<div class="sectionbody">
|
776
776
|
<div class="paragraph"><p></p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -h</span>
|
777
|
-
usage: git_cherry_pick_upload.py [-h] --branch <branch> <commit>
|
778
|
-
|
779
|
-
positional arguments:
|
780
|
-
<commit> SHA to cherry pick.
|
781
|
-
|
782
|
-
optional arguments:
|
783
|
-
-h, --help show this help message and exit
|
784
|
-
--branch <branch>, -b <branch>
|
785
|
-
The upstream branch to cherry pick to.
|
786
777
|
|
787
778
|
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick-upload -b my_branch c02b7d24a066adb747fdeb12deb21bfa</span>
|
788
779
|
Found parent revision: b96d69fda53845a205151613a9c4cc93
|
@@ -810,14 +801,14 @@ Finalizing upload: OK
|
|
810
801
|
<div class="sectionbody">
|
811
802
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
812
803
|
assist with the development of chromium and related projects. Download the tools
|
813
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
804
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
814
805
|
</div>
|
815
806
|
</div>
|
816
807
|
</div>
|
817
808
|
<div id="footnotes"><hr /></div>
|
818
809
|
<div id="footer">
|
819
810
|
<div id="footer-text">
|
820
|
-
Last updated
|
811
|
+
Last updated 2016-07-21 10:09:00 PDT
|
821
812
|
</div>
|
822
813
|
</div>
|
823
814
|
</body>
|
@@ -858,7 +858,7 @@ at least once to fetch the branches.</p></div>
|
|
858
858
|
<h4 id="_merge_example">Merge Example</h4>
|
859
859
|
<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'.
|
860
860
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
861
|
-
<span style="color: #e7e71c">commit
|
861
|
+
<span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
|
862
862
|
Author: some.committer <some.committer@chromium.org>
|
863
863
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
864
864
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -867,10 +867,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
867
867
|
This change needs to go to branch 9999
|
868
868
|
|
869
869
|
# Now do the 'drover'.
|
870
|
-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick
|
870
|
+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
|
871
871
|
Going to cherry-pick
|
872
872
|
"""
|
873
|
-
<span style="color: #e7e71c">commit
|
873
|
+
<span style="color: #e7e71c">commit f1b2947cd99ad36614e71a51a925a6dae060fecd</span>
|
874
874
|
Author: some.committer <some.committer@chromium.org>
|
875
875
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
876
876
|
|
@@ -888,7 +888,7 @@ About to land on 9999. Continue (y/n)? y
|
|
888
888
|
<h4 id="_merge_with_conflicts_example">Merge with Conflicts Example</h4>
|
889
889
|
<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'.
|
890
890
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
891
|
-
<span style="color: #e7e71c">commit
|
891
|
+
<span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
|
892
892
|
Author: some.committer <some.committer@chromium.org>
|
893
893
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
894
894
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -897,10 +897,10 @@ CommitDate: Thu Apr 10 08:54:46 2014 +0000
|
|
897
897
|
This change needs to go to branch 9999
|
898
898
|
|
899
899
|
# Now do the 'drover'.
|
900
|
-
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick
|
900
|
+
<span style="font-weight: bold; color: #ffffff">$ git drover --branch 9999 --cherry-pick 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
|
901
901
|
Going to cherry-pick
|
902
902
|
"""
|
903
|
-
<span style="color: #e7e71c">commit
|
903
|
+
<span style="color: #e7e71c">commit 78d5e1beb49c2bfa0369a2712dd1b4a502805a77</span>
|
904
904
|
Author: some.committer <some.committer@chromium.org>
|
905
905
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
906
906
|
|
@@ -942,28 +942,29 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
|
942
942
|
|
943
943
|
# Here's the commit we want to revert.
|
944
944
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
945
|
-
<span style="color: #e7e71c">commit
|
945
|
+
<span style="color: #e7e71c">commit d281ba6029d6bff1368a5885be8e2c638e1bfe73</span>
|
946
946
|
Author: some.committer <some.committer@chromium.org>
|
947
947
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
948
948
|
|
949
949
|
This change is horribly broken.
|
950
950
|
|
951
951
|
# Now do the revert.
|
952
|
-
<span style="font-weight: bold; color: #ffffff">$ git revert
|
952
|
+
<span style="font-weight: bold; color: #ffffff">$ git revert d281ba6029d6bff1368a5885be8e2c638e1bfe73</span>
|
953
953
|
|
954
954
|
# That reverted the change and committed the revert.
|
955
955
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1</span>
|
956
|
-
<span style="color: #e7e71c">commit
|
956
|
+
<span style="color: #e7e71c">commit 7eb05d0f8e79ef563684500dc38d0dee069f7dc6</span>
|
957
957
|
Author: you <you@chromium.org>
|
958
958
|
Date: Thu Apr 10 09:11:36 2014 +0000
|
959
959
|
|
960
960
|
Revert "This change is horribly broken."
|
961
961
|
|
962
|
-
This reverts commit
|
962
|
+
This reverts commit d281ba6029d6bff1368a5885be8e2c638e1bfe73.
|
963
963
|
|
964
964
|
# As with old drover, reverts are generally OK to commit without LGTM.
|
965
965
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload -r some.committer@chromium.org --send-mail</span>
|
966
966
|
<span style="font-weight: bold; color: #ffffff">$ git cl land --bypass-hooks</span>
|
967
|
+
Using 50% similarity for rename/copy detection. Override with --similarity.
|
967
968
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
968
969
|
</div>
|
969
970
|
<div class="sect3">
|
@@ -973,7 +974,7 @@ Date: Thu Apr 10 09:11:36 2014 +0000
|
|
973
974
|
|
974
975
|
# Here's a commit (from some.committer) that we want to 'drover'.
|
975
976
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
976
|
-
<span style="color: #e7e71c">commit
|
977
|
+
<span style="color: #e7e71c">commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422</span>
|
977
978
|
Author: some.committer <some.committer@chromium.org>
|
978
979
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
979
980
|
Commit: some.committer <some.committer@chromium.org>
|
@@ -987,8 +988,8 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
|
987
988
|
|
988
989
|
# Now do the 'drover'.
|
989
990
|
# IMPORTANT!!! Do Not leave off the '-x' flag
|
990
|
-
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x
|
991
|
-
[drover_9999
|
991
|
+
<span style="font-weight: bold; color: #ffffff">$ git cherry-pick -x b9199aa1ab7d60a1e127de8c46c0983d13f2c422</span>
|
992
|
+
[drover_9999 729161e] This change needs to go to branch 9999
|
992
993
|
Author: some.committer <some.committer@chromium.org>
|
993
994
|
Date: Thu Apr 10 08:54:46 2014 +0000
|
994
995
|
1 file changed, 1 insertion(+)
|
@@ -997,7 +998,7 @@ Branch drover_9999 set up to track remote ref refs/branch-heads/9999.
|
|
997
998
|
# That took the code authored by some.committer and committed it to
|
998
999
|
# the branch by the person who drovered it (i.e. you).
|
999
1000
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 1 --pretty=fuller</span>
|
1000
|
-
<span style="color: #e7e71c">commit
|
1001
|
+
<span style="color: #e7e71c">commit 729161e36af15142cdf591021de71e70e0db1ea2</span>
|
1001
1002
|
Author: some.committer <some.committer@chromium.org>
|
1002
1003
|
AuthorDate: Thu Apr 10 08:54:46 2014 +0000
|
1003
1004
|
Commit: you <you@chromium.org>
|
@@ -1005,12 +1006,13 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
|
1005
1006
|
|
1006
1007
|
This change needs to go to branch 9999
|
1007
1008
|
|
1008
|
-
(cherry picked from commit
|
1009
|
+
(cherry picked from commit b9199aa1ab7d60a1e127de8c46c0983d13f2c422)
|
1009
1010
|
|
1010
1011
|
# Looks good. Ship it!
|
1011
1012
|
<span style="font-weight: bold; color: #ffffff">$ git cl upload</span>
|
1012
1013
|
# Wait for LGTM or TBR it.
|
1013
1014
|
<span style="font-weight: bold; color: #ffffff">$ git cl land</span>
|
1015
|
+
Using 50% similarity for rename/copy detection. Override with --similarity.
|
1014
1016
|
# Or skip the LGTM/TBR and just 'git cl land --bypass-hooks'
|
1015
1017
|
</code></pre></div></div><p><div class="paragraph"></p></div>
|
1016
1018
|
</div>
|
@@ -1028,14 +1030,14 @@ CommitDate: Thu Apr 10 09:11:36 2014 +0000
|
|
1028
1030
|
<div class="sectionbody">
|
1029
1031
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
1030
1032
|
assist with the development of chromium and related projects. Download the tools
|
1031
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
1033
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
1032
1034
|
</div>
|
1033
1035
|
</div>
|
1034
1036
|
</div>
|
1035
1037
|
<div id="footnotes"><hr /></div>
|
1036
1038
|
<div id="footer">
|
1037
1039
|
<div id="footer-text">
|
1038
|
-
Last updated
|
1040
|
+
Last updated 2016-07-21 10:09:00 PDT
|
1039
1041
|
</div>
|
1040
1042
|
</div>
|
1041
1043
|
</body>
|
@@ -864,14 +864,14 @@ refs/heads/master
|
|
864
864
|
<div class="sectionbody">
|
865
865
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
866
866
|
assist with the development of chromium and related projects. Download the tools
|
867
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
867
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
868
868
|
</div>
|
869
869
|
</div>
|
870
870
|
</div>
|
871
871
|
<div id="footnotes"><hr /></div>
|
872
872
|
<div id="footer">
|
873
873
|
<div id="footer-text">
|
874
|
-
Last updated
|
874
|
+
Last updated 2016-07-21 10:09:00 PDT
|
875
875
|
</div>
|
876
876
|
</div>
|
877
877
|
</body>
|
@@ -773,6 +773,8 @@ exactly the same working state later (by running <code>git thaw</code>).</p></di
|
|
773
773
|
with <em>git add</em>, <em>git mv</em>, <em>git rm</em>, etc.). A commit with the message
|
774
774
|
<code>FREEZE.unindexed</code> will contain all changes which were not in your index at the
|
775
775
|
time you ran git freeze (freshly modified files, new files, etc.).</p></div>
|
776
|
+
<div class="paragraph"><p>By default <code>git freeze</code> will only freeze up to 100MB of untracked files. See
|
777
|
+
<em>CONFIGURATION VARIABLES</em> for more details.</p></div>
|
776
778
|
</div>
|
777
779
|
</div>
|
778
780
|
<div class="sect1">
|
@@ -788,7 +790,7 @@ time you ran git freeze (freshly modified files, new files, etc.).</p></div>
|
|
788
790
|
<span style="font-weight: bold; color: #ffffff">$ git freeze</span>
|
789
791
|
<span style="font-weight: bold; color: #ffffff">$ git status --short</span>
|
790
792
|
<span style="font-weight: bold; color: #ffffff">$ git log -n 2 --stat</span>
|
791
|
-
<span style="color: #e7e71c">commit
|
793
|
+
<span style="color: #e7e71c">commit 42c38320f46c6bc9a8aba7f15b41971e5f1db75b</span>
|
792
794
|
Author: local <local@chromium.org>
|
793
795
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
794
796
|
|
@@ -800,7 +802,7 @@ Date: Thu Apr 10 08:54:56 2014 +0000
|
|
800
802
|
unstaged_deleted_file | 1 <span style="color: #e42e16">-</span>
|
801
803
|
4 files changed, 2 insertions(+), 1 deletion(-)
|
802
804
|
|
803
|
-
<span style="color: #e7e71c">commit
|
805
|
+
<span style="color: #e7e71c">commit 5e0079a0fd55960682c389e71e0283594a80c02b</span>
|
804
806
|
Author: local <local@chromium.org>
|
805
807
|
Date: Thu Apr 10 08:54:56 2014 +0000
|
806
808
|
|
@@ -822,6 +824,17 @@ Date: Thu Apr 10 08:54:56 2014 +0000
|
|
822
824
|
</div>
|
823
825
|
</div>
|
824
826
|
<div class="sect1">
|
827
|
+
<h2 id="_configuration_variables">CONFIGURATION VARIABLES</h2>
|
828
|
+
<div class="sectionbody">
|
829
|
+
<div class="sect2">
|
830
|
+
<h3 id="_depot_tools_freeze_size_limit">depot-tools.freeze-size-limit</h3>
|
831
|
+
<div class="paragraph"><p>This sets the size limit as an integer number of megabytes of untracked files
|
832
|
+
that git-freeze will be willing to put in suspended animation. A 0 or negative
|
833
|
+
limit disables the size-limit check entirely. <strong>100</strong> by default.</p></div>
|
834
|
+
</div>
|
835
|
+
</div>
|
836
|
+
</div>
|
837
|
+
<div class="sect1">
|
825
838
|
<h2 id="_see_also">SEE ALSO</h2>
|
826
839
|
<div class="sectionbody">
|
827
840
|
<div class="paragraph"><p><a href="git-thaw.html">git-thaw(1)</a></p></div>
|
@@ -832,14 +845,14 @@ Date: Thu Apr 10 08:54:56 2014 +0000
|
|
832
845
|
<div class="sectionbody">
|
833
846
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
834
847
|
assist with the development of chromium and related projects. Download the tools
|
835
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
848
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
836
849
|
</div>
|
837
850
|
</div>
|
838
851
|
</div>
|
839
852
|
<div id="footnotes"><hr /></div>
|
840
853
|
<div id="footer">
|
841
854
|
<div id="footer-text">
|
842
|
-
Last updated
|
855
|
+
Last updated 2016-07-21 10:09:00 PDT
|
843
856
|
</div>
|
844
857
|
</div>
|
845
858
|
</body>
|
@@ -864,14 +864,14 @@ other more invasive changes.</p></div>
|
|
864
864
|
<div class="sectionbody">
|
865
865
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
866
866
|
assist with the development of chromium and related projects. Download the tools
|
867
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
867
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
868
868
|
</div>
|
869
869
|
</div>
|
870
870
|
</div>
|
871
871
|
<div id="footnotes"><hr /></div>
|
872
872
|
<div id="footer">
|
873
873
|
<div id="footer-text">
|
874
|
-
Last updated 2016-
|
874
|
+
Last updated 2016-07-21 10:09:00 PDT
|
875
875
|
</div>
|
876
876
|
</div>
|
877
877
|
</body>
|
@@ -858,14 +858,14 @@ file.</p></div>
|
|
858
858
|
<div class="sectionbody">
|
859
859
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
860
860
|
assist with the development of chromium and related projects. Download the tools
|
861
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
861
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
862
862
|
</div>
|
863
863
|
</div>
|
864
864
|
</div>
|
865
865
|
<div id="footnotes"><hr /></div>
|
866
866
|
<div id="footer">
|
867
867
|
<div id="footer-text">
|
868
|
-
Last updated
|
868
|
+
Last updated 2016-07-21 10:09:00 PDT
|
869
869
|
</div>
|
870
870
|
</div>
|
871
871
|
</body>
|
@@ -835,7 +835,7 @@ configure this, use git <code>config --add depot-tools.map-extra <value></
|
|
835
835
|
<div class="sectionbody">
|
836
836
|
<div class="paragraph"><p>Running <em>git map</em> would result in an output something like:
|
837
837
|
</p></div><div class="listingblock"><div class="content"><pre><code><span style="font-weight: bold; color: #ffffff">$ git map</span>
|
838
|
-
<span style="
|
838
|
+
* <span style="font-weight: bold; color: #e42e16">d0fb9c7 </span><span style="color: #19c518"> (</span><span style="color: #e42e16">HEAD -> frozen_branch</span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ FREEZE.unindexed
|
839
839
|
* <span style="font-weight: bold; color: #e42e16">f48f415 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ modfile
|
840
840
|
* <span style="font-weight: bold; color: #e42e16">4c5b9c0 </span><span style="color: #19c518"></span> <span style="color: #e7e71c">2014-04-10</span> ~ a deleted file
|
841
841
|
* <span style="font-weight: bold; color: #e42e16">f7ce1e4 </span><span style="color: #19c518"> (</span><span style="color: #19c518"></span><span style="font-weight: bold; color: #19c518">fixit</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span><span style="color: #19c518">) </span><span style="color: #e7e71c">2014-04-10</span> ~ Add neat feature<span style="font-weight: bold"></span><span style="font-weight: bold; color: #ffffff"> <(frozen_branch)</span><span style="font-weight: bold"></span><span style="font-weight: bold"></span>
|
@@ -873,14 +873,14 @@ branch), use the <a href="git-map-branches.html">git-map-branches(1)</a> command
|
|
873
873
|
<div class="sectionbody">
|
874
874
|
<div class="paragraph"><p>Part of the chromium <a href="depot_tools.html">depot_tools(7)</a> suite. These tools are meant to
|
875
875
|
assist with the development of chromium and related projects. Download the tools
|
876
|
-
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools
|
876
|
+
from <a href="https://chromium.googlesource.com/chromium/tools/depot_tools">here</a>.</p></div>
|
877
877
|
</div>
|
878
878
|
</div>
|
879
879
|
</div>
|
880
880
|
<div id="footnotes"><hr /></div>
|
881
881
|
<div id="footer">
|
882
882
|
<div id="footer-text">
|
883
|
-
Last updated
|
883
|
+
Last updated 2016-07-21 10:09:00 PDT
|
884
884
|
</div>
|
885
885
|
</div>
|
886
886
|
</body>
|