| commit | 367c6f720da20e9eb848ce86039138ddca942736 | [log] [tgz] |
|---|---|---|
| author | Patrick Monette <[email protected]> | Tue Jul 02 15:03:58 2024 |
| committer | LUCI CQ <[email protected]> | Tue Jul 02 15:03:58 2024 |
| tree | b9d7a90ee6028562573e23fb9256f923acda7dd0 | |
| parent | 5ab4dcc7bf086ec5fe29da097e1c82347c4f5035 [diff] |
Add git squash-branch-tree This script allows squashing a branch and all of its downstream branches in one command. This is useful for squashing stacked branches that have a lot of commits each just before using `git rebase-update`, as this is highly likely to run into a lot of rebase conflicts, repeatedly. This should only be used if the user is okay with losing their git commit history. Change-Id: Id28a941d898def73f785d791499c7ee0784e0136 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5659262 Reviewed-by: Gavin Mak <[email protected]> Reviewed-by: Josip Sokcevic <[email protected]> Commit-Queue: Patrick Monette <[email protected]>
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 [email protected],[email protected] --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.