Commit Graph

7183 Commits (594fd33247ce8effe47aef46aa56b92144e218db)
 

Author SHA1 Message Date
Alan Cutter 594fd33247 Decode "git cl" error messages to avoid printing Python bytes
We were not decoding the stdout bytes before printing them when git
commands returned an error status. This CL fixes that.

Before:
Command "git cherry-pick FETCH_HEAD" failed.
b'Auto-merging chrome/browser/ui/web_applications/app_browser_controller.cc\nAuto-merging chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc\nCONFLICT (content): Merge conflict in chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc\nAuto-merging chrome/browser/ui/views/frame/browser_non_client_frame_view.cc\nAuto-merging chrome/browser/ui/views/frame/browser_frame.h\nAuto-merging chrome/browser/ui/views/frame/browser_frame.cc\n'

After:
Command "git cherry-pick FETCH_HEAD" failed.
Auto-merging chrome/browser/ui/web_applications/app_browser_controller.cc
Auto-merging chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
CONFLICT (content): Merge conflict in chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc
Auto-merging chrome/browser/ui/views/frame/browser_non_client_frame_view.cc
Auto-merging chrome/browser/ui/views/frame/browser_frame.h
Auto-merging chrome/browser/ui/views/frame/browser_frame.cc
Change-Id: I162e666ca9f3a70259e6178d2e6d3b72f15b1f7b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2310016
Auto-Submit: Alan Cutter <alancutter@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Edward Lesmes 720e010ba1 Revert "bot_update: Refactor branch to detach and checkout."
This reverts commit b99e61c58a.

Reason for revert:
Doesn't work for refs/branch-heads/*

Original change's description:
> bot_update: Refactor branch to detach and checkout.
> 
> Refactor _git_checkout to use information from
> get_target_branch_and_revision to know what branch to checkout after
> cloning.
> 
> Bug: 1104182
> Change-Id: Ib3ba57ca0b6803f172b85121c2a4b123f17bfb8c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2303291
> Reviewed-by: Josip Sokcevic <sokcevic@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=ehmaldonado@chromium.org,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com

Change-Id: If51423df99fd9c164f8e42e0220ee2d9bc2a39f6
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1104182
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2310293
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Saagar Sanghavi 9949ab7a4b Preliminary changes to git cl and presubmit_support
Added an rdb wrapper and use it to time CheckChangeOn{Commit, Upload} from every PRESUBMIT.py file, then reports the results to ResultSink.

Bug: http://crbug.com/1107588

Change-Id: I9bc8a18ba615a76f3e0611eae5b2c4adc5924276
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2242097
Commit-Queue: Saagar Sanghavi <saagarsanghavi@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
5 years ago
Edward Lesmes b99e61c58a bot_update: Refactor branch to detach and checkout.
Refactor _git_checkout to use information from
get_target_branch_and_revision to know what branch to checkout after
cloning.

Bug: 1104182
Change-Id: Ib3ba57ca0b6803f172b85121c2a4b123f17bfb8c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2303291
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Corentin Wallez 801c20219b gclient: deprecated use_relative_hooks
And merge it in use_relative_paths. In all Chromium repos,
use_relative_hooks is True iff:

 - use_relative_paths is True, and
 - there is at least one hook

It makes sense that you'd want to use relative hooks if you use relative
paths so this CL merges both flags into use_relative_paths.

Bug: chromium:1107325
Change-Id: I0fe40eba1e1c61be26c812c7ca4329efb72c7f90
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2306795
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Auto-Submit: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
recipe-roller b655a28e10 Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
79f951ca7b
  79f951c (iannucci@chromium.org)
      [raw_io] Reland: Make output_dir lazy.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I928c1bb09fc0b453e2bc8c3151a7907802a725c5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2308250
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Daniel McArdle 8b4eeffd46 git-cl: Fix "git cl tree" issues with Python 3.
* First, we were treating the return value of HTTPResponse.read() as a
  string when it is really a byte string.

* Second, the urlparse library was renamed to urllib.parse in Python 3,
  so I made the appropriate substitution.

