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.
Files changed (144) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +0 -1
  3. data/lib/libv8/version.rb +1 -1
  4. data/vendor/depot_tools/annotated_gclient.py +2 -4
  5. data/vendor/depot_tools/auth.py +0 -2
  6. data/vendor/depot_tools/autoninja +1 -3
  7. data/vendor/depot_tools/autoninja.bat +1 -1
  8. data/vendor/depot_tools/autoninja.py +1 -3
  9. data/vendor/depot_tools/bb +1 -1
  10. data/vendor/depot_tools/bootstrap/win/manifest.txt +1 -1
  11. data/vendor/depot_tools/buildbucket.py +6 -8
  12. data/vendor/depot_tools/checkout.py +5 -7
  13. data/vendor/depot_tools/cipd +1 -1
  14. data/vendor/depot_tools/cipd_manifest.txt +4 -4
  15. data/vendor/depot_tools/cipd_manifest.versions +80 -80
  16. data/vendor/depot_tools/cit.py +7 -9
  17. data/vendor/depot_tools/clang_format.py +1 -4
  18. data/vendor/depot_tools/clang_format_merge_driver.py +7 -9
  19. data/vendor/depot_tools/compile_single_file.py +1 -3
  20. data/vendor/depot_tools/dart_format.py +2 -4
  21. data/vendor/depot_tools/depot-tools-auth.py +8 -10
  22. data/vendor/depot_tools/fix_encoding.py +2 -5
  23. data/vendor/depot_tools/gclient-new-workdir.py +0 -2
  24. data/vendor/depot_tools/gclient.py +9 -8
  25. data/vendor/depot_tools/gclient_scm.py +28 -54
  26. data/vendor/depot_tools/gclient_utils.py +4 -14
  27. data/vendor/depot_tools/gerrit_util.py +6 -8
  28. data/vendor/depot_tools/git_cache.py +37 -53
  29. data/vendor/depot_tools/git_cl.py +42 -115
  30. data/vendor/depot_tools/git_drover.py +1 -3
  31. data/vendor/depot_tools/git_find_releases.py +6 -8
  32. data/vendor/depot_tools/git_footers.py +5 -7
  33. data/vendor/depot_tools/git_freezer.py +1 -3
  34. data/vendor/depot_tools/git_map_branches.py +5 -7
  35. data/vendor/depot_tools/git_mark_merge_base.py +6 -8
  36. data/vendor/depot_tools/git_nav_downstream.py +5 -7
  37. data/vendor/depot_tools/git_number.py +1 -3
  38. data/vendor/depot_tools/git_rebase_update.py +43 -38
  39. data/vendor/depot_tools/git_reparent_branch.py +6 -8
  40. data/vendor/depot_tools/git_upstream_diff.py +2 -4
  41. data/vendor/depot_tools/gn.py +4 -6
  42. data/vendor/depot_tools/infra/config/recipes.cfg +1 -1
  43. data/vendor/depot_tools/led +1 -1
  44. data/vendor/depot_tools/luci-auth +1 -1
  45. data/vendor/depot_tools/lucicfg +1 -1
  46. data/vendor/depot_tools/mac_toolchain +1 -1
  47. data/vendor/depot_tools/man/html/depot_tools.html +1 -1
  48. data/vendor/depot_tools/man/html/depot_tools_tutorial.html +22 -28
  49. data/vendor/depot_tools/man/html/git-cl.html +1 -1
  50. data/vendor/depot_tools/man/html/git-drover.html +18 -18
  51. data/vendor/depot_tools/man/html/git-footers.html +1 -1
  52. data/vendor/depot_tools/man/html/git-freeze.html +3 -3
  53. data/vendor/depot_tools/man/html/git-hyper-blame.html +1 -1
  54. data/vendor/depot_tools/man/html/git-map-branches.html +2 -2
  55. data/vendor/depot_tools/man/html/git-map.html +1 -1
  56. data/vendor/depot_tools/man/html/git-mark-merge-base.html +1 -1
  57. data/vendor/depot_tools/man/html/git-nav-downstream.html +3 -3
  58. data/vendor/depot_tools/man/html/git-nav-upstream.html +6 -12
  59. data/vendor/depot_tools/man/html/git-new-branch.html +1 -1
  60. data/vendor/depot_tools/man/html/git-rebase-update.html +1 -20
  61. data/vendor/depot_tools/man/html/git-rename-branch.html +1 -1
  62. data/vendor/depot_tools/man/html/git-reparent-branch.html +1 -1
  63. data/vendor/depot_tools/man/html/git-retry.html +1 -1
  64. data/vendor/depot_tools/man/html/git-squash-branch.html +1 -1
  65. data/vendor/depot_tools/man/html/git-thaw.html +1 -1
  66. data/vendor/depot_tools/man/html/git-upstream-diff.html +6 -10
  67. data/vendor/depot_tools/man/man1/git-cl.1 +4 -4
  68. data/vendor/depot_tools/man/man1/git-drover.1 +21 -21
  69. data/vendor/depot_tools/man/man1/git-footers.1 +4 -4
  70. data/vendor/depot_tools/man/man1/git-freeze.1 +6 -6
  71. data/vendor/depot_tools/man/man1/git-hyper-blame.1 +4 -4
  72. data/vendor/depot_tools/man/man1/git-map-branches.1 +4 -4
  73. data/vendor/depot_tools/man/man1/git-map.1 +4 -4
  74. data/vendor/depot_tools/man/man1/git-mark-merge-base.1 +4 -4
  75. data/vendor/depot_tools/man/man1/git-nav-downstream.1 +6 -6
  76. data/vendor/depot_tools/man/man1/git-nav-upstream.1 +9 -15
  77. data/vendor/depot_tools/man/man1/git-new-branch.1 +3 -3
  78. data/vendor/depot_tools/man/man1/git-rebase-update.1 +4 -14
  79. data/vendor/depot_tools/man/man1/git-rename-branch.1 +4 -4
  80. data/vendor/depot_tools/man/man1/git-reparent-branch.1 +4 -4
  81. data/vendor/depot_tools/man/man1/git-retry.1 +4 -4
  82. data/vendor/depot_tools/man/man1/git-squash-branch.1 +4 -4
  83. data/vendor/depot_tools/man/man1/git-thaw.1 +4 -4
  84. data/vendor/depot_tools/man/man1/git-upstream-diff.1 +13 -7
  85. data/vendor/depot_tools/man/man7/depot_tools.7 +4 -4
  86. data/vendor/depot_tools/man/man7/depot_tools_tutorial.7 +27 -33
  87. data/vendor/depot_tools/man/src/filter_demo_output.py +1 -3
  88. data/vendor/depot_tools/man/src/git-rebase-update.txt +0 -7
  89. data/vendor/depot_tools/my_activity.py +11 -13
  90. data/vendor/depot_tools/my_reviews.py +29 -34
  91. data/vendor/depot_tools/ninjalog_uploader_wrapper.py +2 -4
  92. data/vendor/depot_tools/owners_finder.py +1 -3
  93. data/vendor/depot_tools/patch.py +1 -1
  94. data/vendor/depot_tools/post_build_ninja_summary.py +15 -17
  95. data/vendor/depot_tools/presubmit_canned_checks.py +1 -3
  96. data/vendor/depot_tools/presubmit_support.py +5 -10
  97. data/vendor/depot_tools/prpc +1 -1
  98. data/vendor/depot_tools/recipes/README.recipes.md +17 -17
  99. data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail.json +6 -1
  100. data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch.json +4 -2
  101. data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/tryjob_fail_patch_download.json +6 -1
  102. data/vendor/depot_tools/recipes/recipe_modules/bot_update/examples/full.expected/unrecognized_commit_repo.json +5 -0
  103. data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/describe-failed.json +4 -2
  104. data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_file.json +5 -25
  105. data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_mode.json +5 -23
  106. data/vendor/depot_tools/recipes/recipe_modules/cipd/examples/full.expected/pkg_bad_verfile.json +5 -23
  107. data/vendor/depot_tools/recipes/recipe_modules/gclient/config.py +6 -0
  108. data/vendor/depot_tools/recipes/recipe_modules/gclient/examples/full.py +1 -0
  109. data/vendor/depot_tools/recipes/recipe_modules/gerrit/examples/full.expected/basic.json +5 -1
  110. data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/can_fail_build.json +6 -1
  111. data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/count-objects_with_bad_output_fails_build.json +5 -0
  112. data/vendor/depot_tools/recipes/recipe_modules/git/examples/full.expected/rebase_failed.json +6 -1
  113. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/set_failure_hash_with_no_steps.json +3 -1
  114. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch.json +6 -4
  115. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_gerrit_patch_and_target_ref.json +6 -4
  116. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch.json +6 -4
  117. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_git_patch_luci.json +6 -4
  118. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch.json +6 -4
  119. data/vendor/depot_tools/recipes/recipe_modules/tryserver/examples/full.expected/with_wrong_patch_new.json +6 -4
  120. data/vendor/depot_tools/rietveld.py +1 -3
  121. data/vendor/depot_tools/roll_dep.py +0 -2
  122. data/vendor/depot_tools/roll_dep_svn.py +11 -14
  123. data/vendor/depot_tools/scm.py +5 -10
  124. data/vendor/depot_tools/split_cl.py +11 -13
  125. data/vendor/depot_tools/subprocess2.py +1 -1
  126. data/vendor/depot_tools/third_party/colorama/LICENSE.txt +1 -0
  127. data/vendor/depot_tools/third_party/colorama/README.chromium +5 -4
  128. data/vendor/depot_tools/third_party/colorama/README.txt +304 -0
  129. data/vendor/depot_tools/third_party/colorama/__init__.py +4 -3
  130. data/vendor/depot_tools/third_party/colorama/ansi.py +30 -82
  131. data/vendor/depot_tools/third_party/colorama/ansitowin32.py +37 -105
  132. data/vendor/depot_tools/third_party/colorama/initialise.py +15 -39
  133. data/vendor/depot_tools/third_party/colorama/win32.py +28 -46
  134. data/vendor/depot_tools/third_party/colorama/winterm.py +31 -80
  135. data/vendor/depot_tools/third_party/upload.py +1 -1
  136. data/vendor/depot_tools/upload_to_google_storage.py +6 -8
  137. data/vendor/depot_tools/vpython +1 -1
  138. data/vendor/depot_tools/watchlists.py +3 -5
  139. data/vendor/depot_tools/weekly +2 -4
  140. data/vendor/depot_tools/win_toolchain/get_toolchain_if_necessary.py +36 -38
  141. data/vendor/depot_tools/win_toolchain/package_from_installed.py +8 -10
  142. data/vendor/depot_tools/wtf +3 -5
  143. metadata +3 -3
  144. data/vendor/depot_tools/third_party/colorama/README.rst +0 -346
