`git cl split` claims to have built-in auto-resume capabilities, but the nondeterminism in its splitting algorithm means they don't work in practice. Now that we have the ability to load splittings from files, we can ensure the user is using the same splitting as before, and resume safely. This CL does two things: - It checks that any existing split branches match the splitting we're about to upload, and complains if they don't match. This relies on the fact that our branch names are unique and deterministic. - It changes the auto-resume message to mention that --from-file is required, and includes the relevant filename. This requires tracking that filename from earlier in the program. Bug: 389069356 Change-Id: Ic1d8964e96193ca93e05a9a39e286b84ffb61b06 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/6280953 Commit-Queue: Devon Loehr <dloehr@google.com> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org> |
2 months ago | |
---|---|---|
bootstrap | 3 months ago | |
fetch_configs | 6 months ago | |
hooks | 2 years ago | |
infra | 2 months ago | |
infra_lib/telemetry | 7 months ago | |
man | 2 months ago | |
metadata | 2 months ago | |
python-bin | 2 years ago | |
python2-bin | 2 years ago | |
recipes | 2 months ago | |
testing_support | 7 months ago | |
tests | 2 months ago | |
third_party | 2 months ago | |
win_toolchain | 6 months ago | |
zsh-goodies | ||
.cipd_impl.ps1 | 5 months ago | |
.flake8 | 2 years ago | |
.git-blame-ignore-revs | 7 months ago | |
.gitattributes | 8 months ago | |
.gitignore | 8 months ago | |
.isort.cfg | 3 years ago | |
.style.yapf | 2 years ago | |
.vpython3 | 8 months ago | |
BUILD_OWNERS | 2 years ago | |
CROS_OWNERS | 3 years ago | |
DIR_METADATA | ||
LICENSE | ||
LUCI_OWNERS | 2 years ago | |
OWNERS | 4 months ago | |
PRESUBMIT.py | 2 months ago | |
README.gclient.md | ||
README.git-cl.md | ||
README.md | 3 months ago | |
RECLIENT_OWNERS | 2 years ago | |
WATCHLISTS | 2 years ago | |
android_build_server_helper.py | 2 months ago | |
auth.py | 3 months ago | |
autoninja | 8 months ago | |
autoninja.bat | 8 months ago | |
autoninja.py | 2 months ago | |
bazel | 2 years ago | |
bazel.py | 2 years ago | |
bb | 9 months ago | |
bb.bat | ||
black | 3 years ago | |
bootstrap_python3 | 2 years ago | |
breakpad.py | 2 years ago | |
build_telemetry | 10 months ago | |
build_telemetry.bat | 10 months ago | |
build_telemetry.py | 8 months ago | |
cbuildbot | ||
cipd | 8 months ago | |
cipd.bat | 2 years ago | |
cipd_bin_setup.bat | 3 years ago | |
cipd_bin_setup.sh | 9 months ago | |
cipd_client_version | 8 months ago | |
cipd_client_version.digests | 8 months ago | |
cipd_manifest.txt | 2 months ago | |
cipd_manifest.versions | 2 months ago | |
cipd_manifest_cros_python2.txt | 1 year ago | |
cipd_manifest_cros_python2.versions | 2 years ago | |
clang-format | ||
clang-format.bat | ||
clang_format.py | 11 months ago | |
codereview.settings | ||
compile_single_file | 1 year ago | |
compile_single_file.bat | 1 year ago | |
compile_single_file.py | 1 year ago | |
cpplint.bat | 3 years ago | |
cpplint.py | 7 months ago | |
cpplint_chromium.py | 2 years ago | |
cros | 4 months ago | |
cros_python2.vpython | 2 years ago | |
cros_sdk | ||
detect_host_arch.py | 1 year ago | |
dirmd | 9 months ago | |
dirmd.bat | ||
download_from_google_storage | ||
download_from_google_storage.bat | 3 years ago | |
download_from_google_storage.py | 3 months ago | |
ensure_bootstrap | 4 months ago | |
fetch | 2 years ago | |
fetch.bat | 2 years ago | |
fetch.py | 11 months ago | |
gclient | 2 years ago | |
gclient-new-workdir.py | 11 months ago | |
gclient.bat | 2 years ago | |
gclient.py | 4 months ago | |
gclient_completion.sh | ||
gclient_eval.py | 7 months ago | |
gclient_paths.py | 10 months ago | |
gclient_scm.py | 4 months ago | |
gclient_utils.py | 4 months ago | |
gerrit | 2 years ago | |
gerrit_client.py | 4 months ago | |
gerrit_util.py | 3 months ago | |
git-cache | ||
git-cl | ||
git-credential-luci | 9 months ago | |
git-credential-luci.bat | 11 months ago | |
git-crrev-parse | ||
git-drover | ||
git-find-releases | ||
git-footers | ||
git-freeze | ||
git-gs | 1 year ago | |
git-hyper-blame | ||
git-map | ||
git-map-branches | ||
git-mark-merge-base | ||
git-nav-downstream | ||
git-nav-upstream | 12 months ago | |
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 | 10 months ago | |
git-thaw | ||
git-upstream-diff | ||
git_auth.py | 3 months ago | |
git_cache.py | 12 months ago | |
git_cl.py | 2 months ago | |
git_cl_completion.sh | ||
git_common.py | 3 months ago | |
git_completion.sh | 2 years ago | |
git_dates.py | 1 year ago | |
git_find_releases.py | 12 months ago | |
git_footers.py | 5 months ago | |
git_freezer.py | 12 months ago | |
git_hyper_blame.py | 7 months ago | |
git_map.py | 12 months ago | |
git_map_branches.py | 12 months ago | |
git_mark_merge_base.py | 12 months ago | |
git_nav_downstream.py | 12 months ago | |
git_new_branch.py | 7 months ago | |
git_number.py | 9 months ago | |
git_rebase_update.py | 2 months ago | |
git_rename_branch.py | 12 months ago | |
git_reparent_branch.py | 12 months ago | |
git_retry.py | 1 year ago | |
git_squash_branch.py | 3 months ago | |
git_squash_branch_tree.py | 3 months ago | |
git_upstream_diff.py | 12 months ago | |
gn | ||
gn.bat | ||
gn.py | 1 year ago | |
gn_helper.py | 3 months ago | |
google-java-format | 12 months ago | |
google-java-format.bat | 12 months ago | |
google_java_format.py | 11 months ago | |
gsutil.py | 1 year ago | |
gsutil.py.bat | 3 years ago | |
gsutil.vpython3 | 3 years ago | |
isort | 2 years ago | |
led | 9 months ago | |
led.bat | ||
lockfile.py | 1 year ago | |
luci-auth | 9 months ago | |
luci-auth.bat | ||
lucicfg | 9 months ago | |
lucicfg.bat | ||
mac_toolchain | 9 months ago | |
metrics-xml-format | 5 months ago | |
metrics.README.md | 9 months ago | |
metrics.py | 9 months ago | |
metrics_utils.py | 9 months ago | |
metrics_xml_format.py | 2 months ago | |
my_activity.py | 5 months ago | |
newauth.py | 10 months ago | |
ninja | 2 years ago | |
ninja.bat | 2 years ago | |
ninja.py | 3 months ago | |
ninjalog_uploader.py | 7 months ago | |
owners_client.py | 1 year ago | |
owners_finder.py | 2 years ago | |
pinpoint | 9 months ago | |
pinpoint.bat | ||
post_build_ninja_summary.py | 3 months ago | |
presubmit_canned_checks.py | 3 months ago | |
presubmit_diff.py | 3 months ago | |
presubmit_support.py | 2 months ago | |
prpc | 9 months ago | |
prpc.bat | ||
pylint-2.6 | 2 years ago | |
pylint-2.6.bat | ||
pylint-2.7 | 2 years ago | |
pylint-2.7.bat | ||
pylint-2.17 | 1 year ago | |
pylint-2.17.bat | 1 year ago | |
pylint-3.2 | 4 months ago | |
pylint-3.2.bat | 4 months ago | |
pylint_main.py | 4 months ago | |
pylintrc-2.6 | 4 months ago | |
pylintrc-2.7 | 4 months ago | |
pylintrc-2.17 | 4 months ago | |
pylintrc-3.2 | 4 months ago | |
python_runner.sh | 2 years ago | |
rdb | 9 months ago | |
rdb.bat | ||
rdb_wrapper.py | 1 year ago | |
reclient_helper.py | 5 months ago | |
reclientreport | 2 years ago | |
reclientreport.bat | 2 years ago | |
reclientreport.py | 2 years ago | |
repo | 11 months ago | |
repo_launcher | 4 months ago | |
roll-dep | 2 years ago | |
roll-dep.bat | 2 years ago | |
roll_dep.py | 11 months ago | |
roll_downstream_gcs_deps.py | 8 months ago | |
rustfmt.py | 2 years ago | |
scm.py | 7 months ago | |
setup_color.py | 1 year ago | |
siso | 2 years ago | |
siso.bat | 2 years ago | |
siso.py | 5 months ago | |
split_cl.py | 2 months ago | |
subcommand.py | 1 year ago | |
subprocess2.py | 1 year ago | |
swift-format | 3 years ago | |
swift_format.py | 2 years ago | |
update_depot_tools | 3 months ago | |
update_depot_tools.bat | 3 months ago | |
update_depot_tools_toggle.py | 2 years ago | |
upload_metrics.py | 2 years ago | |
upload_to_google_storage.py | 6 months ago | |
upload_to_google_storage_first_class.py | 11 months ago | |
utils.py | 11 months ago | |
vpython3 | 8 months ago | |
vpython3.bat | 3 years ago | |
watchlists.py | 1 year ago | |
whitespace.txt | ||
win32imports.py | 2 years ago | |
yapf | 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
: Agclient
wrapper to checkout a project. Usefetch --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. Usegclient help
for more details and README.gclient.md.git cl
: A code review tool to interact with Rietveld or Gerrit. Usegit 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 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.