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.
 
 
 
 
Go to file
Aaron Gable 9387b4f0be Make gerrit 'git cl patch' use hard reset by default
This CL changes the way that "git cl patch" behaves for Gerrit changes.

Previously, git-cl-patch behaved just like it did for Rietveld:
make sure you're on a branch, download the diff, apply it on top
of your branch. However, this causes problems with Gerrit. Namely,
when you upload a change to Gerrit, git-cl has to make sure that all
parents of your local change have previously been uploaded as well,
either as other changes or as commits already landed on the target
branch. But the method for "applying a patch" from Gerrit was to
cherry-pick it, and that changes the commit hash. So the resulting
commit would *not* have been uploaded to Gerrit. Thus, the
following routine didn't work with Gerrit:
$ git checkout -t origin/master -b your-work
$ git cl patch 123456
$ git checkout -tb my-work
$ #hack and commit
$ git cl upload
This would fail during the upload with a message saying that the
contents of 'your-work' hadn't been uploaded.

This CL fixes the situation by replacing the cherry-pick with
a hard reset. This means that the contents of the 'your-work'
branch will be *exactly* what was downloaded from Gerrit. Uploads
based on top of that commit will work just fine.

Finally, in a concession to some people who want 'git cl patch'
to actually apply a patch instead of performing a hard reset, if
the current branch contains local work, then rather than leaving
that work behind with a hard reset, we fall back to the old
cherry-pick behavior with a confirmation dialog and warning that
uploading will be hard.