@@ -24,8 +24,6 @@ Branches are colorized as follows:
24
24
  upstream, then you will see this.
25
25
  """
26
26
 
27
- from __future__ import print_function
28
-
29
27
  import argparse
30
28
  import collections
31
29
  import os
@@ -187,8 +185,8 @@ class BranchMapper(object):
187
185
  parent = self.__branches_info[cycle[-1]].upstream
188
186
  cycle.append(parent)
189
187
  if parent == branch:
190
- print('Warning: Detected cycle in branches: {}'.format(
191
- ' -> '.join(cycle)), file=sys.stderr)
188
+ print >> sys.stderr, 'Warning: Detected cycle in branches: {}'.format(
189
+ ' -> '.join(cycle))
192
190
  return True
193
191
  return False
194
192
 
@@ -314,11 +312,11 @@ def print_desc():
314
312
  def main(argv):
315
313
  setup_color.init()
316
314
  if get_git_version() < MIN_UPSTREAM_TRACK_GIT_VERSION:
317
- print(
315
+ print >> sys.stderr, (
318
316
  'This tool will not show all tracking information for git version '
319
317
  'earlier than ' +
320
318
  '.'.join(str(x) for x in MIN_UPSTREAM_TRACK_GIT_VERSION) +
321
- '. Please consider upgrading.', file=sys.stderr)
319
+ '. Please consider upgrading.')
322
320
 
323
321
  if '-h' in argv:
324
322
  print_desc()
@@ -344,7 +342,7 @@ def main(argv):
344
342
  mapper.maxjobs = opts.maxjobs
345
343
  mapper.show_subject = opts.show_subject
346
344
  mapper.start()
347
- print(mapper.output.as_formatted_string())
345
+ print mapper.output.as_formatted_string()
348
346
  return 0
349
347
 
350
348
  if __name__ == '__main__':
@@ -11,8 +11,6 @@ purposes of the chromium depot_tools git extensions. Passing no arguments will
11
11
  just print the effective merge base for the current branch.
12
12
  """