Change-Id: I0b23716e990eca8ddf77742f378ab54eda3d3717
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2307509
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Dan McArdle <dmcardle@chromium.org>
5 years ago
Yoshisato Yanagisawa 39d317835b Roll out new goma client binary VERSION=203
Bug: b/159183955
Change-Id: I7cfd3dd84bb9be0c9d5a57aa9886cddacdfec593
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2306989
Reviewed-by: Ye Kuang <yekuang@google.com>
Commit-Queue: Yoshisato Yanagisawa <yyanagisawa@chromium.org>
5 years ago
recipe-roller 642be1d27d Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
0dbd020e42
  0dbd020 (ddoman@chromium.org)
      [swarming] integrate TaskRequest with resultdb and realm

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I61c828df74eea4f15a1eb2c1d35d961179088e99
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2305450
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
recipe-roller 4bbdfa583e Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
742a272b32
  742a272 (bpastene@chromium.org)
      Revert "[raw_io] Make output_dir lazy."

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I998005b279006438cf456ae3a7276cadde24855a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2303884
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
recipe-roller 320ceb93a2 Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
c1b7a3041f
  c1b7a30 (iannucci@chromium.org)
      [raw_io] Make output_dir lazy.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Id287a3112147a80e5478bb41cb5e71baa08503dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2303880
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Nodir Turakulov 233589f2e7 [dirmd] Roll to the latest version
Latest dirmd tool to 8dba585435d2d50d5c9bfc9a347580ff275456d5

Bug: 1106176
Change-Id: Ia6939ef3b1d7342c3207148bd20b4619e36a61cd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2303639
Auto-Submit: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Sébastien Marchand 78a6bf6371 Revert "Roll git to 2.27.0 on Windows"
This reverts commit 5fcb48536c.

Reason for revert: Broke Git on my gWindows machine, it fails for many Git operations with the following error message:

git pull                                                                                                    
  2 [main] sh (54140) shared_info::initialize: size of shared memory region changed from 45944 to 38776
fatal: Could not read from remote repository

I've confirmed that reverting this CL fixes the problem.

Original change's description:
> Roll git to 2.27.0 on Windows
> 
> Bug: 1070694
> Change-Id: I37af08864661ca92116776569b9285ceb6ff465c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300204
> Reviewed-by: Josip Sokcevic <sokcevic@google.com>
> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>

TBR=ehmaldonado@chromium.org,apolito@google.com,infra-scoped@luci-project-accounts.iam.gserviceaccount.com,sokcevic@google.com

Change-Id: I4d27eaa1b17cb056635dceed5ad1562debfc2e06
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1070694
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2302489
Reviewed-by: Sébastien Marchand <sebmarchand@chromium.org>
Commit-Queue: Sébastien Marchand <sebmarchand@chromium.org>
5 years ago
recipe-roller e9e8c01f3c Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
faf8628f68
  faf8628 (tikuta@chromium.org)
      update isolated client revision

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ib80020f86a84b8f1e859403fe496cb3204ced37c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2301460
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Edward Lesmes 5fcb48536c Roll git to 2.27.0 on Windows
Bug: 1070694
Change-Id: I37af08864661ca92116776569b9285ceb6ff465c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300204
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Edward Lesmes ed9e5acd61 bot_update: Don't checkout 'master' after clone.
Checkout 'HEAD' instead. This is needed to have a detached HEAD, so we
can fetch refs/heads/main:refs/heads/main, where main is the default
branch.

Bug: 1104182
Change-Id: I7b7457b21b7d98d29583555b62e27e96e900adb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300533
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
5 years ago
Edward Lesmes d4e20f24d5 gclient: Unset core.worktree after cloning on Windows.
Caused by https://github.com/git-for-windows/git/issues/2569

Bug: 1070694
Change-Id: Ice39e0f61e5c571562736a35e6441d01cb76ea06
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300652
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
recipe-roller 4531a0531a Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
034831f384
  034831f (iannucci@chromium.org)
      [luciexe] zlib compress build.proto output.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ib8db59cfe720ff1c7e25c85d575af85d169b4b4d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300762
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Lei Zhang b8c62cf5f4 Add default filters to git cl lint.
Use the same set of default filters as presubmit checks. Presubmit
checks use filters to give better lint results as expected by Google C++
style. Give git-cl's lint subcommand the same benefit.

Bug: 1106028
Change-Id: I51ff0737b310990ab424376d2721e8a6a50dfc6e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298122
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Lei Zhang 379d1ad115 Simplify a block of conditionals for git cl lint.
Use continues to reduce the amount of nesting in a loop. At the same
time, give the variable involved better names.

Bug: 1097674
Change-Id: I105ed4a99da783fb235e304bbad4edd1f8a38889
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298659
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
5 years ago
Edward Lesmes 6d938a0d85 presubmit_canned_checks: Add DIR_METADATA presubmit checks.
- Add a check to validate DIR_METADATA files.
- Add a check to enforce that OWNERS files contain no metadata if a
  DIR_METADATA file is present in the same directory.

