You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
Go to file
Josip Sokcevic 1a8bf9e370 Improve error message on gclient sync failure
The new error message should clarify what we expect from user to do.

Also, git v2.42.0 introduced new advice on merge failure, which breaks
existing regex match. Instead, use search.

R=aravindvasudev@google.com

Fixed: 1475622
Change-Id: Ib4e60947aaa7994715cfae3260dd27f85f2380b4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4823716
Auto-Submit: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
Reviewed-by: Aravind Vasudevan <aravindvasudev@google.com>
2 years ago
bootstrap [git] Upgrade git to 2.41.0 2 years ago
fetch_configs Set managed:True for infra_superproject configs. 2 years ago
git-templates
infra Roll recipe dependencies (trivial). 2 years ago
man [depot_tools] clarify that new-branch also switch. 2 years ago
metadata Define main metadata validation functions 2 years ago
python-bin cipd/python: optimize cat usage 2 years ago
python2-bin cipd/python: optimize cat usage 2 years ago
recipes Reland "Drop py2 support in recipe modules" 2 years ago
testing_support Reland "Drop py2 support in gerrit and git related files" 2 years ago
tests Improve error message on gclient sync failure 2 years ago
third_party [ssci] Added Shipped field to READMEs 2 years ago
win_toolchain Improve .boto message visibility 2 years ago
zsh-goodies
.cipd_impl.ps1 Import Get-FileHash from PowerShell's version specific path 2 years ago
.gitattributes Define main metadata validation functions 2 years ago
.gitignore Implement reclient metrics uploading 2 years ago
.isort.cfg
.style.yapf
.vpython
.vpython3 Add brotli to .vpython3 for depot_tools 2 years ago
BUILD_OWNERS add siso wrapper 2 years ago
CROS_OWNERS CROS_OWNERS: switch to our common shared lists 3 years ago
DIR_METADATA
LICENSE
LUCI_OWNERS Revert "New vpython to depot_tools" 2 years ago
OWNERS Update OWNERS for new reclient_metrics* files 2 years ago
PRESUBMIT.py PRESUBMIT.py: remove `USE_PYTHON3 = True` 2 years ago
README.gclient.md
README.git-cl.md
README.md
RECLIENT_OWNERS Add convenience wrapper for reclientreport for autoninja users 2 years ago
WATCHLISTS Update WATCHLISTS for ninja, siso and reclient changes 2 years ago
auth.py
autoninja
autoninja.bat Handle goma_ctl/autoninja /? 2 years ago
autoninja.py Improve ninja-to-siso switch detection 2 years ago
autosiso [siso] add autosiso wrappers 2 years ago
autosiso.bat [autosiso] Add single file compile support on Windows 2 years ago
autosiso.py [autosiso] Add single file compile support on Windows 2 years ago
bazel [ChromiumOS] Add a launcher for Bazel 2 years ago
bazel.py [ChromiumOS] Add a launcher for Bazel 2 years ago
bb
bb.bat
black
bootstrap_python3 Use relative path for cipd 2 years ago
breakpad.py
cbuildbot
cipd Revert "[cipd] Detect Mac ARM running under Rosetta" 2 years ago
cipd.bat [cipd] Run cipd_impl.ps1 in constrained language mode 2 years ago
cipd_bin_setup.bat Revert "Retry switching to use CIPD ninja v1.8.2" 3 years ago
cipd_bin_setup.sh cipd_bin_setup: load cipd script instead of running it 2 years ago
cipd_client_version [auth]: Update CIPD to include version update of luci-auth change. 2 years ago
cipd_client_version.digests [auth]: Update CIPD to include version update of luci-auth change. 2 years ago
cipd_manifest.txt [depot_tools] roll bb 2 years ago
cipd_manifest.versions [depot_tools] roll bb 2 years ago
cipd_manifest_cros_python2.txt Redirect cros calls to py2.7 scripts to the vpython2.7 package. 2 years ago
cipd_manifest_cros_python2.versions Redirect cros calls to py2.7 scripts to the vpython2.7 package. 2 years ago
clang-format
clang-format.bat
clang_format.py clang-format: lookup for binary under third_party/clang-format 2 years ago
clang_format_merge_driver
clang_format_merge_driver.bat
clang_format_merge_driver.py
codereview.settings
compile_single_file
compile_single_file.bat
compile_single_file.py Call ninja.py from compile_single_file.py 3 years ago
cpplint.bat
cpplint.py [cpplint] Use `with` statement to ensure file descriptor is closed 2 years ago
cpplint_chromium.py Fix various lint false positives. 2 years ago
cros [cros] Update "Chromium OS" to "ChromiumOS" 2 years ago
cros_python2.vpython Redirect cros calls to py2.7 scripts to the vpython2.7 package. 2 years ago
cros_sdk
crosjobs
detect_host_arch.py Revert "loongarch64: Add loongarch64 architecture detection support." 2 years ago
dirmd
dirmd.bat
download_from_google_storage
download_from_google_storage.bat
download_from_google_storage.py Handle 401 from gsutil 2 years ago
ensure_bootstrap setup & share path to depot_tools checkout 2 years ago
fetch [py2] Drop envvar to run scripts with py2 2 years ago
fetch.bat [py2] Drop envvar to run scripts with py2 2 years ago
fetch.py Remove deadcode from depot_tools scripts 2 years ago
fix_encoding.py
gclient [py2] Drop envvar to run scripts with py2 2 years ago
gclient-new-workdir.py Drop py2 support in gclient and related files 2 years ago
gclient.bat [py2] Drop envvar to run scripts with py2 2 years ago
gclient.py Use only DEPS git depedencies if SYNC is used 2 years ago
gclient_completion.sh
gclient_eval.py Drop py2 support in gclient and related files 2 years ago
gclient_paths.py Drop py2 support in gclient and related files 2 years ago
gclient_scm.py Improve error message on gclient sync failure 2 years ago
gclient_utils.py Drop py2 support in gclient and related files 2 years ago
gerrit Symlink gerrit CLI into depot_tools 2 years ago
gerrit_client.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
gerrit_util.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git-cache
git-cl
git-crrev-parse
git-drover
git-find-releases
git-footers
git-freeze
git-gs
git-hyper-blame
git-map
git-map-branches
git-mark-merge-base
git-migrate-default-branch
git-nav-downstream
git-nav-upstream
git-new-branch
git-number
git-rebase-update
git-rename-branch
git-reparent-branch
git-retry
git-runhooks
git-squash-branch
git-thaw
git-upstream-diff
git_cache.py Set HEAD on repo init, not after downloading repo 2 years ago
git_cl.py Improve `git cl format` for metrics XML files. 2 years ago
git_cl_completion.sh
git_common.py Fix fsmonitor warning to not include global 2 years ago
git_dates.py
git_drover.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_find_releases.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_footers.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_freezer.py Don't commit unstaged gitlinks in FREEZE.index during rebase-update. 2 years ago
git_hyper_blame.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_map.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_map_branches.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_mark_merge_base.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_migrate_default_branch.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_nav_downstream.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_new_branch.py
git_number.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_rebase_update.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_rename_branch.py
git_reparent_branch.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
git_retry.py Fix git-retry on errors 3 years ago
git_squash_branch.py
git_upstream_diff.py Reland "Drop py2 support in gerrit and git related files" 2 years ago
gn
gn.bat
gn.py
goma_auth
goma_auth.bat
goma_ctl Skip goma on unsupported platforms 2 years ago
goma_ctl.bat Handle goma_ctl/autoninja /? 2 years ago
gsutil.py Reland "[gsutil] Update gsutil error message on outdated boto" 2 years ago
gsutil.py.bat Reland "Make depot_tools scripts return exit codes properly on all platforms." 3 years ago
gsutil.vpython3
infra_to_superproject Use shutil.copytree instead for migration script instead. 2 years ago
infra_to_superproject.bat Use shutil.copytree instead for migration script instead. 2 years ago
infra_to_superproject.py Remove unused imports from depot_tools scripts 2 years ago
isort
led
led.bat
lockfile.py
luci-auth
luci-auth.bat
lucicfg
lucicfg.bat
mac_toolchain
metrics.README.md
metrics.py Remove deadcode from depot_tools scripts 2 years ago
metrics_utils.py Use exit code 130 for keyboard interrupts 2 years ago
my_activity.py Remove unused imports from depot_tools scripts 2 years ago
ninja Revert "Use depot_tools python3 to call ninja.py" 2 years ago
ninja.bat Add single file compile support for Windows in ninja wrappers 2 years ago
ninja.py Fix a spelling error in a comment 2 years ago
ninja_reclient.py Mark reclient build metrics with the tool that started reclient 2 years ago
ninjalog.README.md
ninjalog_uploader.py [ninjalog_uploader] Exclude absolute paths and options from targets 2 years ago
ninjalog_uploader_wrapper.py
owners_client.py Update code-owners documentation links 2 years ago
owners_finder.py Remove unused imports from depot_tools scripts 2 years ago
pinpoint
pinpoint.bat
post_build_ninja_summary.py Add elapsed-time sorting option to build summary 2 years ago
presubmit_canned_checks.py Revert "Check if DEPS git is not in git submodules" 2 years ago
presubmit_support.py config: use lucicfg validate to validate the config files 2 years ago
profile.xml
prpc
prpc.bat
pylint-2.6 Update pylint vpython specs to use a specific minor version. 3 years ago
pylint-2.6.bat
pylint-2.7 Update pylint vpython specs to use a specific minor version. 3 years ago
pylint-2.7.bat
pylint_main.py
pylintrc
python_runner.sh [py2] Drop envvar to run scripts with py2 2 years ago
rdb
rdb.bat
rdb_wrapper.py Remove unused imports from depot_tools scripts 2 years ago
reclient_helper.py [reclient] Add quotes to download_remoteexec_cfg in error message 2 years ago
reclient_metrics Add reclient_metrics command 2 years ago
reclient_metrics.README.md [reclient] Update reclient_metrics.README.md to reflect that we collect googler hostnames 2 years ago
reclient_metrics.bat Add reclient_metrics command 2 years ago
reclient_metrics.py Implement reclient metrics uploading 2 years ago
reclientreport Add convenience wrapper for reclientreport for autoninja users 2 years ago
reclientreport.bat Remove unnesisary quotes from propagated args in reclientreport.bat 2 years ago
reclientreport.py [reclient] Add temporary fix for reclientreport on windows 2 years ago
repo repo: unfork our launcher 2 years ago
repo_launcher repo: unfork our launcher 2 years ago
roll-dep [py2] Drop envvar to run scripts with py2 2 years ago
roll-dep.bat [py2] Drop envvar to run scripts with py2 2 years ago
roll_dep.py Fix roll dep to use update-index 2 years ago
rustfmt.py Use rustfmt from third_party/rust-toolchain/bin directory. 2 years ago
scm.py [scm] Fix list all files when filename has space 2 years ago
setup_color.py Remove unused imports from depot_tools scripts 2 years ago
siso add siso wrapper 2 years ago
siso.bat add siso wrapper 2 years ago
siso.py [siso] check presence of .sisoenv file 2 years ago
split_cl.py Remove unused imports from depot_tools scripts 2 years ago
subcommand.py Use empty argument list in cmdhelp 3 years ago
subprocess2.py Remove unused imports from depot_tools scripts 2 years ago
swift-format
swift_format.py
update_depot_tools setup & share path to depot_tools checkout 2 years ago
update_depot_tools.bat Call goma_ctl update_hook only after python3 is bootstrapped. 2 years ago
update_depot_tools_toggle.py
upload_metrics.py Remove unused imports from depot_tools scripts 2 years ago
upload_to_google_storage.py Fix code check in upload to google storage. 3 years ago
utils.py Revert "Extract searching relevat files in utils function" 2 years ago
vpython vpython: clear DEPOT_TOOLS_DIR before running scripts 2 years ago
vpython.bat Remove Python 2 support for presubmit Commands 2 years ago
vpython3 vpython: clear DEPOT_TOOLS_DIR before running scripts 2 years ago
vpython3.bat Use the bundled interpreter instead of passing -vpython-interpreter. 3 years ago
watchlists.py
weekly
whitespace.txt
win32imports.py
wtf
yapf Update vpython spec for yapf to 0.31.0 2 years ago
yapf.bat

