commit | 594fd33247ce8effe47aef46aa56b92144e218db | [log] [tgz] |
---|---|---|
author | Alan Cutter <alancutter@chromium.org> | Tue Jul 21 23:55:27 2020 +0000 |
committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Tue Jul 21 23:55:27 2020 +0000 |
tree | 78b31da5630982e396379cc272b7c83d7522f42c | |
parent | 720e010ba1b2fb75f5007b8b2bb139da91bce3a9 [diff] |
Decode "git cl" error messages to avoid printing Python bytes We were not decoding the stdout bytes before printing them when git commands returned an error status. This CL fixes that. Before: Command "git cherry-pick FETCH_HEAD" failed. b'Auto-merging chrome/browser/ui/web_applications/app_browser_controller.cc\nAuto-merging chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc\nCONFLICT (content): Merge conflict in chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc\nAuto-merging chrome/browser/ui/views/frame/browser_non_client_frame_view.cc\nAuto-merging chrome/browser/ui/views/frame/browser_frame.h\nAuto-merging chrome/browser/ui/views/frame/browser_frame.cc\n' After: Command "git cherry-pick FETCH_HEAD" failed. Auto-merging chrome/browser/ui/web_applications/app_browser_controller.cc Auto-merging chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc CONFLICT (content): Merge conflict in chrome/browser/ui/views/frame/opaque_browser_frame_view_browsertest.cc Auto-merging chrome/browser/ui/views/frame/browser_non_client_frame_view.cc Auto-merging chrome/browser/ui/views/frame/browser_frame.h Auto-merging chrome/browser/ui/views/frame/browser_frame.cc Change-Id: I162e666ca9f3a70259e6178d2e6d3b72f15b1f7b Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2310016 Auto-Submit: Alan Cutter <alancutter@chromium.org> Reviewed-by: Edward Lesmes <ehmaldonado@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
Tools for working with Chromium development. It requires python 2.7 or 3.8 for python 3 support.
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
.
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.