Bug: 1102997
Change-Id: Iedb09941001577dc81b1dda2241481ff667b2568
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298330
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Nodir Turakulov <nodir@chromium.org>
5 years ago
recipe-roller 2f6667ed53 Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
f4cd7a476c
  f4cd7a4 (yiwzhang@google.com)
      [luciexe] Set the initial build status to running

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Iafe30b0f8ef09c4f86491f60a6d7c848c171bcf9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2300522
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Chan Li 9d9199a509 [led] Roll to latest
Bug: 1099018
Change-Id: Ie40d213670f41f946c3111cee2247fbb8fa12754
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298121
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Chan Li <chanli@chromium.org>
5 years ago
Greg Guterman 35dec5f127 Add gerrit_change_owner field to tryserver recipe api
Bug: 923016
Change-Id: I1d55fb2403306763a06b44d2ea65caa0014936d3
Recipe-Nontrivial-Roll: infra
Recipe-Nontrivial-Roll: build_limited_scripts_slave
Recipe-Nontrivial-Roll: build
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2292235
Commit-Queue: Gregory Guterman <guterman@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Nodir Turakulov 672e1dcfad [dirmd] Add dirmd executables
This should have been a part of
https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298244

Bug: 1104246
Change-Id: I3a1ef07cb4443aa2d62af7f3cb28e0d58bd3951a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2297804
Auto-Submit: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Nodir Turakulov 3229d944bf [dirmd] Deploy dirmd
Deploy dirmd tool via CIPD.

Bug: 1104246
Change-Id: I3681262192c2eaf706867d3c49a6293171c93d11
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2298244
Auto-Submit: Nodir Turakulov <nodir@chromium.org>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Greg Guterman c3cb7eecb6 Analyze DEPS autorolls
This new logic tries to figure out which files really changed in a DEPS roll by checking out the old DEPS file and recursively running git diff on all of the repos listed in DEPS. When successful, affected_files turns from just ['DEPS'] into an actual list of affected files. When not successful, it falls back to the original logic.

When DEPS is autorolled, typically the change is just an updated git revision. We don't apply this logic to manual DEPS rolls, as they can contain changes to other variables, whose effects are not easily discernible.

MUST be applied in tandem with https://crrev.com/c/2250928

Bug: 923016
Change-Id: I9e33461ea4ae81dc056d229f8604943745e30389
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2283855
Commit-Queue: Gregory Guterman <guterman@google.com>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
recipe-roller fad2090a5e Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
59e7d3f289
  59e7d3f (adrexler@google.com)
      Add read_ and write_proto methods to file api.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: Ib30f4f114faec72be2bbeafc6ba374abccc0af25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2296496
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
recipe-roller 68978076fd Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
7b45560ebb
  7b45560 (iannucci@chromium.org)
      [recipe_engine] Only retain child step presentations.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I09d1bce4ec82732a4d7d367c9f4078d93db94c4b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2295693
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Lei Zhang 67283c06a5 Fix gclient_gn_args_file calculation when use_relative_paths=True.
With https://chromium-review.googlesource.com/2279874, gclient started
taking |use_relative_paths| into account when calculating the path to
gclient_args.gni from |gclient_gn_args_file|. This CL introduced an
issue where the calculation depends on the current working directory.
e.g. Running gclient from ~/repo and ~/repo/sub_dir produced different
results for gclient_args.gni.

Fix this by prepending the root path, which is absolute, when
calculating the path to gclient_args.gni.

Bug: chromium:1102833
Change-Id: I970e38352aea77d857e49dc7dca58f21ba8e0331
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2296219
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
5 years ago
Corentin Wallez 271a78ac35 gclient: Make gclient_gn_args_file honor use_relative_paths
Without this repos that use the use_relative_paths still need to use
their absolute path for gclient_gn_args_file.

Bug: chromium:1102833
Change-Id: I470096625061a28abf495f4d1035121edbcd581f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2279874
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
5 years ago
Ayu Ishii 0be4724e2f CodeInclusion: Rename whitelist/blacklist -> allowlist/blocklist
Bug: 1097674
Change-Id: Ib1a4a3fe3eca37a1a3a90d62c19eeda5fe4bc499
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2293134
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
5 years ago
Allen Bauer 8e404a7e49 Added option to keep empty branches in rebase-update.
Change-Id: I87b1edf242aa5c8483d8d84d223fc9187a194708
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2292962
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Allen Bauer <kylixrd@chromium.org>
5 years ago
local_bot 9af33fa208 Use inclusive parameters in PRESUBMIT.py
R=dpranke@google.com