README.md

depot_tools

Tools for working with Chromium development. It requires python 2.7 or 3.8 for python 3 support.

Tools

The most important tools are:

  • fetch: A gclient wrapper to checkout a project. Use fetch --help for more details.
  • gclient: A meta-checkout tool. Think repo or git submodules, except that it support OS-specific rules, e.g. do not checkout Windows only dependencies when checking out for Android. Use gclient help for more details and README.gclient.md.
  • git cl: A code review tool to interact with Rietveld or Gerrit. Use git cl help for more details and README.git-cl.md.
  • roll-dep: A gclient dependency management tool to submit a dep roll, updating a dependency to a newer revision.

There are a lot of git utilities included.

Updating

depot_tools updates itself automatically when running gclient tool. To disable auto update, set the environment variable DEPOT_TOOLS_UPDATE=0 or run ./update_depot_tools_toggle.py --disable.

To update package manually, run update_depot_tools.bat on Windows, or ./update_depot_tools on Linux or Mac.

On Windows only, running gclient will install git and python.

Contributing

To contribute change for review:

git new-branch <somename>
# Hack
git add .
git commit -a -m "Fixes goat teleporting"
# find reviewers
git cl owners
git log -- <yourfiles>

# Request a review.
git cl upload -r reviewer1@chromium.org,reviewer2@chromium.org --send-mail

# Edit change description if needed.
git cl desc

# If change is approved, flag it to be committed.
git cl set-commit

# If change needs more work.
git rebase-update
...
git cl upload -t "Fixes goat teleporter destination to be Australia"

See also open bugs, open reviews, forum or report problems.

cpplint.py

Until 2018, our cpplint.py was a copy of the upstream version at https://github.com/google/styleguide/tree/gh-pages/cpplint. Unfortunately, that repository is not maintained any more. If you want to update cpplint.py in depot_tools, just upload a patch to do so. We will figure out a long-term strategy via issue https://crbug.com/916550.

Note that the cpplint.py here is also used by the Tricium analyzer, so if the cpplint.py here changes, we should also update the copy used there.