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.
After switching to a pure git workflow, most of the patchset we upload to rietveld have git metadata. Apparently, however, the scripts here in depot tools, which are used by the CQ and trybots, are ignoring that and applying patches without taking advantage of git metadata. In practice this causes people to rebase and reupload patches more than necessary, even in the cases when it could be handled automatically by means of a three way merge. This change updates the GitCheckout class of depot_tools to use that. BUG=416003 Review URL: https://codereview.chromium.org/577203002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292087 0039d316-1c4b-4281-b951-d872f2087c98 |
11 years ago | |
---|---|---|
bootstrap | 11 years ago | |
git-templates | 12 years ago | |
git_utils | 12 years ago | |
man | 11 years ago | |
recipes | 11 years ago | |
support | 12 years ago | |
testing_support | 11 years ago | |
tests | 11 years ago | |
third_party | 11 years ago | |
win_toolchain | 11 years ago | |
zsh-goodies | ||
.gitignore | 11 years ago | |
LICENSE | ||
OWNERS | 11 years ago | |
PRESUBMIT.py | 11 years ago | |
README | ||
README.codereview | ||
README.gclient | ||
README.git-cl | ||
README.testing | ||
WATCHLISTS | 11 years ago | |
annotated_gclient.py | 11 years ago | |
apply_issue | ||
apply_issue.bat | 11 years ago | |
apply_issue.py | 11 years ago | |
breakpad.py | ||
cbuildbot | ||
checkout.py | 11 years ago | |
chrome-update-create-task.bat | ||
chrome-update.bat | ||
chrome-update.py | ||
chrome_set_ver | ||
clang-format | 11 years ago | |
clang-format.bat | 11 years ago | |
clang_format.py | 11 years ago | |
codereview.settings | 11 years ago | |
commit_queue.py | 12 years ago | |
cpplint.bat | ||
cpplint.py | 11 years ago | |
cpplint_chromium.py | ||
create-chromium-git-src | ||
create-ntfs-junction.c | ||
create-ntfs-junction.exe | ||
cros | ||
cros_sdk | ||
download_from_google_storage | 12 years ago | |
download_from_google_storage.bat | 12 years ago | |
download_from_google_storage.py | 11 years ago | |
drover | ||
drover.bat | ||
drover.py | 12 years ago | |
fetch | 11 years ago | |
fetch.bat | 11 years ago | |
fetch.py | 11 years ago | |
fix_encoding.py | ||
gcl | ||
gcl.bat | ||
gcl.py | 11 years ago | |
gclient | 11 years ago | |
gclient-new-workdir.py | 11 years ago | |
gclient.bat | 11 years ago | |
gclient.py | 11 years ago | |
gclient_completion.sh | 11 years ago | |
gclient_scm.py | 11 years ago | |
gclient_utils.py | 11 years ago | |
gerrit_util.py | 11 years ago | |
git-cache | 11 years ago | |
git-cherry-pick-upload | 11 years ago | |
git-cl | 11 years ago | |
git-cl-upload-hook | ||
git-crsync | 11 years ago | |
git-crup | 11 years ago | |
git-footers | 11 years ago | |
git-freeze | 11 years ago | |
git-gs | 11 years ago | |
git-lkgr | 11 years ago | |
git-map | 11 years ago | |
git-map-branches | 11 years ago | |
git-mark-merge-base | 11 years ago | |
git-nav-downstream | 11 years ago | |
git-nav-upstream | 11 years ago | |
git-new-branch | 11 years ago | |
git-number | 11 years ago | |
git-rebase-update | 11 years ago | |
git-rename-branch | 11 years ago | |
git-reparent-branch | 11 years ago | |
git-retry | 11 years ago | |
git-runhooks | 11 years ago | |
git-squash-branch | 11 years ago | |
git-thaw | 11 years ago | |
git-try | 11 years ago | |
git-upstream-diff | 11 years ago | |
git_cache.py | 11 years ago | |
git_cherry_pick_upload.py | 11 years ago | |
git_cl.py | 11 years ago | |
git_common.py | 11 years ago | |
git_footers.py | 11 years ago | |
git_freezer.py | 11 years ago | |
git_map.py | 11 years ago | |
git_map_branches.py | 11 years ago | |
git_mark_merge_base.py | 11 years ago | |
git_nav_downstream.py | 11 years ago | |
git_new_branch.py | 11 years ago | |
git_number.py | 11 years ago | |
git_rebase_update.py | 11 years ago | |
git_rename_branch.py | 11 years ago | |
git_reparent_branch.py | 11 years ago | |
git_retry.py | 11 years ago | |
git_squash_branch.py | 11 years ago | |
git_try.py | ||
git_upstream_diff.py | 11 years ago | |
gn | 11 years ago | |
gn.bat | 11 years ago | |
gn.py | 11 years ago | |
hammer | ||
hammer.bat | ||
my_activity.py | 11 years ago | |
my_reviews.py | 11 years ago | |
ninja | 11 years ago | |
ninja-linux32 | 11 years ago | |
ninja-linux64 | 11 years ago | |
ninja-mac | 11 years ago | |
ninja.exe | 11 years ago | |
owners.py | 12 years ago | |
owners_finder.py | 12 years ago | |
patch.py | 12 years ago | |
presubmit_canned_checks.py | 11 years ago | |
presubmit_support.py | 11 years ago | |
profile.xml | ||
pylint | 11 years ago | |
pylint.py | ||
pylintrc | ||
python_git_runner.sh | 11 years ago | |
repo | 11 years ago | |
rietveld.py | 11 years ago | |
roll-dep | 11 years ago | |
roll-dep.bat | 11 years ago | |
roll_dep.py | 11 years ago | |
scm.py | 11 years ago | |
subcommand.py | 11 years ago | |
subprocess2.py | 11 years ago | |
trychange.py | 11 years ago | |
update_depot_tools | 11 years ago | |
update_depot_tools.bat | 11 years ago | |
upload_to_google_storage.py | 11 years ago | |
watchlists.py | ||
weekly | ||
wtf |
README
This package contains tools for working with Chromium development. The "gclient" wrapper knows how to keep this repository updated to the latest versions of these tools as found at: http://src.chromium.org/svn/trunk/tools/depot_tools This package contains: chrome-update-create-task.bat Creates a scheduled task to do an automatic local chromium build every day. cpplint.py A copy of our linting tool which enforces Google style. Fetched from http://google-styleguide.googlecode.com/svn/trunk/cpplint/cpplint.py gcl A tool for uploading and managing code reviews on the Chromium project, using the Rietveld code review tool. More info at: http://code.google.com/p/rietveld/ gclient A script for managing a workspace with modular dependencies that are each checked out independently from different repositories. More info at: http://code.google.com/p/gclient/ hammer A wrapper script for building Chromium with the SCons software construction tool. More info at: http://www.scons.org/ Note: svn and python will be installed automatically if not accessible (on Windows only). To update this distribution manually, run .\update_depot_tools.bat on Windows, or ./update_depot_tools on Linux or Mac. To disable automatic updating, set the environment variable DEPOT_TOOLS_UPDATE=0