Bug: 1098560
Change-Id: I22f7e89cafb6c8ab7e268afc7004c5ed57f12d12
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2288510
Reviewed-by: Dirk Pranke <dpranke@google.com>
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
5 years ago
local_bot 6402141d1f Rename blocklist/allowlist to skip_list/check_list
This change is backwards compatible.

R=dpranke@google.com

Bug: 1098560
Change-Id: Ic9447041a68b8c379f65900af11c89b006e3f806
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2285156
Commit-Queue: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Dirk Pranke <dpranke@google.com>
5 years ago
Vadim Shtayura 26314e9f43 [lucicfg] Update to v1.18.2.
Contains some internal refactoring, no externally observable
changes.

TBR=tandrii@chromium.org, iannucci@chromium.org
BUG=1051724

Change-Id: I921c1a4adaa877dda07357463b4bb3f7dfc66676
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2288657
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
5 years ago
recipe-roller a66f608291 Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
e6e0924802
  e6e0924 (yiwzhang@google.com)
      Remove allow_subannotation kwarg in step module to prevent new...

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I4cd70d63eaf91cc803a8a70c71b89e0f7bd22069
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2288427
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Nico Weber e64cd3aeff mac: Add an arm64 slice to ninja-mac.
To build the arm ninja binary, I downloaded a zip with the ninja 1.8.2
code, and ran `./configure --bootstrap` on an arm mac, with Xcode 12 beta
installed, followed by `strip ninja`. That gave me a working ninja 1.8.2
arm binary. I then copied it to my intel mac and ran

    lipo -create -output ninja-mac ninja-mac ~/Downloads/ninja

to make a fat binary.

No intended behavior change on non-arm macs.

(This means the x86_64 slice, which is the previously existing binary,
has a LC_VERSION_MIN_MACOSX version 10.6, while the arm64 slice has
LC_BUILD_VERSION minos 11.0, according to `otool -arch ax86_64 -l ninja-mac`
and `otool -arch arm64 -l ninja-mac`.)

Bug: 1103315,762354
Change-Id: I2c4bea53a01d7a6135f9cd5554e3123dba960664
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2288417
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
5 years ago
Nico Weber c49c88ac82 gclient: Force "git clone" to run arm git on arm macs.
With this, `fetch chromium` manages to client src.git and all
dependencies in DEPS (and then dies in runhooks).

Bug: 1103236
Change-Id: I0e26b78f1c552aa23eaa6c43b61f3c6809a3ada1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2287751
Auto-Submit: Nico Weber <thakis@chromium.org>
Reviewed-by: Mark Mentovai <mark@chromium.org>
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
5 years ago
Dirk Pranke e62496bafc Remove Python 3 warning.
Running on Python 3 should be a fairly common situation at this
point, so it doesn't seem like we need an explicit warning for it.

Change-Id: Id73ffb89f6da6e7268fd2e5963cf99175a47b5b7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2284547
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Dirk Pranke <dpranke@google.com>
5 years ago
Vadim Shtayura 5af069b049 [cipd] Always bootstrap mac-amd64, even on arm64.
There's no mac-arm64 yet, since Go doesn't support this. Presumably
mac-amd64 should work fine on ARM Mac too, see the bug.

Note that this will transitively affect all binaries fetched by
CIPD, they all will be mac-amd64.

BUG=1102967
R=iannucci@chromium.org, thakis@chromium.org

Change-Id: Ie3c5b5776c3d2f83b5dfa411016862dbbc53a9e2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2282940
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
5 years ago
Ayu Ishii 81a9074069 CodeInclusion: Rename whitelist/blacklist -> allowlist/blocklist
Bug: 1097674
Change-Id: I42ad9758cc51e37adf9d2941def720ee83954279
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2268405
Reviewed-by: Dirk Pranke <dpranke@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Ayu Ishii <ayui@chromium.org>
5 years ago
Vadim Shtayura ce1375c5f0 [lucicfg] Update to v1.18.1.
To pick up https://chromium-review.googlesource.com/c/2283127.

TBR=iannucci@chromium.org, tandrii@chromium.org