13
13
 
14
- from __future__ import print_function
15
-
16
14
  import argparse
17
15
  import sys
18
16
 
@@ -41,16 +39,16 @@ def main(argv):
41
39
  try:
42
40
  remove_merge_base(cur)
43
41
  except CalledProcessError:
44
- print('No merge base currently exists for %s.' % cur)
42
+ print 'No merge base currently exists for %s.' % cur
45
43
  return 0
46
44
 
47
45
  if opts.merge_base:
48
46
  try:
49
47
  opts.merge_base = hash_one(opts.merge_base)
50
48
  except CalledProcessError:
51
- print(
52
- 'fatal: could not resolve %s as a commit' % opts.merge_base,
53
- file=sys.stderr)
49
+ print >> sys.stderr, (
50
+ 'fatal: could not resolve %s as a commit' % (opts.merge_base)
51
+ )
54
52
  return 1
55
53
 
56
54
  manual_merge_base(cur, opts.merge_base, upstream(cur))
@@ -59,9 +57,9 @@ def main(argv):
59
57
  actual = get_or_create_merge_base(cur)
60
58
  if opts.merge_base and opts.merge_base != actual:
61
59
  ret = 1
62
- print("Invalid merge_base %s" % opts.merge_base)
60
+ print "Invalid merge_base %s" % opts.merge_base
63
61
 
