Google Git
Sign in
chromium / chromium / tools / depot_tools / 66945379c69dca334b61ebb4728b4a6ee95fde79
commit66945379c69dca334b61ebb4728b4a6ee95fde79[log] [tgz]
authorPaweł Hajdan, Jr <phajdan.jr@chromium.org>Mon Jun 12 17:34:52 2017
committerCommit Bot <commit-bot@chromium.org>Mon Jun 19 13:48:57 2017
tree2a50e044ab794a00eade41a8c5de934dd707bdaa
parent257c9b2a70300faf1fa03f66f1b53176a0fe5c11 [diff]
gclient: throw errors if values from deps_os override deps

With 'flatten' work and in general, we assume deps_os only add to deps,
without attempting to override entries there.

This removes significant edge cases from flatten code,
and ensures DEPS are easier to reason about.

This reverses some past patches and decisions:

a0ad8ad9c9e72291caa387d4ad1d556da3aa860f
https://codereview.chromium.org/11368067
https://bugs.chromium.org/p/chromium/issues/detail?id=157979

ed2b4fe59bb58986a4228606f3fa06dd16883514
https://codereview.chromium.org/23875029
https://bugs.chromium.org/p/chromium/issues/detail?id=248168

These are rather old though (2012-2013), and not expected to be used.

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