commit | 39d870e1f07f8908701d160b5445782cdd3f1541 | [log] [tgz] |
---|---|---|
author | Sylvain Defresne <sdefresne@chromium.org> | Thu Oct 15 16:27:45 2020 +0000 |
committer | LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> | Thu Oct 15 16:27:45 2020 +0000 |
tree | 53c9d87808a8686a8ba876ea413efec6bce35afe | |
parent | 5d099fcb489d5e1199a0f726fbe1e370468a5cbd [diff] |
Fix `git map-branches` when branch is named after a file/directory If there is a branch named after a file in the repository root, the command `git rev-list --count $branch ^$base` is ambiguous. This is because `git` does not know whether $branch needs to be parsed as a revision or a filename. Adding a trailing `--` parameter to the command-line resolves this ambiguity since when present, everything before the `--` cannot be a filename and everything after `--` has to one. From git documentation: Paths may need to be prefixed with -- to separate them from options or the revision range, when confusion arises. Bug: none Change-Id: Ieb10aa8701e12fc3c88d5f75ff624f61ee8d8aaa Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2475773 Reviewed-by: Josip Sokcevic <sokcevic@google.com> Commit-Queue: Sylvain Defresne <sdefresne@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.