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
Mason Freed 58625e82c6 Remove "attempt to squash" behavior from `git rebase-update`
In common workflows, this step only succeeds ~5% of the time, and
in the other 95% of cases, simply adds ~30 seconds of wasted time
to the execution time of `rebase-update`. Therefore, this CL removes
the automated functionality, and leaves squashing as a manual option
to the user.

Fixed: 40264739
Bug: 40390274
Change-Id: Ib2a3ffe4b0e5d0b74323a2a0d34ab0e1b7fafb08
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6104282
Auto-Submit: Mason Freed <masonf@chromium.org>
Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Commit-Queue: Josip Sokcevic <sokcevic@chromium.org>
4 days ago
bootstrap
fetch_configs
hooks
infra
infra_lib/telemetry
man
metadata
python-bin
python2-bin
recipes
testing_support
tests
third_party
win_toolchain
zsh-goodies
.cipd_impl.ps1
.flake8
.git-blame-ignore-revs
.gitattributes
.gitignore
.isort.cfg
.style.yapf
.vpython3
BUILD_OWNERS
CROS_OWNERS
DIR_METADATA
LICENSE
LUCI_OWNERS
OWNERS
PRESUBMIT.py
README.gclient.md
README.git-cl.md
README.md
RECLIENT_OWNERS
WATCHLISTS
android_build_server_helper.py
auth.py
autoninja
autoninja.bat
autoninja.py
bazel
bazel.py
bb
bb.bat
black
bootstrap_python3
breakpad.py
build_telemetry
build_telemetry.bat
build_telemetry.py
cbuildbot
cipd
cipd.bat
cipd_bin_setup.bat
cipd_bin_setup.sh
cipd_client_version
cipd_client_version.digests
cipd_manifest.txt
cipd_manifest.versions
cipd_manifest_cros_python2.txt
cipd_manifest_cros_python2.versions
clang-format
clang-format.bat
clang_format.py
codereview.settings
compile_single_file
compile_single_file.bat
compile_single_file.py
cpplint.bat
cpplint.py
cpplint_chromium.py
cros
cros_python2.vpython
cros_sdk
detect_host_arch.py
dirmd
dirmd.bat
download_from_google_storage
download_from_google_storage.bat
download_from_google_storage.py
ensure_bootstrap
fetch
fetch.bat
fetch.py
gclient
gclient-new-workdir.py
gclient.bat
gclient.py
gclient_completion.sh
gclient_eval.py
gclient_paths.py
gclient_scm.py
gclient_utils.py
gerrit
gerrit_client.py
gerrit_util.py
git-cache
git-cl
git-credential-luci
git-credential-luci.bat
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-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-squash-branch-tree
git-thaw
git-upstream-diff
git_auth.py
git_cache.py
git_cl.py
git_cl_completion.sh
git_common.py
git_completion.sh
git_dates.py
git_find_releases.py
git_footers.py
git_freezer.py
git_hyper_blame.py
git_map.py
git_map_branches.py
git_mark_merge_base.py
git_nav_downstream.py
git_new_branch.py
git_number.py
git_rebase_update.py
git_rename_branch.py
git_reparent_branch.py
git_retry.py
git_squash_branch.py
git_squash_branch_tree.py
git_upstream_diff.py
gn
gn.bat
gn.py
gn_helper.py
google-java-format
google-java-format.bat
google_java_format.py
gsutil.py
gsutil.py.bat
gsutil.vpython3
isort
led
led.bat
lockfile.py
luci-auth
luci-auth.bat
lucicfg
lucicfg.bat
mac_toolchain
metrics-xml-format
metrics.README.md
metrics.py
metrics_utils.py
metrics_xml_format.py
my_activity.py
newauth.py
ninja
ninja.bat
ninja.py
ninjalog_uploader.py
owners_client.py
owners_finder.py
pinpoint
pinpoint.bat
post_build_ninja_summary.py
presubmit_canned_checks.py
presubmit_diff.py
presubmit_support.py
prpc
prpc.bat
pylint-2.6
pylint-2.6.bat
pylint-2.7
pylint-2.7.bat
pylint-2.17
pylint-2.17.bat
pylint_main.py
pylintrc
pylintrc-2.17
python_runner.sh
rdb
rdb.bat
rdb_wrapper.py
reclient_helper.py
reclientreport
reclientreport.bat
reclientreport.py
repo
repo_launcher
roll-dep
roll-dep.bat
roll_dep.py
roll_downstream_gcs_deps.py
rustfmt.py
scm.py
setup_color.py
siso
siso.bat
siso.py
split_cl.py
subcommand.py
subprocess2.py
swift-format
swift_format.py
update_depot_tools
update_depot_tools.bat
update_depot_tools_toggle.py
upload_metrics.py
upload_to_google_storage.py
upload_to_google_storage_first_class.py
utils.py
vpython3
vpython3.bat
watchlists.py
whitespace.txt
win32imports.py
yapf
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.