64
- print("merge_base(%s): %s" % (cur, actual))
62
+ print "merge_base(%s): %s" % (cur, actual)
65
63
  return ret
66
64
 
67
65
 
@@ -9,8 +9,6 @@ is more than one downstream branch, then this script will prompt you to select
9
9
  which branch.
10
10
  """
11
11
 
12
- from __future__ import print_function
13
-
14
12
  import argparse
15
13
  import sys
16
14
 
@@ -38,24 +36,24 @@ def main(args):
38
36
  cur = hash_one(cur)
39
37
  downstreams = [b for b in branches() if upfn(b) == cur]
40
38
  if not downstreams:
41
- print("No downstream branches")
39
+ print "No downstream branches"
42
40
  return 1
43
41
  elif len(downstreams) == 1:
44
42
  run('checkout', downstreams[0], stdout=sys.stdout, stderr=sys.stderr)
45
43
  else:
46
44
  high = len(downstreams) - 1
47
45
  while True:
48
- print("Please select a downstream branch")
46
+ print "Please select a downstream branch"
49
47
  for i, b in enumerate(downstreams):
50
- print(" %d. %s" % (i, b))
48
+ print " %d. %s" % (i, b)
51
49
  prompt = "Selection (0-%d)[0]: " % high
52
50
  r = opts.pick
53
51
  if r:
54
- print(prompt + r)
52
+ print prompt + r
55
53
  else:
56
54
  r = raw_input(prompt).strip() or '0'
57
55
  if not r.isdigit() or (0 > int(r) > high):
58
- print("Invalid choice.")
56
+ print "Invalid choice."
59
57
  else:
60
58
  run('checkout', downstreams[int(r)], stdout=sys.stdout,
61
59
  stderr=sys.stderr)
@@ -21,8 +21,6 @@ commit's entire history, this script caches all calculated data inside the git
21
21
  repo that it operates on in the ref 'refs/number/commits'.
22
22
  """
