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
Jamie Madill 812ac228e3 git-cl: Add diff lines of context setting.
Clients using some Clang-Format options can run into bugs when using
0 lines of context. AlignConsecutiveAssignments in particular is picky
and behaves differently with 0 lines of context.

This behaviour lead to 'git cl format' behaving differently from
'git cl format --full'. That could also break presubmit format checks.
Using >0 lines of context for 'git diff' fixes the inconsistency.

Add a setting 'DIFF_LINES_OF_CONTEXT' that can be controlled via
codereview.settings. Defaults to zero to preserve the old behaviour.
The setting allows the client to control the number of lines of context
to use when running 'git cl format'.

Bug: angleproject:4003
Change-Id: Ied2ebf23df4c41ba19bfbd5b8ddf526b56a20b31
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1864309
Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
6 years ago
bootstrap Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
fetch_configs Remove checkout_mobile_internal from {android,ios}_internal fetch configs. 6 years ago
git-templates
infra Roll recipe dependencies (trivial). 6 years ago
man python3 improvements 6 years ago
recipes Revert "depot_tools: Run recipe scripts using vpython." 6 years ago
support chromite_wrapper: add python3 support for except 7 years ago
testing_support python3 improvements 6 years ago
tests git-cl: Add diff lines of context setting. 6 years ago
third_party pylint: rework wrapper to use vpython for multiple versions 6 years ago
win_toolchain python3 improvements 6 years ago
zsh-goodies
.gitattributes git-cl: Run using vpython 6 years ago
.gitignore Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
.style.yapf
.vpython Revert "Reland "depot_tools: Add httplib2 to .vpython"" 6 years ago
.vpython3 [vpython] Roll to 98a268c6432f18aedd55d62b9621765316dc2a16 6 years ago
CROS_OWNERS CROS_OWNERS: update 6 years ago
LICENSE
OWNERS Add a COMPONENT entry to the OWNERS file. 6 years ago
PRESUBMIT.py depot_tools: Run git_cache_test and git_footers_test on windows. 6 years ago
README.gclient.md
README.git-cl.md README.git-cl.md: Remove reference to Rietveld 6 years ago
README.md Update depot_tools README cpplint section 7 years ago
annotated_gclient.py python3 improvements 6 years ago
auth.py depot-tools: Remove support for --auth-refresh-token-json. 6 years ago
autoninja python3 improvements 6 years ago
autoninja.bat [depot_tools] Cap num_cores to RAM/2GB under local jumbo builds 6 years ago
autoninja.py Handle GOMA_DISABLED more precisely 6 years ago
bb do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
bb.bat [bb] Deploy bb 7 years ago
bootstrap_python3 Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
breakpad.py
cbuildbot
chrome_set_ver
cipd do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
cipd.bat [cipd] Check CIPD client hash during updates on Windows. 7 years ago
cipd.ps1 [cipd] More careful error handling during CIPD bootstrap on Windows. 7 years ago
cipd_bin_setup.bat
cipd_bin_setup.sh Fix depot_tools errors that cause runhooks to be inoperable for Cygwin 8 years ago
cipd_client_version cipd: update to 2a121dde. 6 years ago
cipd_client_version.digests cipd: update to 2a121dde. 6 years ago
cipd_manifest.txt Release newest bb tool. 6 years ago
cipd_manifest.versions Release newest bb tool. 6 years ago
cit Revert "Reland "depot_tools: Move six to depot_tools' .vpython"" 6 years ago
cit.bat Revert "Reland "depot_tools: Move six to depot_tools' .vpython"" 6 years ago
cit.py Revert "Reland "depot_tools: Move six to depot_tools' .vpython"" 6 years ago
clang-format
clang-format.bat
clang_format.py Convert print statements to Python 3 style 7 years ago
clang_format_merge_driver
clang_format_merge_driver.bat
clang_format_merge_driver.py Convert except statements to be Python 3 compatible 7 years ago
codereview.settings
compile_single_file
compile_single_file.bat
compile_single_file.py Make it clear that compile_single_file.py doesn't support Jumbo builds 6 years ago
cpplint.bat
cpplint.py python3 improvements 6 years ago
cpplint_chromium.py
cros
cros_sdk
crosjobs Add crosjobs shim script 6 years ago
dart_format.py Convert except statements to be Python 3 compatible 7 years ago
detect_host_arch.py Improve gclient Python 3 compatibility 7 years ago
download_from_google_storage Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
download_from_google_storage.bat Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
download_from_google_storage.py download_from_google_storage: Decode string passed to re.search() 6 years ago
ensure_bootstrap Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
fetch Reland "depot_tools: Use vpython to execute fetch." 6 years ago
fetch.bat Reland "depot_tools: Use vpython to execute fetch." 6 years ago
fetch.py Reland "depot_tools: Use vpython to execute fetch." 6 years ago
fix_encoding.py fix_encoding: Decode bytestrings on Python 3 6 years ago
gclient gclient: Skip calling update_depot_tools if DEPOT_TOOLS_UPDATE is 0. 6 years ago
gclient-new-workdir.py Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
gclient.bat gclient: Skip calling update_depot_tools if DEPOT_TOOLS_UPDATE is 0. 6 years ago
gclient.py python3 improvements 6 years ago
gclient_completion.sh
gclient_eval.py python3 improvements 6 years ago
gclient_paths.py Import gclient_utils for gclient_paths CheckCallAndFilter 6 years ago
gclient_scm.py Add logging to bot_update.py and gclient_scm.py 6 years ago
gclient_utils.py python3 improvements 6 years ago
gerrit_client.py [git-cl] Lint and clean-up git-cl, test, and related modules 6 years ago
gerrit_util.py python3 improvements 6 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-nav-downstream
git-nav-upstream Make git-nav-upstream use the upstream branch name 7 years ago
git-new-branch
git-number
git-rebase-update
git-rename-branch
git-reparent-branch
git-retry
git-runhooks Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git-squash-branch
git-thaw
git-upstream-diff
git_cache.py [git_cache] Add option to break locks on populate. 6 years ago
git_cl.py git-cl: Add diff lines of context setting. 6 years ago
git_cl_completion.sh
git_common.py git-common: Explicitly specify utf-8 when encoding. 6 years ago
git_dates.py
git_drover.py git-drover: Fix tests to run on Python 3. 6 years ago
git_find_releases.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_footers.py depot_tools: Run git_footers_test on Python 3. 6 years ago
git_freezer.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_hyper_blame.py depot_tools: Run git_common_test in Python 3 6 years ago
git_map.py python3 improvements 6 years ago
git_map_branches.py python3 improvements 6 years ago
git_mark_merge_base.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_nav_downstream.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_new_branch.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_number.py git-number: Make tests run on Python 3. 6 years ago
git_rebase_update.py python3 improvements 6 years ago
git_rename_branch.py python3 improvements 6 years ago
git_reparent_branch.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_retry.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_squash_branch.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
git_upstream_diff.py Revert "depot_tools: Run Python scripts using vpython (Part 1)" 6 years ago
gn
gn.bat
gn.py Convert print statements to Python 3 style 7 years ago
gsutil.py [git-cl] Lint and clean-up git-cl, test, and related modules 6 years ago
gsutil.py.bat Add windows .bat file for gsutil.py. 7 years ago
gsutil.vpython gsutil: Bump asn1crypto version to 1.0.1 6 years ago
led do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
led.bat
luci-auth do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
luci-auth.bat [luci-auth] Add statically-linked luci-auth CLI tool. 8 years ago
lucicfg do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
lucicfg.bat [cipd] Add lucicfg tool. 7 years ago
mac_toolchain do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
metrics.README.md metrics: Collect full timestamps. 7 years ago
metrics.py depot_tools: Make some changes to make metrics collection compatible with Python 3. 6 years ago
metrics_utils.py depot_tools: Make some changes to make metrics collection compatible with Python 3. 6 years ago
my_activity.py python3 improvements 6 years ago
ninja [ninja] update ninja repository url 7 years ago
ninja-linux32 Update ninja to v1.8.2 8 years ago
ninja-linux64 Update ninja to v1.8.2 8 years ago
ninja-mac Update ninja to v1.8.2 8 years ago
ninja.exe Update ninja to v1.8.2 8 years ago
ninjalog.README.md [ninjalog] add ninjalog.README.md 7 years ago
ninjalog_uploader.py Remove unused imports in depot_tools/*.py 6 years ago
ninjalog_uploader_wrapper.py Convert print statements to Python 3 style 7 years ago
owners.py python3 improvements 6 years ago
owners_finder.py Convert print statements to Python 3 style 7 years ago
post_build_ninja_summary.py Convert print statements to Python 3 style 7 years ago
presubmit_canned_checks.py python3 improvements 6 years ago
presubmit_support.py python3 improvements 6 years ago
profile.xml
prpc do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
prpc.bat [prpc] Add pRPC CLI tool to depot_tools. 8 years ago
pylint pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint-1.5 pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint-1.6 pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint-1.7 pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint-1.8 pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint-1.9 pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint.bat pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylint_main.py pylint: rework wrapper to use vpython for multiple versions 6 years ago
pylintrc pylintrc: disable score reports 6 years ago
python_runner.sh git-cl: Run using vpython 6 years ago
repo Reland "repo: pull in updates from latest release" 6 years ago
roll-dep Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
roll-dep-svn Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
roll-dep-svn.bat Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
roll-dep.bat Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
roll_dep.py python3 improvements 6 years ago
roll_dep_svn.py Revert "depot_tools: Run Python scripts using vpython (Part 2)" 6 years ago
scm.py Remove unused imports in depot_tools/*.py 6 years ago
setup_color.py setup_color: Don't output an error if GetConsoleMode fails 6 years ago
split_cl.py python3 improvements 6 years ago
subcommand.py depot_toools: Make subcommand Python 3 compatible. 6 years ago
subprocess2.py depot_tools: Simplify subprocess2. 6 years ago
update_depot_tools Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
update_depot_tools.bat Reland "depot_tools: Bootstrap Python 3 on Linux/Mac" 6 years ago
update_depot_tools_toggle.py
upload_metrics.py Revert "Reland "depot_tools: Move six to depot_tools' .vpython"" 6 years ago
upload_to_google_storage.py Make upload_to_google_storage.py and tests work with Python 3. 6 years ago
vpython do not hardcode the path to bash by using the #!/usr/bin/env bash shebang 7 years ago
vpython.bat
vpython3 [vpython] Roll to 98a268c6432f18aedd55d62b9621765316dc2a16 6 years ago
vpython3.bat [vpython] Roll to 98a268c6432f18aedd55d62b9621765316dc2a16 6 years ago
watchlists.py Trivial: Removing gendered pronouns from watchlists.py. 6 years ago
weekly Convert print statements to Python 3 style 7 years ago
wtf Convert print statements to Python 3 style 7 years ago
yapf Update yapf version 0.22 -> 0.24 7 years ago
yapf.bat Fix git cl format --python on windows 7 years ago

README.md

depot_tools

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

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.

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.