libv8 7.4.288.28.0beta1 → 7.8.279.23.0beta1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +0 -1
- data/lib/libv8/version.rb +1 -1
- data/vendor/depot_tools/annotated_gclient.py +2 -4
- data/vendor/depot_tools/auth.py +0 -2
- data/vendor/depot_tools/autoninja +1 -3
- data/vendor/depot_tools/autoninja.bat +1 -1
- data/vendor/depot_tools/autoninja.py +1 -3
- data/vendor/depot_tools/bb +1 -1
- data/vendor/depot_tools/bootstrap/win/manifest.txt +1 -1
- data/vendor/depot_tools/buildbucket.py +6 -8
- data/vendor/depot_tools/checkout.py +5 -7
- data/vendor/depot_tools/cipd +1 -1
- data/vendor/depot_tools/cipd_manifest.txt +4 -4
- data/vendor/depot_tools/cipd_manifest.versions +80 -80
- data/vendor/depot_tools/cit.py +7 -9
- data/vendor/depot_tools/clang_format.py +1 -4
- data/vendor/depot_tools/clang_format_merge_driver.py +7 -9
- data/vendor/depot_tools/compile_single_file.py +1 -3
- data/vendor/depot_tools/dart_format.py +2 -4
- data/vendor/depot_tools/depot-tools-auth.py +8 -10
- data/vendor/depot_tools/fix_encoding.py +2 -5
- data/vendor/depot_tools/gclient-new-workdir.py +0 -2
- data/vendor/depot_tools/gclient.py +9 -8
- data/vendor/depot_tools/gclient_scm.py +28 -54
- data/vendor/depot_tools/gclient_utils.py +4 -14
- data/vendor/depot_tools/gerrit_util.py +6 -8
- data/vendor/depot_tools/git_cache.py +37 -53
- data/vendor/depot_tools/git_cl.py +42 -115
- data/vendor/depot_tools/git_drover.py +1 -3
- data/vendor/depot_tools/git_find_releases.py +6 -8
- data/vendor/depot_tools/git_footers.py +5 -7
- data/vendor/depot_tools/git_freezer.py +1 -3
- data/vendor/depot_tools/git_map_branches.py +5 -7
- data/vendor/depot_tools/git_mark_merge_base.py +6 -8
- data/vendor/depot_tools/git_nav_downstream.py +5 -7
- data/vendor/depot_tools/git_number.py +1 -3
- data/vendor/depot_tools/git_rebase_update.py +43 -38
- data/vendor/depot_tools/git_reparent_branch.py +6 -8
- data/vendor/depot_tools/git_upstream_diff.py +2 -4
- data/vendor/depot_tools/gn.py +4 -6
- data/vendor/depot_tools/infra/config/recipes.cfg +1 -1
- data/vendor/depot_tools/led +1 -1
- data/vendor/depot_tools/luci-auth +1 -1
- data/vendor/depot_tools/lucicfg +1 -1
- data/vendor/depot_tools/mac_toolchain +1 -1
- data/vendor/depot_tools/man/html/depot_tools.html +1 -1
- data/vendor/depot_tools/man/html/depot_tools_tutorial.html +22 -28
- data/vendor/depot_tools/man/html/git-cl.html +1 -1
- data/vendor/depot_tools/man/html/git-drover.html +18 -18
- data/vendor/depot_tools/man/html/git-footers.html +1 -1
- data/vendor/depot_tools/man/html/git-freeze.html +3 -3
- data/vendor/depot_tools/man/html/git-hyper-blame.html +1 -1
- data/vendor/depot_tools/man/html/git-map-branches.html +2 -2
- data/vendor/depot_tools/man/html/git-map.html +1 -1
- data/vendor/depot_tools/man/html/git-mark-merge-base.html +1 -1
- data/vendor/depot_tools/man/html/git-nav-downstream.html +3 -3
- data/vendor/depot_tools/man/html/git-nav-upstream.html +6 -12
- data/vendor/depot_tools/man/html/git-new-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-rebase-update.html +1 -20
- data/vendor/depot_tools/man/html/git-rename-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-reparent-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-retry.html +1 -1
- data/vendor/depot_tools/man/html/git-squash-branch.html +1 -1
- data/vendor/depot_tools/man/html/git-thaw.html +1 -1
- data/vendor/depot_tools/man/html/git-upstream-diff.html +6 -10
- data/vendor/depot_tools/man/man1/git-cl.1 +4 -4
- data/vendor/depot_tools/man/man1/git-drover.1 +21 -21
- data/vendor/depot_tools/man/man1/git-footers.1 +4 -4
- data/vendor/depot_tools/man/man1/git-freeze.1 +6 -6
- data/vendor/depot_tools/man/man1/git-hyper-blame.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map-branches.1 +4 -4
- data/vendor/depot_tools/man/man1/git-map.1 +4 -4
- data/vendor/depot_tools/man/man1/git-mark-merge-base.1 +4 -4
- data/vendor/depot_tools/man/man1/git-nav-downstream.1 +6 -6
- data/vendor/depot_tools/man/man1/git-nav-upstream.1 +9 -15
- data/vendor/depot_tools/man/man1/git-new-branch.1 +3 -3
- data/vendor/depot_tools/man/man1/git-rebase-update.1 +4 -14
- 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 +4 -4
- data/vendor/depot_tools/man/man1/git-thaw.1 +4 -4
- data/vendor/depot_tools/man/man1/git-upstream-diff.1 +13 -7
- data/vendor/depot_tools/man/man7/depot_tools.7 +4 -4
- data/vendor/depot_tools/man/man7/depot_tools_tutorial.7 +27 -33
- data/vendor/depot_tools/man/src/filter_demo_output.py +1 -3
- data/vendor/depot_tools/man/src/git-rebase-update.txt +0 -7
- data/vendor/depot_tools/my_activity.py +11 -13
- data/vendor/depot_tools/my_reviews.py +29 -34
- data/vendor/depot_tools/ninjalog_uploader_wrapper.py +2 -4
- data/vendor/depot_tools/owners_finder.py +1 -3
- data/vendor/depot_tools/patch.py +1 -1
- data/vendor/depot_tools/post_build_ninja_summary.py +15 -17
- data/vendor/depot_tools/presubmit_canned_checks.py +1 -3
- data/vendor/depot_tools/presubmit_support.py +5 -10
- data/vendor/depot_tools/prpc +1 -1
- data/vendor/depot_tools/recipes/README.recipes.md +17 -17
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json +4 -2
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +5 -25
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +5 -23
- data/vendor/depot_tools/recipes/recipe_modules/gclient/config.py +6 -0
- data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.py +1 -0
- data/vendor/depot_tools/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +5 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json +5 -0
- data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +6 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json +3 -1
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json +6 -4
- data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json +6 -4
- data/vendor/depot_tools/rietveld.py +1 -3
- data/vendor/depot_tools/roll_dep.py +0 -2
- data/vendor/depot_tools/roll_dep_svn.py +11 -14
- data/vendor/depot_tools/scm.py +5 -10
- data/vendor/depot_tools/split_cl.py +11 -13
- data/vendor/depot_tools/subprocess2.py +1 -1
- data/vendor/depot_tools/third_party/colorama/LICENSE.txt +1 -0
- data/vendor/depot_tools/third_party/colorama/README.chromium +5 -4
- data/vendor/depot_tools/third_party/colorama/README.txt +304 -0
- data/vendor/depot_tools/third_party/colorama/__init__.py +4 -3
- data/vendor/depot_tools/third_party/colorama/ansi.py +30 -82
- data/vendor/depot_tools/third_party/colorama/ansitowin32.py +37 -105
- data/vendor/depot_tools/third_party/colorama/initialise.py +15 -39
- data/vendor/depot_tools/third_party/colorama/win32.py +28 -46
- data/vendor/depot_tools/third_party/colorama/winterm.py +31 -80
- data/vendor/depot_tools/third_party/upload.py +1 -1
- data/vendor/depot_tools/upload_to_google_storage.py +6 -8
- data/vendor/depot_tools/vpython +1 -1
- data/vendor/depot_tools/watchlists.py +3 -5
- data/vendor/depot_tools/weekly +2 -4
- data/vendor/depot_tools/win_toolchain/get_toolchain_if_necessary.py +36 -38
- data/vendor/depot_tools/win_toolchain/package_from_installed.py +8 -10
- data/vendor/depot_tools/wtf +3 -5
- metadata +3 -3
- data/vendor/depot_tools/third_party/colorama/README.rst +0 -346
@@ -277,7 +277,11 @@
|
|
277
277
|
},
|
278
278
|
{
|
279
279
|
"failure": {
|
280
|
-
"
|
280
|
+
"exception": {
|
281
|
+
"traceback": [
|
282
|
+
"<omitted by recipe engine>"
|
283
|
+
]
|
284
|
+
},
|
281
285
|
"humanReason": "1 out of 1 aggregated steps failed: Error querying for CL description: host:'https://chromium-review.googlesource.com' change:122; patchset:3"
|
282
286
|
},
|
283
287
|
"name": "$result"
|
data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json
CHANGED
@@ -162,7 +162,12 @@
|
|
162
162
|
},
|
163
163
|
{
|
164
164
|
"failure": {
|
165
|
-
"
|
165
|
+
"exception": {
|
166
|
+
"traceback": [
|
167
|
+
"<omitted by recipe engine>"
|
168
|
+
]
|
169
|
+
},
|
170
|
+
"humanReason": "Infra Failure: Step('git status can_fail_build') returned 1"
|
166
171
|
},
|
167
172
|
"name": "$result"
|
168
173
|
}
|
data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json
CHANGED
@@ -219,7 +219,12 @@
|
|
219
219
|
},
|
220
220
|
{
|
221
221
|
"failure": {
|
222
|
-
"
|
222
|
+
"exception": {
|
223
|
+
"traceback": [
|
224
|
+
"<omitted by recipe engine>"
|
225
|
+
]
|
226
|
+
},
|
227
|
+
"humanReason": "Infra Failure: Step('my repo rebase') returned 1"
|
223
228
|
},
|
224
229
|
"name": "$result"
|
225
230
|
}
|
@@ -131,14 +131,16 @@
|
|
131
131
|
"name": "fail",
|
132
132
|
"~followup_annotations": [
|
133
133
|
"@@@STEP_TEXT@foo@@@",
|
134
|
-
"@@@
|
135
|
-
"@@@
|
134
|
+
"@@@STEP_FAILURE@@@",
|
135
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
136
136
|
]
|
137
137
|
},
|
138
138
|
{
|
139
139
|
"failure": {
|
140
|
-
"failure": {
|
141
|
-
|
140
|
+
"failure": {
|
141
|
+
"step": "fail"
|
142
|
+
},
|
143
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
142
144
|
},
|
143
145
|
"name": "$result"
|
144
146
|
}
|
@@ -131,14 +131,16 @@
|
|
131
131
|
"name": "fail",
|
132
132
|
"~followup_annotations": [
|
133
133
|
"@@@STEP_TEXT@foo@@@",
|
134
|
-
"@@@
|
135
|
-
"@@@
|
134
|
+
"@@@STEP_FAILURE@@@",
|
135
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
136
136
|
]
|
137
137
|
},
|
138
138
|
{
|
139
139
|
"failure": {
|
140
|
-
"failure": {
|
141
|
-
|
140
|
+
"failure": {
|
141
|
+
"step": "fail"
|
142
|
+
},
|
143
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
142
144
|
},
|
143
145
|
"name": "$result"
|
144
146
|
}
|
data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json
CHANGED
@@ -29,14 +29,16 @@
|
|
29
29
|
"name": "fail",
|
30
30
|
"~followup_annotations": [
|
31
31
|
"@@@STEP_TEXT@foo@@@",
|
32
|
-
"@@@
|
33
|
-
"@@@
|
32
|
+
"@@@STEP_FAILURE@@@",
|
33
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
34
34
|
]
|
35
35
|
},
|
36
36
|
{
|
37
37
|
"failure": {
|
38
|
-
"failure": {
|
39
|
-
|
38
|
+
"failure": {
|
39
|
+
"step": "fail"
|
40
|
+
},
|
41
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
40
42
|
},
|
41
43
|
"name": "$result"
|
42
44
|
}
|
@@ -29,14 +29,16 @@
|
|
29
29
|
"name": "fail",
|
30
30
|
"~followup_annotations": [
|
31
31
|
"@@@STEP_TEXT@foo@@@",
|
32
|
-
"@@@
|
33
|
-
"@@@
|
32
|
+
"@@@STEP_FAILURE@@@",
|
33
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
34
34
|
]
|
35
35
|
},
|
36
36
|
{
|
37
37
|
"failure": {
|
38
|
-
"failure": {
|
39
|
-
|
38
|
+
"failure": {
|
39
|
+
"step": "fail"
|
40
|
+
},
|
41
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
40
42
|
},
|
41
43
|
"name": "$result"
|
42
44
|
}
|
@@ -26,14 +26,16 @@
|
|
26
26
|
"name": "fail",
|
27
27
|
"~followup_annotations": [
|
28
28
|
"@@@STEP_TEXT@foo@@@",
|
29
|
-
"@@@
|
30
|
-
"@@@
|
29
|
+
"@@@STEP_FAILURE@@@",
|
30
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
31
31
|
]
|
32
32
|
},
|
33
33
|
{
|
34
34
|
"failure": {
|
35
|
-
"failure": {
|
36
|
-
|
35
|
+
"failure": {
|
36
|
+
"step": "fail"
|
37
|
+
},
|
38
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
37
39
|
},
|
38
40
|
"name": "$result"
|
39
41
|
}
|
@@ -27,14 +27,16 @@
|
|
27
27
|
"name": "fail",
|
28
28
|
"~followup_annotations": [
|
29
29
|
"@@@STEP_TEXT@foo@@@",
|
30
|
-
"@@@
|
31
|
-
"@@@
|
30
|
+
"@@@STEP_FAILURE@@@",
|
31
|
+
"@@@SET_BUILD_PROPERTY@failure_hash@\"c2311ad770732eade3d2f48247abd147e40a70e7\"@@@"
|
32
32
|
]
|
33
33
|
},
|
34
34
|
{
|
35
35
|
"failure": {
|
36
|
-
"failure": {
|
37
|
-
|
36
|
+
"failure": {
|
37
|
+
"step": "fail"
|
38
|
+
},
|
39
|
+
"humanReason": "Step('fail') failed with return_code 1"
|
38
40
|
},
|
39
41
|
"name": "$result"
|
40
42
|
}
|
@@ -14,8 +14,6 @@ The following hypothesis are made:
|
|
14
14
|
- A patch set cannot be modified
|
15
15
|
"""
|
16
16
|
|
17
|
-
from __future__ import print_function
|
18
|
-
|
19
17
|
import copy
|
20
18
|
import errno
|
21
19
|
import json
|
@@ -476,7 +474,7 @@ class Rietveld(object):
|
|
476
474
|
# If reaching this line, loop again. Uses a small backoff.
|
477
475
|
time.sleep(min(10, 1+retry*2))
|
478
476
|
except urllib2.HTTPError as e:
|
479
|
-
print
|
477
|
+
print 'Request to %s failed: %s' % (e.geturl(), e.read())
|
480
478
|
raise
|
481
479
|
finally:
|
482
480
|
upload.ErrorExit = old_error_exit
|
@@ -19,8 +19,6 @@ $ git add DEPS
|
|
19
19
|
$ git commit
|
20
20
|
"""
|
21
21
|
|
22
|
-
from __future__ import print_function
|
23
|
-
|
24
22
|
import ast
|
25
23
|
import optparse
|
26
24
|
import os
|
@@ -136,8 +134,8 @@ def convert_svn_revision(dep_path, revision):
|
|
136
134
|
try:
|
137
135
|
svn_rev = int(line.split()[1].partition('@')[2])
|
138
136
|
except (IndexError, ValueError):
|
139
|
-
print
|
140
|
-
|
137
|
+
print >> sys.stderr, (
|
138
|
+
'WARNING: Could not parse svn revision out of "%s"' % line)
|
141
139
|
continue
|
142
140
|
if not latest_svn_rev or int(svn_rev) > int(latest_svn_rev):
|
143
141
|
latest_svn_rev = svn_rev
|
@@ -359,15 +357,15 @@ def update_deps(deps_file, dep_path, dep_name, new_rev, comment):
|
|
359
357
|
commit_msg = generate_commit_message(
|
360
358
|
deps_locals['deps_os'][os_name.s], dep_path, dep_name, new_rev)
|
361
359
|
if not commit_msg:
|
362
|
-
print
|
360
|
+
print 'Could not find an entry in %s to update.' % deps_file
|
363
361
|
return 1
|
364
362
|
|
365
|
-
print
|
366
|
-
print
|
367
|
-
print
|
363
|
+
print 'Pinning %s' % dep_name
|
364
|
+
print 'to revision %s' % new_rev
|
365
|
+
print 'in %s' % deps_file
|
368
366
|
with open(deps_file, 'w') as fh:
|
369
367
|
for line in deps_lines:
|
370
|
-
print
|
368
|
+
print >> fh, line
|
371
369
|
deps_file_dir = os.path.normpath(os.path.dirname(deps_file))
|
372
370
|
deps_file_root = Popen(
|
373
371
|
['git', 'rev-parse', '--show-toplevel'],
|
@@ -398,7 +396,7 @@ def main(argv):
|
|
398
396
|
# Only require the path to exist if the revision should be verified. A path
|
399
397
|
# to e.g. os deps might not be checked out.
|
400
398
|
if not os.path.isdir(dep_path):
|
401
|
-
print
|
399
|
+
print >> sys.stderr, 'No such directory: %s' % arg_dep_path
|
402
400
|
return 1
|
403
401
|
if len(args) > 2:
|
404
402
|
deps_file = args[2]
|
@@ -409,9 +407,9 @@ def main(argv):
|
|
409
407
|
dep_name = posix_path(os.path.relpath(dep_path, gclient_root))
|
410
408
|
if options.no_verify_revision:
|
411
409
|
if not is_git_hash(revision):
|
412
|
-
print(
|
410
|
+
print >> sys.stderr, (
|
413
411
|
'The passed revision %s must be a git hash when skipping revision '
|
414
|
-
'verification.' % revision
|
412
|
+
'verification.' % revision)
|
415
413
|
return 1
|
416
414
|
git_rev = revision
|
417
415
|
comment = None
|
@@ -419,8 +417,7 @@ def main(argv):
|
|
419
417
|
git_rev, svn_rev = get_git_revision(dep_path, revision)
|
420
418
|
comment = ('from svn revision %s' % svn_rev) if svn_rev else None
|
421
419
|
if not git_rev:
|
422
|
-
print
|
423
|
-
file=sys.stderr)
|
420
|
+
print >> sys.stderr, 'Could not find git revision matching %s.' % revision
|
424
421
|
return 1
|
425
422
|
return update_deps(deps_file, dep_path, dep_name, git_rev, comment)
|
426
423
|
|
data/vendor/depot_tools/scm.py
CHANGED
@@ -117,8 +117,8 @@ class GIT(object):
|
|
117
117
|
def Capture(args, cwd, strip_out=True, **kwargs):
|
118
118
|
env = GIT.ApplyEnvVars(kwargs)
|
119
119
|
output = subprocess2.check_output(
|
120
|
-
['git'] + args,
|
121
|
-
|
120
|
+
['git'] + args,
|
121
|
+
cwd=cwd, stderr=subprocess2.PIPE, env=env, **kwargs)
|
122
122
|
return output.strip() if strip_out else output
|
123
123
|
|
124
124
|
@staticmethod
|
@@ -369,14 +369,9 @@ class GIT(object):
|
|
369
369
|
|
370
370
|
sha_only: Fail unless rev is a sha hash.
|
371
371
|
"""
|
372
|
-
if sys.platform.startswith('win'):
|
373
|
-
# Windows .bat scripts use ^ as escape sequence, which means we have to
|
374
|
-
# escape it with itself for every .bat invocation.
|
375
|
-
needle = '%s^^^^{commit}' % rev
|
376
|
-
else:
|
377
|
-
needle = '%s^{commit}' % rev
|
378
372
|
try:
|
379
|
-
sha = GIT.Capture(['rev-parse', '--verify',
|
373
|
+
sha = GIT.Capture(['rev-parse', '--verify', '%s^{commit}' % rev],
|
374
|
+
cwd=cwd)
|
380
375
|
if sha_only:
|
381
376
|
return sha == rev.lower()
|
382
377
|
return True
|
@@ -388,7 +383,7 @@ class GIT(object):
|
|
388
383
|
"""Asserts git's version is at least min_version."""
|
389
384
|
if cls.current_version is None:
|
390
385
|
current_version = cls.Capture(['--version'], '.')
|
391
|
-
matched = re.search(r'version ([0-9\.]+)', current_version)
|
386
|
+
matched = re.search(r'version ([0-9\.]+)', current_version.decode())
|
392
387
|
cls.current_version = matched.group(1)
|
393
388
|
current_version_list = list(map(only_int, cls.current_version.split('.')))
|
394
389
|
for min_ver in map(int, min_version.split('.')):
|
@@ -5,8 +5,6 @@
|
|
5
5
|
|
6
6
|
"""Splits a branch into smaller branches and uploads CLs."""
|
7
7
|
|
8
|
-
from __future__ import print_function
|
9
|
-
|
10
8
|
import collections
|
11
9
|
import os
|
12
10
|
import re
|
@@ -97,7 +95,7 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
|
|
97
95
|
# Create a branch.
|
98
96
|
if not CreateBranchForDirectory(
|
99
97
|
refactor_branch, directory, refactor_branch_upstream):
|
100
|
-
print
|
98
|
+
print 'Skipping ' + directory + ' for which a branch already exists.'
|
101
99
|
return
|
102
100
|
|
103
101
|
# Checkout all changes to files in |files|.
|
@@ -126,7 +124,7 @@ def UploadCl(refactor_branch, refactor_branch_upstream, directory, files,
|
|
126
124
|
upload_args.append('--send-mail')
|
127
125
|
if enable_auto_submit:
|
128
126
|
upload_args.append('--enable-auto-submit')
|
129
|
-
print
|
127
|
+
print 'Uploading CL for ' + directory + '.'
|
130
128
|
cmd_upload(upload_args)
|
131
129
|
if comment:
|
132
130
|
changelist().AddComment(FormatDescriptionOrComment(comment, directory),
|
@@ -164,12 +162,12 @@ def PrintClInfo(cl_index, num_cls, directory, file_paths, description,
|
|
164
162
|
directory).splitlines()
|
165
163
|
indented_description = '\n'.join([' ' + l for l in description_lines])
|
166
164
|
|
167
|
-
print
|
168
|
-
print
|
169
|
-
print
|
170
|
-
print
|
171
|
-
print
|
172
|
-
print
|
165
|
+
print 'CL {}/{}'.format(cl_index, num_cls)
|
166
|
+
print 'Path: {}'.format(directory)
|
167
|
+
print 'Reviewers: {}'.format(', '.join(reviewers))
|
168
|
+
print '\n' + indented_description + '\n'
|
169
|
+
print '\n'.join(file_paths)
|
170
|
+
print
|
173
171
|
|
174
172
|
|
175
173
|
def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
|
@@ -199,7 +197,7 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
|
|
199
197
|
files = change.AffectedFiles()
|
200
198
|
|
201
199
|
if not files:
|
202
|
-
print
|
200
|
+
print 'Cannot split an empty CL.'
|
203
201
|
return 1
|
204
202
|
|
205
203
|
author = git.run('config', 'user.email').strip() or None
|
@@ -218,12 +216,12 @@ def SplitCl(description_file, comment_file, changelist, cmd_upload, dry_run,
|
|
218
216
|
print('Will split current branch (' + refactor_branch + ') into ' +
|
219
217
|
str(num_cls) + ' CLs.\n')
|
220
218
|
if cq_dry_run and num_cls > CL_SPLIT_FORCE_LIMIT:
|
221
|
-
print(
|
219
|
+
print (
|
222
220
|
'This will generate "%r" CLs. This many CLs can potentially generate'
|
223
221
|
' too much load on the build infrastructure. Please email'
|
224
222
|
' infra-dev@chromium.org to ensure that this won\'t break anything.'
|
225
223
|
' The infra team reserves the right to cancel your jobs if they are'
|
226
|
-
' overloading the CQ.' % num_cls
|
224
|
+
' overloading the CQ.') % num_cls
|
227
225
|
answer = raw_input('Proceed? (y/n):')
|
228
226
|
if answer.lower() != 'y':
|
229
227
|
return 0
|
@@ -25,3 +25,4 @@ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
25
25
|
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
26
26
|
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
27
27
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
28
|
+
|
@@ -1,7 +1,7 @@
|
|
1
1
|
Name: colorama
|
2
|
-
URL:
|
3
|
-
Version:
|
4
|
-
Revision:
|
2
|
+
URL: http://code.google.com/p/colorama
|
3
|
+
Version: 5a3100113a3a (0.2.7)
|
4
|
+
Revision: 5a3100113a3a
|
5
5
|
|
6
6
|
Description:
|
7
7
|
Provides a simple cross-platform API to print colored terminal text from Python
|
@@ -9,4 +9,5 @@ applications.
|
|
9
9
|
|
10
10
|
Additional changes:
|
11
11
|
- Kept colorama/ but removed colorama/tests/.
|
12
|
-
- Copied LICENSE.txt and README.
|
12
|
+
- Copied LICENSE.txt and README.txt.
|
13
|
+
- Converted all the files to LF EOL style.
|
@@ -0,0 +1,304 @@
|
|
1
|
+
Download and docs:
|
2
|
+
http://pypi.python.org/pypi/colorama
|
3
|
+
Development:
|
4
|
+
http://code.google.com/p/colorama
|
5
|
+
Discussion group:
|
6
|
+
https://groups.google.com/forum/#!forum/python-colorama
|
7
|
+
|
8
|
+
Description
|
9
|
+
===========
|
10
|
+
|
11
|
+
Makes ANSI escape character sequences for producing colored terminal text and
|
12
|
+
cursor positioning work under MS Windows.
|
13
|
+
|
14
|
+
ANSI escape character sequences have long been used to produce colored terminal
|
15
|
+
text and cursor positioning on Unix and Macs. Colorama makes this work on
|
16
|
+
Windows, too, by wrapping stdout, stripping ANSI sequences it finds (which
|
17
|
+
otherwise show up as gobbledygook in your output), and converting them into the
|
18
|
+
appropriate win32 calls to modify the state of the terminal. On other platforms,
|
19
|
+
Colorama does nothing.
|
20
|
+
|
21
|
+
Colorama also provides some shortcuts to help generate ANSI sequences
|
22
|
+
but works fine in conjunction with any other ANSI sequence generation library,
|
23
|
+
such as Termcolor (http://pypi.python.org/pypi/termcolor.)
|
24
|
+
|
25
|
+
This has the upshot of providing a simple cross-platform API for printing
|
26
|
+
colored terminal text from Python, and has the happy side-effect that existing
|
27
|
+
applications or libraries which use ANSI sequences to produce colored output on
|
28
|
+
Linux or Macs can now also work on Windows, simply by calling
|
29
|
+
``colorama.init()``.
|
30
|
+
|
31
|
+
An alternative approach is to install 'ansi.sys' on Windows machines, which
|
32
|
+
provides the same behaviour for all applications running in terminals. Colorama
|
33
|
+
is intended for situations where that isn't easy (e.g. maybe your app doesn't
|
34
|
+
have an installer.)
|
35
|
+
|
36
|
+
Demo scripts in the source code repository prints some colored text using
|
37
|
+
ANSI sequences. Compare their output under Gnome-terminal's built in ANSI
|
38
|
+
handling, versus on Windows Command-Prompt using Colorama:
|
39
|
+
|
40
|
+
.. image:: http://colorama.googlecode.com/hg/screenshots/ubuntu-demo.png
|
41
|
+
:width: 661
|
42
|
+
:height: 357
|
43
|
+
:alt: ANSI sequences on Ubuntu under gnome-terminal.
|
44
|
+
|
45
|
+
.. image:: http://colorama.googlecode.com/hg/screenshots/windows-demo.png
|
46
|
+
:width: 668
|
47
|
+
:height: 325
|
48
|
+
:alt: Same ANSI sequences on Windows, using Colorama.
|
49
|
+
|
50
|
+
These screengrabs show that Colorama on Windows does not support ANSI 'dim
|
51
|
+
text': it looks the same as 'normal text'.
|
52
|
+
|
53
|
+
|
54
|
+
License
|
55
|
+
=======
|
56
|
+
|
57
|
+
Copyright Jonathan Hartley 2013. BSD 3-Clause license, see LICENSE file.
|
58
|
+
|
59
|
+
|
60
|
+
Dependencies
|
61
|
+
============
|
62
|
+
|
63
|
+
None, other than Python. Tested on Python 2.5.5, 2.6.5, 2.7, 3.1.2, and 3.2
|
64
|
+
|
65
|
+
Usage
|
66
|
+
=====
|
67
|
+
|
68
|
+
Initialisation
|
69
|
+
--------------
|
70
|
+
|
71
|
+
Applications should initialise Colorama using::
|
72
|
+
|
73
|
+
from colorama import init
|
74
|
+
init()
|
75
|
+
|
76
|
+
If you are on Windows, the call to ``init()`` will start filtering ANSI escape
|
77
|
+
sequences out of any text sent to stdout or stderr, and will replace them with
|
78
|
+
equivalent Win32 calls.
|
79
|
+
|
80
|
+
Calling ``init()`` has no effect on other platforms (unless you request other
|
81
|
+
optional functionality, see keyword args below.) The intention is that
|
82
|
+
applications can call ``init()`` unconditionally on all platforms, after which
|
83
|
+
ANSI output should just work.
|
84
|
+
|
85
|
+
To stop using colorama before your program exits, simply call ``deinit()``.
|
86
|
+
This will restore stdout and stderr to their original values, so that Colorama
|
87
|
+
is disabled. To start using Colorama again, call ``reinit()``, which wraps
|
88
|
+
stdout and stderr again, but is cheaper to call than doing ``init()`` all over
|
89
|
+
again.
|
90
|
+
|
91
|
+
|
92
|
+
Colored Output
|
93
|
+
--------------
|
94
|
+
|
95
|
+
Cross-platform printing of colored text can then be done using Colorama's
|
96
|
+
constant shorthand for ANSI escape sequences::
|
97
|
+
|
98
|
+
from colorama import Fore, Back, Style
|
99
|
+
print(Fore.RED + 'some red text')
|
100
|
+
print(Back.GREEN + 'and with a green background')
|
101
|
+
print(Style.DIM + 'and in dim text')
|
102
|
+
print(Fore.RESET + Back.RESET + Style.RESET_ALL)
|
103
|
+
print('back to normal now')
|
104
|
+
|
105
|
+
or simply by manually printing ANSI sequences from your own code::
|
106
|
+
|
107
|
+
print('/033[31m' + 'some red text')
|
108
|
+
print('/033[30m' # and reset to default color)
|
109
|
+
|
110
|
+
or Colorama can be used happily in conjunction with existing ANSI libraries
|
111
|
+
such as Termcolor::
|
112
|
+
|
113
|
+
from colorama import init
|
114
|
+
from termcolor import colored
|
115
|
+
|
116
|
+
# use Colorama to make Termcolor work on Windows too
|
117
|
+
init()
|
118
|
+
|
119
|
+
# then use Termcolor for all colored text output
|
120
|
+
print(colored('Hello, World!', 'green', 'on_red'))
|
121
|
+
|
122
|
+
Available formatting constants are::
|
123
|
+
|
124
|
+
Fore: BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, RESET.
|
125
|
+
Back: BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE, RESET.
|
126
|
+
Style: DIM, NORMAL, BRIGHT, RESET_ALL
|
127
|
+
|
128
|
+
Style.RESET_ALL resets foreground, background and brightness. Colorama will
|
129
|
+
perform this reset automatically on program exit.
|
130
|
+
|
131
|
+
|
132
|
+
Cursor Positioning
|
133
|
+
------------------
|
134
|
+
|
135
|
+
ANSI codes to reposition the cursor are supported. See demos/demo06.py for
|
136
|
+
an example of how to generate them.
|
137
|
+
|
138
|
+
|
139
|
+
Init Keyword Args
|
140
|
+
-----------------
|
141
|
+
|
142
|
+
``init()`` accepts some kwargs to override default behaviour.
|
143
|
+
|
144
|
+
init(autoreset=False):
|
145
|
+
If you find yourself repeatedly sending reset sequences to turn off color
|
146
|
+
changes at the end of every print, then ``init(autoreset=True)`` will
|
147
|
+
automate that::
|
148
|
+
|
149
|
+
from colorama import init
|
150
|
+
init(autoreset=True)
|
151
|
+
print(Fore.RED + 'some red text')
|
152
|
+
print('automatically back to default color again')
|
153
|
+
|
154
|
+
init(strip=None):
|
155
|
+
Pass ``True`` or ``False`` to override whether ansi codes should be
|
156
|
+
stripped from the output. The default behaviour is to strip if on Windows.
|
157
|
+
|
158
|
+
init(convert=None):
|
159
|
+
Pass ``True`` or ``False`` to override whether to convert ansi codes in the
|
160
|
+
output into win32 calls. The default behaviour is to convert if on Windows
|
161
|
+
and output is to a tty (terminal).
|
162
|
+
|
163
|
+
init(wrap=True):
|
164
|
+
On Windows, colorama works by replacing ``sys.stdout`` and ``sys.stderr``
|
165
|
+
with proxy objects, which override the .write() method to do their work. If
|
166
|
+
this wrapping causes you problems, then this can be disabled by passing
|
167
|
+
``init(wrap=False)``. The default behaviour is to wrap if autoreset or
|
168
|
+
strip or convert are True.
|
169
|
+
|
170
|
+
When wrapping is disabled, colored printing on non-Windows platforms will
|
171
|
+
continue to work as normal. To do cross-platform colored output, you can
|
172
|
+
use Colorama's ``AnsiToWin32`` proxy directly::
|
173
|
+
|
174
|
+
import sys
|
175
|
+
from colorama import init, AnsiToWin32
|
176
|
+
init(wrap=False)
|
177
|
+
stream = AnsiToWin32(sys.stderr).stream
|
178
|
+
|
179
|
+
# Python 2
|
180
|
+
print >>stream, Fore.BLUE + 'blue text on stderr'
|
181
|
+
|
182
|
+
# Python 3
|
183
|
+
print(Fore.BLUE + 'blue text on stderr', file=stream)
|
184
|
+
|
185
|
+
|
186
|
+
Status & Known Problems
|
187
|
+
=======================
|
188
|
+
|
189
|
+
I've personally only tested it on WinXP (CMD, Console2), Ubuntu
|
190
|
+
(gnome-terminal, xterm), and OSX.
|
191
|
+
|
192
|
+
Some presumably valid ANSI sequences aren't recognised (see details below)
|
193
|
+
but to my knowledge nobody has yet complained about this. Puzzling.
|
194
|
+
|
195
|
+
See outstanding issues and wishlist at:
|
196
|
+
http://code.google.com/p/colorama/issues/list
|
197
|
+
|
198
|
+
If anything doesn't work for you, or doesn't do what you expected or hoped for,
|
199
|
+
I'd love to hear about it on that issues list, would be delighted by patches,
|
200
|
+
and would be happy to grant commit access to anyone who submits a working patch
|
201
|
+
or two.
|
202
|
+
|
203
|
+
|
204
|
+
Recognised ANSI Sequences
|
205
|
+
=========================
|
206
|
+
|
207
|
+
ANSI sequences generally take the form:
|
208
|
+
|
209
|
+
ESC [ <param> ; <param> ... <command>
|
210
|
+
|
211
|
+
Where <param> is an integer, and <command> is a single letter. Zero or more
|
212
|
+
params are passed to a <command>. If no params are passed, it is generally
|
213
|
+
synonymous with passing a single zero. No spaces exist in the sequence, they
|
214
|
+
have just been inserted here to make it easy to read.
|
215
|
+
|
216
|
+
The only ANSI sequences that colorama converts into win32 calls are::
|
217
|
+
|
218
|
+
ESC [ 0 m # reset all (colors and brightness)
|
219
|
+
ESC [ 1 m # bright
|
220
|
+
ESC [ 2 m # dim (looks same as normal brightness)
|
221
|
+
ESC [ 22 m # normal brightness
|
222
|
+
|
223
|
+
# FOREGROUND:
|
224
|
+
ESC [ 30 m # black
|
225
|
+
ESC [ 31 m # red
|
226
|
+
ESC [ 32 m # green
|
227
|
+
ESC [ 33 m # yellow
|
228
|
+
ESC [ 34 m # blue
|
229
|
+
ESC [ 35 m # magenta
|
230
|
+
ESC [ 36 m # cyan
|
231
|
+
ESC [ 37 m # white
|
232
|
+
ESC [ 39 m # reset
|
233
|
+
|
234
|
+
# BACKGROUND
|
235
|
+
ESC [ 40 m # black
|
236
|
+
ESC [ 41 m # red
|
237
|
+
ESC [ 42 m # green
|
238
|
+
ESC [ 43 m # yellow
|
239
|
+
ESC [ 44 m # blue
|
240
|
+
ESC [ 45 m # magenta
|
241
|
+
ESC [ 46 m # cyan
|
242
|
+
ESC [ 47 m # white
|
243
|
+
ESC [ 49 m # reset
|
244
|
+
|
245
|
+
# cursor positioning
|
246
|
+
ESC [ y;x H # position cursor at x across, y down
|
247
|
+
|
248
|
+
# clear the screen
|
249
|
+
ESC [ mode J # clear the screen. Only mode 2 (clear entire screen)
|
250
|
+
# is supported. It should be easy to add other modes,
|
251
|
+
# let me know if that would be useful.
|
252
|
+
|
253
|
+
Multiple numeric params to the 'm' command can be combined into a single
|
254
|
+
sequence, eg::
|
255
|
+
|
256
|
+
ESC [ 36 ; 45 ; 1 m # bright cyan text on magenta background
|
257
|
+
|
258
|
+
All other ANSI sequences of the form ``ESC [ <param> ; <param> ... <command>``
|
259
|
+
are silently stripped from the output on Windows.
|
260
|
+
|
261
|
+
Any other form of ANSI sequence, such as single-character codes or alternative
|
262
|
+
initial characters, are not recognised nor stripped. It would be cool to add
|
263
|
+
them though. Let me know if it would be useful for you, via the issues on
|
264
|
+
google code.
|
265
|
+
|
266
|
+
|
267
|
+
Development
|
268
|
+
===========
|
269
|
+
|
270
|
+
Help and fixes welcome! Ask Jonathan for commit rights, you'll get them.
|
271
|
+
|
272
|
+
Running tests requires:
|
273
|
+
|
274
|
+
- Michael Foord's 'mock' module to be installed.
|
275
|
+
- Tests are written using the 2010 era updates to 'unittest', and require to
|
276
|
+
be run either using Python2.7 or greater, or else to have Michael Foord's
|
277
|
+
'unittest2' module installed.
|
278
|
+
|
279
|
+
unittest2 test discovery doesn't work for colorama, so I use 'nose'::
|
280
|
+
|
281
|
+
nosetests -s
|
282
|
+
|
283
|
+
The -s is required because 'nosetests' otherwise applies a proxy of its own to
|
284
|
+
stdout, which confuses the unit tests.
|
285
|
+
|
286
|
+
|
287
|
+
Contact
|
288
|
+
=======
|
289
|
+
|
290
|
+
Created by Jonathan Hartley, tartley@tartley.com
|
291
|
+
|
292
|
+
|
293
|
+
Thanks
|
294
|
+
======
|
295
|
+
| Ben Hoyt, for a magnificent fix under 64-bit Windows.
|
296
|
+
| Jesse@EmptySquare for submitting a fix for examples in the README.
|
297
|
+
| User 'jamessp', an observant documentation fix for cursor positioning.
|
298
|
+
| User 'vaal1239', Dave Mckee & Lackner Kristof for a tiny but much-needed Win7 fix.
|
299
|
+
| Julien Stuyck, for wisely suggesting Python3 compatible updates to README.
|
300
|
+
| Daniel Griffith for multiple fabulous patches.
|
301
|
+
| Oscar Lesta for valuable fix to stop ANSI chars being sent to non-tty output.
|
302
|
+
| Roger Binns, for many suggestions, valuable feedback, & bug reports.
|
303
|
+
| Tim Golden for thought and much appreciated feedback on the initial idea.
|
304
|
+
|