commit | 40bacee96a94600ad2179d69a8025469d119960f | [log] [tgz] |
---|---|---|
author | John Budorick <jbudorick@chromium.org> | Tue Jul 17 01:50:48 2018 |
committer | Commit Bot <commit-bot@chromium.org> | Tue Jul 17 01:50:48 2018 |
tree | c4c26fc3a43501aebd63b8d9e07642964d40758b | |
parent | 54edfa4e534d10fe2029685b10dd0a302b5fc82e [diff] |
Revert "gclient_scm: Use cherry-picking instead of rebasing." This reverts commit fb78b368de1bf462197e376616ffdde5fe65f066. Reason for revert: https://bugs.chromium.org/p/chromium/issues/detail?id=864301 Original change's description: > gclient_scm: Use cherry-picking instead of rebasing. > > Currently gclient might include extra commits when applying patches. > For example, in this case we checkout |patch| and rebase it on top of |base|, > thus including an |extra commit| that we shouldn't. > > o master > | > . o patch > |/ > o extra commit > | > o base (what gclient synced src at) > > This change uses the merge-base between |patch| and |master| to cherry-pick only > the changes belonging to the patch. > > Bug: 850812 > Change-Id: I138192f96bc62b1bb19b0e1ad952c8f8c67631c4 > Reviewed-on: https://chromium-review.googlesource.com/1137052 > Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> > Reviewed-by: Aaron Gable <agable@chromium.org> TBR=agable@chromium.org,ehmaldonado@chromium.org Change-Id: I57299e60e58eac5656dc88937c622d0d14c4ba37 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: 850812 Reviewed-on: https://chromium-review.googlesource.com/1139553 Reviewed-by: John Budorick <jbudorick@chromium.org> Commit-Queue: John Budorick <jbudorick@chromium.org>
Tools for working with Chromium development. It requires python 2.7.
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.
To update cpplint.py, please submit the change upstream first at https://github.com/google/styleguide/tree/gh-pages/cpplint then copy it down.