You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
The failures were caused by: 1 - When one change (call it #2) has been uploaded on top of another (#1), and (#1) has already landed, git cherry-pick complains that the range '<merge-base>..<change #2>' contains empty commits, since the contents of (#1) are already present in the tree. 2 - We did not abort the cherry-picking when 'git cherry-pick' failed, so a failure made all further CLs in that bot fail. This CL fixes it and prevents further regressions. 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> Bug: 850812 Change-Id: I83f38d0a258df3f5cd89e277f0d648badff29a22 Reviewed-on: https://chromium-review.googlesource.com/1139554 Reviewed-by: Aaron Gable <agable@chromium.org> Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org> |
7 years ago | |
|---|---|---|
| bootstrap/win | 8 years ago | |
| fetch_configs | 8 years ago | |
| git-templates | ||
| infra | 7 years ago | |
| man | 7 years ago | |
| recipes | 7 years ago | |
| support | 7 years ago | |
| testing_support | 7 years ago | |
| tests | 7 years ago | |
| third_party | 7 years ago | |
| win_toolchain | 7 years ago | |
| zsh-goodies | ||
| .gitattributes | 7 years ago | |
| .gitignore | 7 years ago | |
| .style.yapf | ||
| LICENSE | ||
| OWNERS | 8 years ago | |
| PRESUBMIT.py | 7 years ago | |
| README.gclient.md | 9 years ago | |
| README.git-cl.md | 9 years ago | |
| README.md | 7 years ago | |
| README.testing | ||
| WATCHLISTS | 8 years ago | |
| annotated_gclient.py | ||
| appengine_mapper.py | 9 years ago | |
| auth.py | 8 years ago | |
| autoninja | 8 years ago | |
| autoninja.bat | 8 years ago | |
| autoninja.py | 8 years ago | |
| breakpad.py | ||
| buildbucket.py | 7 years ago | |
| cbuildbot | ||
| checkout.py | 8 years ago | |
| chrome_set_ver | ||
| cipd | 7 years ago | |
| cipd.bat | 8 years ago | |
| cipd.ps1 | 8 years ago | |
| cipd_bin_setup.bat | 8 years ago | |
| cipd_bin_setup.sh | 8 years ago | |
| cipd_client_version | 7 years ago | |
| cipd_manifest.txt | 7 years ago | |
| cit | ||
| cit.bat | 9 years ago | |
| cit.py | 8 years ago | |
| clang-format | ||
| clang-format.bat | 9 years ago | |
| clang_format.py | 9 years ago | |
| clang_format_merge_driver | 9 years ago | |
| clang_format_merge_driver.bat | 9 years ago | |
| clang_format_merge_driver.py | 9 years ago | |
| codereview.settings | 9 years ago | |
| compile_single_file | 8 years ago | |
| compile_single_file.bat | 8 years ago | |
| compile_single_file.py | 8 years ago | |
| cpplint.bat | 9 years ago | |
| cpplint.py | 7 years ago | |
| cpplint_chromium.py | ||
| cros | ||
| cros_sdk | ||
| dart_format.py | ||
| depot-tools-auth | ||
| depot-tools-auth.bat | 9 years ago | |
| depot-tools-auth.py | ||
| detect_host_arch.py | 8 years ago | |
| download_from_google_storage | ||
| download_from_google_storage.bat | 9 years ago | |
| download_from_google_storage.py | 7 years ago | |
| ensure_bootstrap | 8 years ago | |
| fetch | ||
| fetch.bat | 9 years ago | |
| fetch.py | 8 years ago | |
| fix_encoding.py | 9 years ago | |
| gclient | ||
| gclient-new-workdir.py | 8 years ago | |
| gclient.bat | 9 years ago | |
| gclient.py | 7 years ago | |
| gclient_completion.sh | ||
| gclient_eval.py | 7 years ago | |
| gclient_scm.py | 7 years ago | |
| gclient_utils.py | 8 years ago | |
| gerrit_client.py | 8 years ago | |
| gerrit_util.py | 7 years ago | |
| git-cache | ||
| git-cl | ||
| git-crrev-parse | 8 years ago | |
| git-crsync | ||
| git-drover | ||
| git-find-releases | ||
| git-footers | ||
| git-freeze | ||
| git-gs | 9 years ago | |
| git-hyper-blame | ||
| git-map | ||
| git-map-branches | ||
| git-mark-merge-base | ||
| git-nav-downstream | ||
| git-nav-upstream | ||
| git-new-branch | ||
| git-number | ||
| git-rebase-update | ||
| git-rename-branch | ||
| git-reparent-branch | ||
| git-retry | ||
| git-runhooks | ||
| git-squash-branch | ||
| git-thaw | ||
| git-upstream-diff | ||
| git_cache.py | 7 years ago | |
| git_cl.py | 7 years ago | |
| git_cl_completion.sh | 9 years ago | |
| git_common.py | 8 years ago | |
| git_dates.py | ||
| git_drover.py | 8 years ago | |
| git_find_releases.py | ||
| git_footers.py | 8 years ago | |
| git_freezer.py | ||
| git_hyper_blame.py | 8 years ago | |
| git_map.py | 9 years ago | |
| git_map_branches.py | 8 years ago | |
| git_mark_merge_base.py | ||
| git_nav_downstream.py | 7 years ago | |
| git_new_branch.py | 8 years ago | |
| git_number.py | 9 years ago | |
| git_rebase_update.py | 8 years ago | |
| git_rename_branch.py | ||
| git_reparent_branch.py | ||
| git_retry.py | 9 years ago | |
| git_squash_branch.py | 9 years ago | |
| git_upstream_diff.py | 7 years ago | |
| gn | ||
| gn.bat | 9 years ago | |
| gn.py | 7 years ago | |
| gsutil.py | 8 years ago | |
| gsutil.vpython | 8 years ago | |
| led | 8 years ago | |
| led.bat | 8 years ago | |
| luci-auth | 8 years ago | |
| luci-auth.bat | 8 years ago | |
| mac_toolchain | 8 years ago | |
| metrics.README.md | 7 years ago | |
| metrics.py | 7 years ago | |
| metrics_utils.py | 7 years ago | |
| my_activity.py | 7 years ago | |
| my_reviews.py | 8 years ago | |
| ninja | 8 years ago | |
| ninja-linux32 | 8 years ago | |
| ninja-linux64 | 8 years ago | |
| ninja-mac | 8 years ago | |
| ninja.exe | 8 years ago | |
| owners.py | 8 years ago | |
| owners_finder.py | 8 years ago | |
| patch.py | 8 years ago | |
| post_build_ninja_summary.py | 8 years ago | |
| presubmit_canned_checks.py | 7 years ago | |
| presubmit_support.py | 7 years ago | |
| profile.xml | ||
| prpc | 8 years ago | |
| prpc.bat | 8 years ago | |
| pylint | ||
| pylint.py | ||
| pylintrc | 9 years ago | |
| python_runner.sh | ||
| repo | 9 years ago | |
| rietveld.py | 8 years ago | |
| roll-dep | ||
| roll-dep-svn | 9 years ago | |
| roll-dep-svn.bat | 9 years ago | |
| roll-dep.bat | 9 years ago | |
| roll_dep.py | 8 years ago | |
| roll_dep_svn.py | 8 years ago | |
| scm.py | 7 years ago | |
| setup_color.py | 9 years ago | |
| split_cl.py | 8 years ago | |
| subcommand.py | 9 years ago | |
| subprocess2.py | 9 years ago | |
| update_depot_tools | 8 years ago | |
| update_depot_tools.bat | 8 years ago | |
| update_depot_tools_toggle.py | 9 years ago | |
| upload_metrics.py | 7 years ago | |
| upload_to_google_storage.py | 8 years ago | |
| vpython | 8 years ago | |
| vpython.bat | 8 years ago | |
| watchlists.py | 8 years ago | |
| weekly | ||
| wtf | ||
| yapf | 7 years ago | |
| yapf.bat | 7 years ago | |
README.md
depot_tools
Tools for working with Chromium development. It requires python 2.7.
Tools
The most important tools are:
fetch: Agclientwrapper to checkout a project. Usefetch --helpfor 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. Usegclient helpfor more details and README.gclient.md.git cl: A code review tool to interact with Rietveld or Gerrit. Usegit cl helpfor 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.
Updating
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.
Contributing
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.
cpplint.py
To update cpplint.py, please submit the change upstream first at https://github.com/google/styleguide/tree/gh-pages/cpplint then copy it down.