23
23
 
24
- from __future__ import print_function
25
-
26
24
  import binascii
27
25
  import collections
28
26
  import logging
@@ -280,7 +278,7 @@ def main(): # pragma: no cover
280
278
  if not opts.no_cache:
281
279
  finalize(targets)
282
280
 
283
- print('\n'.join(map(str, map(get_num, targets))))
281
+ print '\n'.join(map(str, map(get_num, targets)))
284
282
  return 0
285
283
 
286
284
 
@@ -7,8 +7,6 @@
7
7
  Tool to update all branches to have the latest changes from their upstreams.
8
8
  """
9
9
 
10
- from __future__ import print_function
11
-
12
10
  import argparse
13
11
  import collections
14
12
  import logging
@@ -78,7 +76,7 @@ def fetch_remotes(branch_tree):
78
76
  # TODO(iannucci): Should we fetch git-svn?
79
77
 
80
78
  if not fetch_args: # pragma: no cover
81
- print('Nothing to fetch.')
79
+ print 'Nothing to fetch.'
82
80
  else:
83
81
  git.run_with_stderr('fetch', *fetch_args, stdout=sys.stdout,
84
82
  stderr=sys.stderr)
@@ -126,16 +124,16 @@ def remove_empty_branches(branch_tree):
126
124
  if parent in tag_set:
127
125
  git.set_branch_config(branch, 'remote', '.')
128
126
  git.set_branch_config(branch, 'merge', 'refs/tags/%s' % parent)
129
- print('Reparented %s to track %s [tag] (was tracking %s)' %
130
- (branch, parent, old_parent))
127
+ print ('Reparented %s to track %s [tag] (was tracking %s)'
128
+ % (branch, parent, old_parent))
131
129
  else:
132
130
  git.run('branch', '--set-upstream-to', parent, branch)
133
- print('Reparented %s to track %s (was tracking %s)' % (branch, parent,
134
- old_parent))
131
+ print ('Reparented %s to track %s (was tracking %s)'
132
+ % (branch, parent, old_parent))
135
133
 
136
134
  # Apply all deletions recorded, in order.
137
135
  for branch, _ in sorted(deletions.iteritems(), key=lambda x: x[1]):
138
- print(git.run('branch', '-d', branch))
136
+ print git.run('branch', '-d', branch)
139
137
 
140
138
 
141
139
  def rebase_branch(branch, parent, start_hash):
@@ -158,11 +156,11 @@ def rebase_branch(branch, parent, start_hash):
158
156
 
159
157
  if git.hash_one(parent) != start_hash:
160
158
  # Try a plain rebase first
161
- print('Rebasing:', branch)
159
+ print 'Rebasing:', branch
162
160
  rebase_ret = git.rebase(parent, start_hash, branch, abort=True)
163
161
  if not rebase_ret.success:
164
162
  # TODO(iannucci): Find collapsible branches in a smarter way?
165
- print("Failed! Attempting to squash", branch, "...", end=' ')
163
+ print "Failed! Attempting to squash", branch, "...",
166
164
  sys.stdout.flush()
167
165
  squash_branch = branch+"_squash_attempt"
168
166
  git.run('checkout', '-b', squash_branch)
@@ -174,12 +172,12 @@ def rebase_branch(branch, parent, start_hash):
174
172
  git.run('checkout', branch)
175
173
  git.run('branch', '-D', squash_branch)
176
174
  if squash_ret.success and empty_rebase:
177
- print('Success!')
175
+ print 'Success!'
178
176
  git.squash_current_branch(merge_base=start_hash)
179
177
  git.rebase(parent, start_hash, branch)
180
178
  else:
181
- print("Failed!")
182
- print()
179
+ print "Failed!"
180
+ print
183
181
 
184
182
  # rebase and leave in mid-rebase state.
185
183
  # This second rebase attempt should always fail in the same
@@ -187,16 +185,17 @@ def rebase_branch(branch, parent, start_hash):
187
185
  # something very strange has happened.
188
186
  second_rebase_ret = git.rebase(parent, start_hash, branch)
189
187
  if second_rebase_ret.success: # pragma: no cover
190
- print("Second rebase succeeded unexpectedly!")
191
- print("Please see: http://crbug.com/425696")
192
- print("First rebased failed with:")
193
- print(rebase_ret.stderr)
188
+ print "Second rebase succeeded unexpectedly!"
189
+ print "Please see: http://crbug.com/425696"
190
+ print "First rebased failed with:"
191
+ print rebase_ret.stderr
194
192
  else:
195
- print("Here's what git-rebase (squashed) had to say:")
196
- print()
197
- print(squash_ret.stdout)
198
- print(squash_ret.stderr)
199
- print(textwrap.dedent("""\
193
+ print "Here's what git-rebase (squashed) had to say:"
194
+ print
195
+ print squash_ret.stdout
196
+ print squash_ret.stderr
197
+ print textwrap.dedent(
198
+ """\
200
199
  Squashing failed. You probably have a real merge conflict.
201
200
 
202
201
  Your working copy is in mid-rebase. Either:
@@ -205,10 +204,10 @@ def rebase_branch(branch, parent, start_hash):
205
204
  git config branch.%s.dormant true
206
205
 
207
206
  And then run `git rebase-update` again to resume.
208
- """ % branch))
207
+ """ % branch)
209
208
  return False
210
209
  else:
211
- print('%s up-to-date' % branch)
210
+ print '%s up-to-date' % branch
212
211
 
213
212
  git.remove_merge_base(branch)
214
213
  git.get_or_create_merge_base(branch)
@@ -244,8 +243,10 @@ def main(args=None):
244
243
  if git.in_rebase():
245
244
  # TODO(iannucci): Be able to resume rebase with flags like --continue,
246
245
  # etc.
247
- print('Rebase in progress. Please complete the rebase before running '
248
- '`git rebase-update`.')
246
+ print (
247
+ 'Rebase in progress. Please complete the rebase before running '
248
+ '`git rebase-update`.'
249
+ )
249
250
  return 1
250
251
 
251
252
  return_branch, return_workdir = find_return_branch_workdir()
@@ -253,7 +254,7 @@ def main(args=None):
253
254
 
254
255
  if git.current_branch() == 'HEAD':
255
256
  if git.run('status', '--porcelain'):
256
- print('Cannot rebase-update with detached head + uncommitted changes.')
257
+ print 'Cannot rebase-update with detached head + uncommitted changes.'
257
258
  return 1
258
259
  else:
259
260
  git.freeze() # just in case there are any local changes.
@@ -266,7 +267,7 @@ def main(args=None):
266
267
  if branches_to_rebase:
267
268
  skipped = set(skipped).intersection(branches_to_rebase)
268
269
  for branch in skipped:
269
- print('Skipping %s: No upstream specified' % branch)
270
+ print 'Skipping %s: No upstream specified' % branch
270
271
 
271
272
  if not opts.no_fetch:
272
273
  fetch_remotes(branch_tree)
@@ -287,28 +288,28 @@ def main(args=None):
287
288
  if branches_to_rebase and branch not in branches_to_rebase:
288
289
  continue
289
290
  if git.is_dormant(branch):
290
- print('Skipping dormant branch', branch)
291
+ print 'Skipping dormant branch', branch
291
292
  else:
292
293
  ret = rebase_branch(branch, parent, merge_base[branch])
293
294
  if not ret:
294
295
  retcode = 1
295
296
 
296
297
  if opts.keep_going:
297
- print('--keep-going set, continuing with next branch.')
298
+ print '--keep-going set, continuing with next branch.'
298
299
  unrebased_branches.append(branch)
299
300
  if git.in_rebase():
300
301
  git.run_with_retcode('rebase', '--abort')
301
302
  if git.in_rebase(): # pragma: no cover
302
- print('Failed to abort rebase. Something is really wrong.')
303
+ print 'Failed to abort rebase. Something is really wrong.'
303
304
  break
304
305
  else:
305
306
  break
306
307
 
307
308
  if unrebased_branches:
308
- print()
309
- print('The following branches could not be cleanly rebased:')
309
+ print
310
+ print 'The following branches could not be cleanly rebased:'
310
311
  for branch in unrebased_branches:
311
- print(' %s' % branch)
312
+ print ' %s' % branch
312
313
 
313
314
  if not retcode:
314
315
  remove_empty_branches(branch_tree)
@@ -320,8 +321,10 @@ def main(args=None):
320
321
  else:
321
322
  root_branch = git.root()
322
323
  if return_branch != 'HEAD':
323
- print("%r was merged with its parent, checking out %r instead." %
324
- (return_branch, root_branch))
324
+ print (
325
+ "%r was merged with its parent, checking out %r instead."
326
+ % (return_branch, root_branch)
327
+ )
325
328
  git.run('checkout', root_branch)
326
329
 
327
330
  # return_workdir may also not be there any more.
@@ -329,8 +332,10 @@ def main(args=None):
329
332
  try:
330
333
  os.chdir(return_workdir)
331
334
  except OSError as e:
332
- print(
333
- "Unable to return to original workdir %r: %s" % (return_workdir, e))
335
+ print (
336
+ "Unable to return to original workdir %r: %s"
337
+ % (return_workdir, e)
338
+ )
334
339
  git.set_config(STARTING_BRANCH_KEY, '')
335
340
  git.set_config(STARTING_WORKDIR_KEY, '')
336
341
 
@@ -5,8 +5,6 @@
5
5
 
6
6
  """Change the upstream of the current branch."""
7
7
 
8
- from __future__ import print_function
9
-
10
8
  import argparse
11
9
  import sys
12
10
 
@@ -57,7 +55,7 @@ def main(args):
57
55
  "`git branch --set-upstream-to` to assign it one.\n\nPlease assign an "
58
56
  "upstream branch and then run this command again."
59
57
  )
60
- print(msg % branch, file=sys.stderr)
58
+ print >> sys.stderr, msg % branch
61
59
  return 1
62
60
 
63
61
  mbase = get_or_create_merge_base(branch, cur_parent)
@@ -69,17 +67,17 @@ def main(args):
69
67
  try:
70
68
  run('show-ref', new_parent)
71
69
  except subprocess2.CalledProcessError:
72
- print('fatal: invalid reference: %s' % new_parent, file=sys.stderr)
70
+ print >> sys.stderr, 'fatal: invalid reference: %s' % new_parent
73
71
  return 1
74
72
 
75
73
  if new_parent in all_tags:
76
- print("Reparenting %s to track %s [tag] (was %s)" % (branch, new_parent,
77
- cur_parent))
74
+ print ("Reparenting %s to track %s [tag] (was %s)"
75
+ % (branch, new_parent, cur_parent))
78
76
  set_branch_config(branch, 'remote', '.')
79
77
  set_branch_config(branch, 'merge', new_parent)
80
78
  else:
81
- print("Reparenting %s to track %s (was %s)" % (branch, new_parent,
82
- cur_parent))
79
+ print ("Reparenting %s to track %s (was %s)"
80
+ % (branch, new_parent, cur_parent))
83
81
  run('branch', '--set-upstream-to', new_parent, branch)
84
82
 
85
83
  manual_merge_base(branch, mbase, new_parent)
@@ -3,8 +3,6 @@
3
3
  # Use of this source code is governed by a BSD-style license that can be
4
4
  # found in the LICENSE file.
5
5
 
6
- from __future__ import print_function
7
-
8
6
  import argparse
9
7
  import sys
10
8
 
@@ -33,12 +31,12 @@ def main(args):
33
31
  opts.branch = current_branch
34
32
 
35
33
  if not opts.branch or opts.branch == 'HEAD':
36
- print('fatal: Cannot perform git-upstream-diff while not on a branch')
34
+ print 'fatal: Cannot perform git-upstream-diff while not on a branch'
37
35
  return 1
38
36
 
39
37
  par = git.upstream(opts.branch)
40
38
  if not par:
41
- print('fatal: No upstream configured for branch \'%s\'' % opts.branch)
39
+ print 'fatal: No upstream configured for branch \'%s\'' % opts.branch
42
40
  return 1
43
41
 
44
42
  cmd = [git.GIT_EXE, '-c', 'core.quotePath=false',
@@ -12,8 +12,6 @@ binary. It will also automatically try to find the gn binary when run inside
12
12
  the chrome source tree, so users can just type "gn" on the command line
13
13
  (normally depot_tools is on the path)."""