Bug: 723787
Change-Id: I3ad164f6d3078bff00139d446bb8ce97738a1344
Reviewed-on: https://chromium-review.googlesource.com/527345
Commit-Queue: Aaron Gable <agable@chromium.org>
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
9 years ago
bootstrap Revert "[git_bootstrap.py] Remove unused options, use cipd in %PATH%." 9 years ago
fetch_configs ENH: pass cache_dir arg through fetch, webrtc, and eventually chromium. 9 years ago
git-templates
infra Roll recipe dependencies (trivial). 9 years ago
man Add git cl split. 9 years ago
recipes [bot_update] Remove extraneous slash in revision parsing. 9 years ago
support
testing_support gclient flatten: handle GN settings 9 years ago
tests Make gerrit 'git cl patch' use hard reset by default 9 years ago
third_party gclient validate: add schema checking 9 years ago
win_toolchain [win_toolchain] Allow toolchain dir override. 9 years ago
zsh-goodies
.gitignore [auto_update] Add control script, allow disable. 9 years ago
.style.yapf
LICENSE
OWNERS Remove stip@ from OWNERS. 9 years ago
PRESUBMIT.py Remove SVN (and dcommit) support from git-cl 9 years ago
README.gclient.md docs: Removing references to SVN 9 years ago
README.git-cl.md Proofread README.git-cl.md. 9 years ago
README.md Add links to bug tracker, forum and review UI 9 years ago
README.testing
WATCHLISTS Remove myself (dpranke@) from the WATCHLISTS. 9 years ago
annotated_gclient.py
appengine_mapper.py Automatically map urls to their raw appengine forms 9 years ago
apply_issue
apply_issue.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
apply_issue.py apply_issue: remove old hack. 9 years ago
auth.py
breakpad.py
buildbucket.py
cbuildbot
checkout.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
chrome_set_ver
cipd Add cipd bootstrap scripts to depot_tools. 9 years ago
cipd.bat [cipd.bat] Switch cipd.bat to use -Command. 9 years ago
cipd.ps1 [cipd.ps1] catch CommandNotFoundException if git is not available yet 9 years ago
cipd_bin_setup.bat Add vpython.bat. 9 years ago
cipd_bin_setup.sh Add vpython to depot_tools for linux and mac 9 years ago
cipd_client_version Bump cipd client version. 9 years ago
cipd_manifest.txt [vpython] Bump to newer version. 9 years ago
cit
cit.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
cit.py cit.py: Use infra.git's cit branch instead of the deployed branch 9 years ago
clang-format
clang-format.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
clang_format.py Improve clang-format error messages when run outside of chromium checkout 9 years ago
clang_format_merge_driver Introduce git merge driver for the blink reformatting 9 years ago
clang_format_merge_driver.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
clang_format_merge_driver.py Make merge driver complain about older gits 9 years ago
codereview.settings Make depot_tools upload reviews to Gerrit by default 9 years ago
commit_queue
commit_queue.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
commit_queue.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
cpplint.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
cpplint.py cpplint: Update Google Style Guide's URL 9 years ago
cpplint_chromium.py
create-ntfs-junction.c
create-ntfs-junction.exe
cros
cros_sdk
dart_format.py
depot-tools-auth
depot-tools-auth.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
depot-tools-auth.py Fix coloring madness in depot_tools. 10 years ago
download_from_google_storage
download_from_google_storage.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
download_from_google_storage.py Force download and extract if extracted directory is missing 10 years ago
fetch
fetch.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
fetch.py ENH: pass cache_dir arg through fetch, webrtc, and eventually chromium. 9 years ago
fix_encoding.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
gclient Make msys depot_tools upgrade process smoother. 10 years ago
gclient-new-workdir.py Fix regression of gclient-new-workdir.py 9 years ago
gclient.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
gclient.py gclient flatten: handle GN settings 9 years ago
gclient_completion.sh
gclient_eval.py gclient: implement exporting variables to .gni files 9 years ago
gclient_scm.py [gclient] _Capture to optionally not strip output. 9 years ago
gclient_utils.py gclient: remove support for From() (reland #1) 9 years ago
gerrit_client.py Create recipe_modules/gerrit to interact with gerrit REST API 9 years ago
gerrit_util.py git-cl-comments: Support Gerrit file- and line-comments 9 years ago
git-cache
git-cherry-pick-upload
git-cl
git-crrev-parse Fix git-crrev-parse returning reverted commits instead of original commits 9 years ago
git-crsync
git-drover
git-find-releases
git-footers
git-freeze
git-gs Add *.proto to 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 git_cache.py: Don't bootstrap from Google storage for unrecognized repos. 9 years ago
git_cherry_pick_upload.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
git_cl.py Make gerrit 'git cl patch' use hard reset by default 9 years ago
git_cl_completion.sh Add git cl bash completition. 9 years ago
git_common.py Add git cl split. 9 years ago
git_dates.py
git_drover.py git-drover: TBR appropriate reviewers 9 years ago
git_find_releases.py
git_footers.py Nit fix for git_footers. 9 years ago
git_freezer.py
git_hyper_blame.py git hyper-blame: Fixed --no-default-ignores option to not take argument. 9 years ago
git_map.py git-map: use committer date instead of author date 9 years ago
git_map_branches.py Show colored explanation in git map-branches -h 9 years ago
git_mark_merge_base.py
git_nav_downstream.py
git_new_branch.py Clarify how `new-branch` is different for --help 10 years ago
git_number.py Pass user name and email to git-number's initial commit. 9 years ago
git_rebase_update.py [git rebase-update] Handle error when chdir'ing to original workdir. 9 years ago
git_rename_branch.py
git_reparent_branch.py
git_retry.py [git retry] Fix Git wrapper fallthrough. 9 years ago
git_squash_branch.py Include branch name in git-squash-branch's default message 9 years ago
git_upstream_diff.py Refactor git_common config and die 10 years ago
gn
gn.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
gn.py
gsutil.py Add in option to always disable gsutil version check 10 years ago
led [led] add LUCI editor to depot_tools. 9 years ago
led.bat [led] add LUCI editor to depot_tools. 9 years ago
my_activity.py Update my_activity.py to use crrev.com short URLs for Gerrit. 9 years ago
my_reviews.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
ninja depot_tools: Run automatic spell-checker. 9 years ago
ninja-linux32 Updata ninja to v1.7.2. 9 years ago
ninja-linux64 Updata ninja to v1.7.2. 9 years ago
ninja-mac Updata ninja to v1.7.2. 9 years ago
ninja.exe Updata ninja to v1.7.2. 9 years ago
owners.py Add git cl split. 9 years ago
owners_finder.py Use OldContents() for OWNERS files to do checks 9 years ago
patch.py
presubmit_canned_checks.py Refactor PRESUBMIT support for tags 9 years ago
presubmit_support.py Parse Bug, R, and Tbr git-footers in PRESUBMIT 9 years ago
profile.xml
pylint
pylint.py
pylintrc depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
python_runner.sh Multiple improvements to windows bash integration. 10 years ago
repo repo: update to v1.12.34-cr2 9 years ago
rietveld.py Rietveld: fix search query. 9 years ago
roll-dep
roll-dep-svn Revert of Delete roll-dep-svn (patchset #1 id:1 of https://codereview.chromium.org/2282223002/ ) 9 years ago
roll-dep-svn.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
roll-dep.bat [.bat] Remove "depot_tools" override. (#2) 9 years ago
roll_dep.py Update roll-dep to skip trivial recipe roll 9 years ago
roll_dep_svn.py Revert of Delete roll-dep-svn (patchset #1 id:1 of https://codereview.chromium.org/2282223002/ ) 9 years ago
scm.py Correct Git show's path format on Windows 9 years ago
setup_color.py setup_color.py should not be executable, as it pollutes $PATH. 9 years ago
split_cl.py Add git cl split. 9 years ago
subcommand.py Revert "gclient: return non-zero exit code on unknown command" 9 years ago
subprocess2.py depot_tools: Replace pylint error numbers with symbolic names. 9 years ago
update_depot_tools [auto_update] Add control script, allow disable. 9 years ago
update_depot_tools.bat [auto_update] Add control script, allow disable. 9 years ago
update_depot_tools_toggle.py [auto_update] Add control script, allow disable. 9 years ago
upload_to_google_storage.py Run auto-spell-checker (codespell) on files in depot_tools. 9 years ago
vpython vpython: proper shebang :) 9 years ago
vpython.bat Add vpython.bat. 9 years ago
watchlists.py
weekly
wtf

README.md

depot_tools

Tools for working with Chromium development. It requires python 2.7.

Tools

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.

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.