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
Yiwei Zhang 85e409e69a git cl: fix a bug that may output stale upstream branch
git cl upstream will run `git branch --set-upstream-to xxx` command
which modifies the git config. However, it doesn't invalidate config
cache. I think an ideal fix would be the git scm exposes method to
invalidate cache and the caller of git command needs to explicitly
invalidate the cache right after git command invocation. However,
I decide to take a "clever" approach here because this seems to
be the only place in git cl that requires explicit cache eviction.
It may not be worth to expose the existence of cache just for this
reason. The "clever" approach swaps the order of subseqent config
modification and config reading. The config modification will always
invalidate the cache. Therefore, It will ensure we are always reading
up-to-date upstream branch name from the fresh config cahce.

Bug: 40942309
Change-Id: I3786fd37799092ce269c7c4d3945c51d077335cb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5479950
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Yiwei Zhang <yiwzhang@google.com>
1 year ago
bootstrap New cpython3 and vpython3 packages to depot_tools. 1 year ago
fetch_configs Add fetch config node 1 year ago
hooks pre-commit: do not ignore submodule when running diff-index 2 years ago
infra Roll recipe dependencies (trivial). 1 year ago
man Switch to using issues.chromium.org bug links 1 year ago
metadata metadata: treats CPEPrefix "unknown" as None 1 year ago
python-bin
python2-bin
recipes Roll recipe dependencies (trivial). 1 year ago
testing_support Allow multiple objects per GCS dep 1 year ago
tests Support --target_branch=refs/meta/config branch 1 year ago
third_party schema: pull LICENSE whitespace trim from upstream 2 years ago
win_toolchain Revert "Reland "Add support for GCS deps"" 1 year ago
zsh-goodies
.cipd_impl.ps1
.flake8 Add a config file for the flake8 linter. 2 years ago
.gitattributes Define main metadata validation functions 2 years ago
.gitignore autoninja: cache negative result of gcloud account check 1 year ago
.isort.cfg
.style.yapf switch to 4 space indent 2 years ago
.vpython3 Update the CheckInfraFreeze canned check to use datetime & zoneinfo. 1 year ago
BUILD_OWNERS
CROS_OWNERS
DIR_METADATA
LICENSE
LUCI_OWNERS add peep-software-deploy team to luci owners 2 years ago
OWNERS remove goma CIPD package 1 year ago
PRESUBMIT.py [PRESUBMIT] Increase unit test timeout 1 year ago
README.gclient.md
README.git-cl.md
README.md Switch to using issues.chromium.org bug links 1 year ago
RECLIENT_OWNERS
WATCHLISTS Update WATCHLISTS for ninja, siso and reclient changes 2 years ago
auth.py Fix multiline comment formatting 1 year ago
autoninja Revert^2 "autoninja.py: disallow external account from corp machine" 1 year ago
autoninja.bat Remove obsolete autoninja.bat comment 1 year ago
autoninja.py autoninja: fix behavior when passed args after '--' 1 year ago
autosiso Deprecate autosiso.bat and autosiso. 2 years ago
autosiso.bat Deprecate autosiso.bat and autosiso. 2 years ago
autosiso.py [siso] Propagte SIGINT to siso process 2 years ago
bazel [ChromiumOS] Add a launcher for Bazel 2 years ago
bazel.py switch to 4 space indent 2 years ago
bb
bb.bat
black
bootstrap_python3
breakpad.py switch to 4 space indent 2 years ago
cbuildbot
cipd enable fetch and gclient to run on z/OS part 1 1 year ago
cipd.bat
cipd_bin_setup.bat
cipd_bin_setup.sh cipd_bin_setup: load cipd script instead of running it 2 years ago
cipd_client_version Update to 2.6.16 1 year ago
cipd_client_version.digests Update to 2.6.16 1 year ago
cipd_manifest.txt roll lucicfg to v1.43.6 1 year ago
cipd_manifest.versions roll lucicfg to v1.43.6 1 year ago
cipd_manifest_cros_python2.txt remove goma CIPD package 1 year ago
cipd_manifest_cros_python2.versions
clang-format
clang-format.bat
clang_format.py Remove __future__ imports 2 years ago
codereview.settings
compile_single_file Make 'compile_single_file' use vpython3 1 year ago
compile_single_file.bat Make 'compile_single_file' use vpython3 1 year ago
compile_single_file.py Make 'compile_single_file' use vpython3 1 year ago
cpplint.bat
cpplint.py [cpplint] Update for c++20 1 year ago
cpplint_chromium.py switch to 4 space indent 2 years ago
cros cros: expand to cover more roots 1 year ago
cros_python2.vpython
cros_sdk
crosjobs
detect_host_arch.py enable fetch and gclient to run on z/OS part 1 1 year ago
dirmd
dirmd.bat
download_from_google_storage
download_from_google_storage.bat
download_from_google_storage.py Update *_hash and *_is_first_class_gcs to be dotfiles 1 year ago
ensure_bootstrap setup & share path to depot_tools checkout 2 years ago
fetch
fetch.bat
fetch.py Use shlex instead of pipes 1 year ago
gclient
gclient-new-workdir.py switch to 4 space indent 2 years ago
gclient.bat
gclient.py Ignore gcs deps for gclient gitmodules 1 year ago
gclient_completion.sh
gclient_eval.py Allow multiple objects per GCS dep 1 year ago
gclient_paths.py Cache values in gclient_paths.py 2 years ago
gclient_scm.py Don't clear directory for new/removed entries 1 year ago
gclient_utils.py enable fetch and gclient to run on z/OS part 1 1 year ago
gerrit
gerrit_client.py [fix_encoding] Remove fix_encoding 1 year ago
gerrit_util.py Fix use of deprecated LOGGER.warn in gerrit test 1 year ago
git-cache
git-cl
git-crrev-parse
git-drover
git-find-releases
git-footers
git-freeze
git-gs Enable searching starlark files with git gs. 1 year ago
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 [git_cache] support ssh url 1 year ago
git_cl.py git cl: fix a bug that may output stale upstream branch 1 year ago
git_cl_completion.sh
git_common.py Reland "Update gclient to use git config caching" 1 year ago
git_completion.sh Bash autocompletion for 'git new-branch' and 'git reparent-branch' 2 years ago
git_dates.py Fix multiline comment formatting 1 year ago
git_find_releases.py switch to 4 space indent 2 years ago
git_footers.py Fix multiline comment formatting 1 year ago
git_freezer.py switch to 4 space indent 2 years ago
git_hyper_blame.py Fix multiline comment formatting 1 year ago
git_map.py switch to 4 space indent 2 years ago
git_map_branches.py Fix multiline comment formatting 1 year ago
git_mark_merge_base.py switch to 4 space indent 2 years ago
git_migrate_default_branch.py [fix_encoding] Remove fix_encoding 1 year ago
git_nav_downstream.py switch to 4 space indent 2 years ago
git_new_branch.py switch to 4 space indent 2 years ago
git_number.py Fix multiline comment formatting 1 year ago
git_rebase_update.py Reland "Update gclient to use git config caching" 1 year ago
git_rename_branch.py switch to 4 space indent 2 years ago
git_reparent_branch.py switch to 4 space indent 2 years ago
git_retry.py Fix multiline comment formatting 1 year ago
git_squash_branch.py switch to 4 space indent 2 years ago
git_upstream_diff.py switch to 4 space indent 2 years ago
gn
gn.bat
gn.py Revert "[depot_tools] Support both gn paths in gn.py" 1 year ago
gsutil.py enable fetch and gclient to run on z/OS part 1 1 year ago
gsutil.py.bat
gsutil.vpython3
infra_to_superproject
infra_to_superproject.bat
infra_to_superproject.py switch to 4 space indent 2 years ago
isort switch to 4 space indent 2 years ago
led
led.bat
lockfile.py Fix multiline comment formatting 1 year ago
luci-auth
luci-auth.bat
lucicfg
lucicfg.bat
mac_toolchain
metrics.README.md
metrics.py Clean up stacked-changes dogfood 1 year ago
metrics_utils.py Fix multiline comment formatting 1 year ago
my_activity.py [fix_encoding] Remove fix_encoding 1 year ago
ninja
ninja.bat
ninja.py apply black and `git cl format` for ninja related python files 2 years ago
ninja_reclient.py apply black and `git cl format` for ninja related python files 2 years ago
ninjalog.README.md ninjalog: fix ninjalog.README.md 1 year ago
ninjalog_uploader.py [ninjalog_uploader] Collect use_siso/use_remoteexec GN args metrics 1 year ago
ninjalog_uploader_wrapper.py apply black and `git cl format` for ninja related python files 2 years ago
owners_client.py [owners] Limit number of concurrent Gerrit connections 1 year ago
owners_finder.py Remove __future__ imports 2 years ago
pinpoint
pinpoint.bat
post_build_ninja_summary.py check `siso summary` 2 years ago
presubmit_canned_checks.py Reland "Include host and project in code-owners not enabled error." 1 year ago
presubmit_diff.py Handle diff without chunk header 1 year ago
presubmit_support.py Provide useful submodule info for all Change classes 1 year ago
profile.xml
prpc
prpc.bat
pylint-2.6 switch to 4 space indent 2 years ago
pylint-2.6.bat
pylint-2.7 switch to 4 space indent 2 years ago
pylint-2.7.bat
pylint-2.17 pylint: Add pylint 2.17 2 years ago
pylint-2.17.bat pylint: Add pylint 2.17 2 years ago
pylint_main.py Remove __future__ imports 2 years ago
pylintrc
pylintrc-2.17 pylint: Add pylint 2.17 2 years ago
python_runner.sh
rdb
rdb.bat
rdb_wrapper.py Fix multiline comment formatting 1 year ago
reclient_helper.py Override reclient timeouts on windows. 1 year 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 Fix multiline comment formatting 1 year ago
reclientreport
reclientreport.bat
reclientreport.py [reclient] Keep previous 5 builds worth of logs 2 years ago
repo repo: stop using our repo fork 1 year ago
repo_launcher [repo_launcher] Update repo_launcher to v2.45 1 year ago
roll-dep
roll-dep.bat
roll_dep.py Hide git log by default if rolling from a non-public host 1 year ago
rustfmt.py switch to 4 space indent 2 years ago
scm.py [scm] Remove unused methods 1 year ago
setup_color.py Fix multiline comment formatting 1 year ago
siso
siso.bat
siso.py siso: use stderr to print message from siso.py 1 year ago
split_cl.py split_cl: Add spaces 1 year ago
subcommand.py Fix multiline comment formatting 1 year ago
subprocess2.py Fix multiline comment formatting 1 year ago
swift-format
swift_format.py switch to 4 space indent 2 years ago
update_depot_tools remove goma CIPD package 1 year ago
update_depot_tools.bat remove goma CIPD package 1 year ago
update_depot_tools_toggle.py switch to 4 space indent 2 years ago
upload_metrics.py switch to 4 space indent 2 years ago
upload_to_google_storage.py Revert "Reland "Add support for GCS deps"" 1 year ago
upload_to_google_storage_first_class.py Fix upload gcs script output blob 1 year ago
utils.py switch to 4 space indent 2 years ago
vpython3 vpython: clear DEPOT_TOOLS_DIR before running scripts 2 years ago
vpython3.bat
watchlists.py Fix multiline comment formatting 1 year ago
weekly Remove __future__ imports 2 years ago
whitespace.txt
win32imports.py switch to 4 space indent 2 years ago
wtf Remove __future__ imports 2 years ago
yapf Always run yapf with vpython3. 1 year ago
yapf.bat

README.md

depot_tools

Tools for working with Chromium development. It requires python 3.8.

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.