Google Git
Sign in
chromium / chromium / tools / depot_tools / c903d73f3cf002e7004d0bd51d130c5bf48f3fbc
commitc903d73f3cf002e7004d0bd51d130c5bf48f3fbc[log] [tgz]
authoragable <agable@chromium.org>Tue Jul 26 16:07:24 2016
committerCommit bot <commit-bot@chromium.org>Tue Jul 26 16:07:24 2016
treea94f114927a8e6b75484adc3169a3d9ed19ba418
parentcbfbd2c342ba470f59099fc6e325c10cd182d86d [diff]
Give 'gclient revert' a --merge option to match sync

This is a workaround for the fact that 'gclient revert' calls
'gclient update' with the same `options` object, despite not
actually having the same set of command line options.

R=iannucci@chromium.org, kevcheng@chromium.org
BUG=631220

Review-Url: https://codereview.chromium.org/2184493002
1 file changed
tree: a94f114927a8e6b75484adc3169a3d9ed19ba418
  1. bootstrap/
  2. fetch_configs/
  3. git-templates/
  4. infra/
  5. luci_hacks/
  6. man/
  7. recipe_modules/
  8. support/
  9. testing_support/
  10. tests/
  11. third_party/
  12. win_toolchain/
  13. zsh-goodies/
  14. cbuildbot ⇨ support/chromite_wrapper
  15. chrome_set_ver ⇨ support/chromite_wrapper
  16. cros ⇨ support/chromite_wrapper
  17. cros_sdk ⇨ support/chromite_wrapper
  18. .gitignore
  19. .style.yapf
  20. annotated_gclient.py
  21. apply_issue
  22. apply_issue.bat
  23. apply_issue.py
  24. auth.py
  25. breakpad.py
  26. buildbucket.py
  27. checkout.py
  28. chrome-update-create-task.bat
  29. chrome-update.bat
  30. chrome-update.py
  31. cit
  32. cit.bat
  33. cit.py
  34. clang-format
  35. clang-format.bat
  36. clang_format.py
  37. codereview.settings
  38. commit_queue
  39. commit_queue.bat
  40. commit_queue.py
  41. cpplint.bat
  42. cpplint.py
  43. cpplint_chromium.py
  44. create-chromium-git-src
  45. create-ntfs-junction.c
  46. create-ntfs-junction.exe
  47. dart_format.py
  48. depot-tools-auth
  49. depot-tools-auth.bat
  50. depot-tools-auth.py
  51. download_from_google_storage
  52. download_from_google_storage.bat
  53. download_from_google_storage.py
  54. drover
  55. drover.bat
  56. drover.py
  57. fetch
  58. fetch.bat
  59. fetch.py
  60. fix_encoding.py
  61. gcl
  62. gcl.bat
  63. gcl.py
  64. gclient
  65. gclient-new-workdir.py
  66. gclient.bat
  67. gclient.py
  68. gclient_completion.sh
  69. gclient_scm.py
  70. gclient_utils.py
  71. gerrit_util.py
  72. git-auto-svn
  73. git-cache
  74. git-cherry-pick-upload
  75. git-cl
  76. git-crrev-parse
  77. git-crsync
  78. git-drover
  79. git-find-releases
  80. git-footers
  81. git-freeze
  82. git-gs
  83. git-hyper-blame
  84. git-map
  85. git-map-branches
  86. git-mark-merge-base
  87. git-nav-downstream
  88. git-nav-upstream
  89. git-new-branch
  90. git-number
  91. git-rebase-update
  92. git-rename-branch
  93. git-reparent-branch
  94. git-retry
  95. git-runhooks
  96. git-squash-branch
  97. git-thaw
  98. git-try
  99. git-upstream-diff
  100. git_auto_svn.py
  101. git_cache.py
  102. git_cherry_pick_upload.py
  103. git_cl.py
  104. git_common.py
  105. git_dates.py
  106. git_drover.py
  107. git_find_releases.py
  108. git_footers.py
  109. git_freezer.py
  110. git_hyper_blame.py
  111. git_map.py
  112. git_map_branches.py
  113. git_mark_merge_base.py
  114. git_nav_downstream.py
  115. git_new_branch.py
  116. git_number.py
  117. git_rebase_update.py
  118. git_rename_branch.py
  119. git_reparent_branch.py
  120. git_retry.py
  121. git_squash_branch.py
  122. git_try.py
  123. git_upstream_diff.py
  124. gn
  125. gn.bat
  126. gn.py
  127. gsutil.py
  128. LICENSE
  129. my_activity.py
  130. my_reviews.py
  131. ninja
  132. ninja-linux32
  133. ninja-linux64
  134. ninja-mac
  135. ninja.exe
  136. OWNERS
  137. owners.py
  138. owners_finder.py
  139. patch.py
  140. PRESUBMIT.py
  141. presubmit_canned_checks.py
  142. presubmit_support.py
  143. profile.xml
  144. pylint
  145. pylint.py
  146. pylintrc
  147. python_runner.sh
  148. README.codereview
  149. README.gclient
  150. README.git-cl
  151. README.md
  152. README.testing
  153. recipes.py
  154. repo
  155. rietveld.py
  156. roll-dep
  157. roll-dep-svn
  158. roll-dep-svn.bat
  159. roll-dep.bat
  160. roll_dep.py
  161. roll_dep_svn.py
  162. scm.py
  163. setup_color.py
  164. subcommand.py
  165. subprocess2.py
  166. trychange.py
  167. update_depot_tools
  168. update_depot_tools.bat
  169. upload_to_google_storage.py
  170. WATCHLISTS
  171. watchlists.py
  172. weekly
  173. wtf
README.md

This package contains tools for working with Chromium development:

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/

It 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.

Note: on Windows if svn, git and python are not accessible, they will be downloaded too.

Contributing

The “gclient” wrapper knows how to keep this repository updated to the latest versions of these tools as found at:

https://chromium.googlesource.com/chromium/tools/depot_tools.git

To contribute change for review:

git new-branch <somename>
git add <yourchanges>
git commit
# find reviewers
git cl owners
git log <yourfiles>
# upload
git cl upload -r reviewer1@chromium.org,reviewer2 --send-mail
# open https://codereview.chromium.org/ and send mail

# if change is approved, flag it to be commited
git cl set_commit
# if change needs more work
git rebase-update
...
git cl upload