| commit | fe6a359a803f55829ede3666215d080f6775f173 | [log] [tgz] |
|---|---|---|
| author | Tomasz Śniatowski <tomasz.sniatowsk@xperi.com> | Tue Mar 12 07:02:53 2024 |
| committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Mar 12 07:02:53 2024 |
| tree | c25b86024e3491016e8a03ba94842d80d9cd31c4 | |
| parent | 6ec5a9ab6086ec6f043cd7aab1f1744eb58b17f7 [diff] |
Fix git cl format --diff --dry-run for Java files A recent change added --diff support for Java files in git cl format, but unfortunately it broke the behavior when both --dry-run and --diff are passed, and made git cl format indicate that all changed files need to be reformatted. Fix so that --diff overrides --dry-run when running google-java-format, as passing --dry-run makes the formatter only output file names which then confused the diff creation code. This makes behavior for Java in line with C++ where --dry-run doesn't change much if --diff is used. Change-Id: I7f8eecb13064a0046935489e6c5cf3af566f7f56 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5357818 Reviewed-by: Gavin Mak <gavinmak@google.com> Commit-Queue: Tomasz Śniatowski <tomasz.sniatowski@xperi.com>
Tools for working with Chromium development. It requires python 3.8.
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.
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.
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.
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.