git-cl: Use scm.GIT.{Get,Set}BranchConfig and {Get,Set}BranchRef instead of git calls.

scm.GIT functions are tested, and using them makes it easier to mock
git calls on git-cl tests.

Bug: 1051631
Change-Id: If067aa3f71b7478cafd7985d3020dacc0c6a41c1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2055464
Reviewed-by: Anthony Polito <apolito@google.com>
Commit-Queue: Edward Lesmes <ehmaldonado@chromium.org>
4 files changed
tree: 6420ceb89a6307c17e722b90a1e5d48c654f0462
  1. bootstrap/
  2. fetch_configs/
  3. git-templates/
  4. infra/
  5. man/
  6. python-bin/
  7. recipes/
  8. testing_support/
  9. tests/
  10. third_party/
  11. win_toolchain/
  12. zsh-goodies/
  13. .gitattributes
  14. .gitignore
  15. .style.yapf
  16. .vpython
  17. .vpython3
  18. auth.py
  19. autoninja
  20. autoninja.bat
  21. autoninja.py
  22. bb
  23. bb.bat
  24. bootstrap_python3
  25. breakpad.py
  26. cipd
  27. cipd.bat
  28. cipd.ps1
  29. cipd_bin_setup.bat
  30. cipd_bin_setup.sh
  31. cipd_client_version
  32. cipd_client_version.digests
  33. cipd_manifest.txt
  34. cipd_manifest.versions
  35. cit
  36. cit.bat
  37. cit.py
  38. clang-format
  39. clang-format.bat
  40. clang_format.py
  41. clang_format_merge_driver
  42. clang_format_merge_driver.bat
  43. clang_format_merge_driver.py
  44. codereview.settings
  45. compile_single_file
  46. compile_single_file.bat
  47. compile_single_file.py
  48. cpplint.bat
  49. cpplint.py
  50. cpplint_chromium.py
  51. cros
  52. CROS_OWNERS
  53. crosjobs
  54. dart_format.py
  55. detect_host_arch.py
  56. download_from_google_storage
  57. download_from_google_storage.bat
  58. download_from_google_storage.py
  59. ensure_bootstrap
  60. fetch
  61. fetch.bat
  62. fetch.py
  63. fix_encoding.py
  64. gclient
  65. gclient-new-workdir.py
  66. gclient.bat
  67. gclient.py
  68. gclient_completion.sh
  69. gclient_eval.py
  70. gclient_paths.py
  71. gclient_scm.py
  72. gclient_utils.py
  73. gerrit_client.py
  74. gerrit_util.py
  75. git-cache
  76. git-cl
  77. git-crrev-parse
  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-upstream-diff
  99. git_cache.py
  100. git_cl.py
  101. git_cl_completion.sh
  102. git_common.py
  103. git_dates.py
  104. git_drover.py
  105. git_find_releases.py
  106. git_footers.py
  107. git_freezer.py
  108. git_hyper_blame.py
  109. git_map.py
  110. git_map_branches.py
  111. git_mark_merge_base.py
  112. git_nav_downstream.py
  113. git_new_branch.py
  114. git_number.py
  115. git_rebase_update.py
  116. git_rename_branch.py
  117. git_reparent_branch.py
  118. git_retry.py
  119. git_squash_branch.py
  120. git_upstream_diff.py
  121. gn
  122. gn.bat
  123. gn.py
  124. goma_auth
  125. goma_auth.bat
  126. goma_ctl
  127. goma_ctl.bat
  128. GOMA_OWNERS
  129. gsutil.py
  130. gsutil.py.bat
  131. gsutil.vpython
  132. led
  133. led.bat
  134. LICENSE
  135. luci-auth
  136. luci-auth.bat
  137. lucicfg
  138. lucicfg.bat
  139. mac_toolchain
  140. metrics.py
  141. metrics.README.md
  142. metrics_utils.py
  143. my_activity.py
  144. ninja
  145. ninja-linux32
  146. ninja-linux64
  147. ninja-mac
  148. ninja.exe
  149. ninjalog.README.md
  150. ninjalog_uploader.py
  151. ninjalog_uploader_wrapper.py
  152. OWNERS
  153. owners.py
  154. owners_finder.py
  155. post_build_ninja_summary.py
  156. PRESUBMIT.py
  157. presubmit_canned_checks.py
  158. presubmit_support.py
  159. profile.xml
  160. prpc
  161. prpc.bat
  162. pylint
  163. pylint-1.5
  164. pylint-1.6
  165. pylint-1.7
  166. pylint-1.8
  167. pylint-1.9
  168. pylint.bat
  169. pylint_main.py
  170. pylintrc
  171. python_runner.sh
  172. README.gclient.md
  173. README.git-cl.md
  174. README.md
  175. repo
  176. roll-dep
  177. roll-dep.bat
  178. roll_dep.py
  179. scm.py
  180. setup_color.py
  181. split_cl.py
  182. subcommand.py
  183. subprocess2.py
  184. update_depot_tools
  185. update_depot_tools.bat
  186. update_depot_tools_toggle.py
  187. upload_metrics.py
  188. upload_to_google_storage.py
  189. vpython
  190. vpython.bat
  191. vpython3
  192. vpython3.bat
  193. WATCHLISTS
  194. watchlists.py
  195. weekly
  196. wtf
  197. yapf
  198. yapf.bat
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

Until 2018, our cpplint.py was a copy of the upstream version at https://github.com/google/styleguide/tree/gh-pages/cpplint. Unfortunately, that repository is not maintained any more. If you want to update cpplint.py in depot_tools, just upload a patch to do so. We will figure out a long-term strategy via issue https://crbug.com/916550.

Note that the cpplint.py here is also used by the Tricium analyzer, so if the cpplint.py here changes, we should also update the copy used there.