14
14
 
15
- from __future__ import print_function
16
-
17
15
  import gclient_paths
18
16
  import os
19
17
  import subprocess
@@ -58,13 +56,13 @@ def main(args):
58
56
  # inside of buildtools.
59
57
  bin_path = gclient_paths.GetBuildtoolsPlatformBinaryPath()
60
58
  if not bin_path:
61
- print('gn.py: Could not find checkout in any parent of the current path.\n'
62
- 'This must be run inside a checkout.', file=sys.stderr)
59
+ print >> sys.stderr, ('gn.py: Could not find checkout in any parent of '
60
+ 'the current path.\nThis must be run inside a '
61
+ 'checkout.')
63
62
  return 1
64
63
  gn_path = os.path.join(bin_path, 'gn' + gclient_paths.GetExeSuffix())
65
64
  if not os.path.exists(gn_path):
66
- print(
67
- 'gn.py: Could not find gn executable at: %s' % gn_path, file=sys.stderr)
65
+ print >> sys.stderr, 'gn.py: Could not find gn executable at: %s' % gn_path
68
66
  return 2
69
67
  else:
70
68
  return subprocess.call([gn_path] + args[1:])
@@ -15,7 +15,7 @@
15
15
  "deps": {
16
16
  "recipe_engine": {
17
17
  "branch": "master",
18
- "revision": "e7498a59f81c8fad2caf7e3d7c8ca072ec0e2494",
18
+ "revision": "0589a429cf3c164004dae4ced4c75784a50afd81",
19
19
  "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
20
20
  }
21
21
  },
@@ -1,4 +1,4 @@
1
- #!/usr/bin/env bash
1
+ #!/bin/bash
2
2
 
3
3
  # Copyright 2017 The Chromium Authors. All rights reserved.
4
4
  # Use of this source code is governed by a BSD-style license that can be
@@ -1,4 +1,4 @@
1
- #!/usr/bin/env bash
1
+ #!/bin/bash
2
2
 
3
3
  # Copyright 2018 The Chromium Authors. All rights reserved.
4
4
  # Use of this source code is governed by a BSD-style license that can be