Change-Id: Ib83240dcc5abc0dcafda588f0a38b0663fc68ae0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2283965
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
5 years ago
Carlos Caballero 81923d6d2c Fix git_cl -r compatibility issue with Python 3
iterkeys is no longer a thing in Python 3

Change-Id: I4d88d2a486db1e552ecac27f123219ac1e03bcaf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2276208
Commit-Queue: Carlos Caballero <carlscab@google.com>
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
5 years ago
Weiwei Lin 49735e227c [lucicfg] Update v1.17.1 -> v1.18.0
Rename Builder.description to Builder.descripton_html

Bug: 1066815
Change-Id: I81d193f51b51997fb638e245175ac0f563786b4e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2279331
Auto-Submit: Weiwei Lin <weiweilin@google.com>
Reviewed-by: Andrii Shyshkalov <tandrii@google.com>
Commit-Queue: Weiwei Lin <weiweilin@google.com>
5 years ago
recipe-roller 95099f4754 Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
600141463e
  6001414 (iannucci@chromium.org)
      Apply index.lock 'fix' within recipes.py.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I09c4e12932935cce11b324571dcedd25d034b067
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2277236
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago
Vadim Shtayura f0a1c32f21 [lucicfg] Update it to v1.17.1.
Adds wait_for_capacity option to luci.builder(...), fixes couple
minor bugs in `lucicfg fmt` and `lucicfg lint`.

TBR=iannucci@chromium.org
BUG=1096936

Change-Id: I968d051646c5135d36da0249416f85d6f209b09d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2276818
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Commit-Queue: Vadim Shtayura <vadimsh@chromium.org>
5 years ago
Dirk Pranke fdd2cd6e5f Reland "Add a Str() function to gclient for use in DEPS files."
This relands c7eed83 with a fix to the way variables are
propagated from parent dependencies into child dependencies.

The original CL description from c7eed83 was:
> gclient's existing functionality for handling variables is
> ambiguous: the value of a variable can either be a string literal
> or an expression fragment. The implementation is required to
> parse a value as an expression, and, if it is legal, treat it
> as an expression instead of a literal. This means that
>
>   gclient_gn_args_file = 'src/build/args.gni'
>   gclient_gn_args = ['xcode_version']
>   vars = {
>     'xcode_version': 'xcode-12'
>   }
>
> would cause a problem because gclient would try to parse the
> variable as an expression, and 'xcode' would not be defined.
>
> This patch adds a workaround for this, where you can instead
> use the Str() function to explicitly tell gclient to treat the
> value as a string and not a potential expression.
>
> The above example would be changed to:
>
>   gclient_gn_args_file = 'src/build/args.gni'
>   gclient_gn_args = ['xcode_version']
>   vars = {
>     'xcode_version': Str('xcode-12')
>   }
>
> The variable may still be used in every context where it was legal
> to be used before.
>
This reverts commit 84431987dd384c79c84515004d19db67345a1c00.

Bug: 1099242
TBR=ehmaldonado@chromium.org

Change-Id: I047b871df47c367c1f34a3985e5813504e3c5c6f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2274152
Commit-Queue: Dirk Pranke <dpranke@google.com>
Reviewed-by: Ben Pastene <bpastene@chromium.org>
5 years ago
Dirk Pranke 1ee86bdf3a Add dpranke@google.com to //OWNERS.
I've switched to using my @google.com address for most work,
so adding it to //OWNERS here.

I'm not removing my @chromium.org address yet, just to make
switching over a bit easier.

Change-Id: If8d6ac06a5193eac79bbd32ea9a5524dcf24b1dd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2276571
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Dirk Pranke <dpranke@google.com>
5 years ago
recipe-roller af04ef2a7d Roll recipe dependencies (trivial).
This is an automated CL created by the recipe roller. This CL rolls
recipe changes from upstream projects (recipe_engine) into this repository.

recipe_engine:
7317229d12
  7317229 (iannucci@chromium.org)
      [fetch] Update fetch process to clear index.lock.

More info is at https://goo.gl/zkKdpD. Use https://goo.gl/noib3a to file a bug.

TBR=iannucci@chromium.org

Recipe-Tryjob-Bypass-Reason: Autoroller
Bugdroid-Send-Email: False
Change-Id: I75e4ff5f9c5b27d94977edc50f4d1d628410437c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2276744
Reviewed-by: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
Commit-Queue: Recipe Roller <recipe-mega-autoroller@chops-service-accounts.iam.gserviceaccount.com>
5 years ago