Improve git cl split

This CL changes the behavior of `git cl split` to split the change
by the size of the resulting CLs. For now, this is based on the number
of bytes changed, and not by the number of changed lines. Depending
on the shape of change, this may still produce more CLs than expected
(and possibly more than before).

A future change will switch the split to be based on the number
of affected lines, and also introduce a mode to base the split
on the number of affected files.

Bug: 998922
Change-Id: I49f868972a61b89b426ef9e2ceedc733eacb4350
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1778744
Commit-Queue: Yannic Bonenberger <yannic.bonenberger@gmail.com>
Reviewed-by: Dirk Pranke <dpranke@chromium.org>
6 files changed
tree: e45103f1bc7ff1d3dff574974bb9c5d99df293ee
  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. gsutil.py
  129. gsutil.py.bat
  130. gsutil.vpython
  131. led
  132. led.bat
  133. LICENSE
  134. luci-auth
  135. luci-auth.bat
  136. lucicfg
  137. lucicfg.bat
  138. mac_toolchain
  139. metrics.py
  140. metrics.README.md
  141. metrics_utils.py
  142. my_activity.py
  143. ninja
  144. ninja-linux32
  145. ninja-linux64
  146. ninja-mac
  147. ninja.exe
  148. ninjalog.README.md
  149. ninjalog_uploader.py
  150. ninjalog_uploader_wrapper.py
  151. OWNERS
  152. owners.py
  153. owners_finder.py
  154. post_build_ninja_summary.py
  155. PRESUBMIT.py
  156. presubmit_canned_checks.py
  157. presubmit_support.py
  158. profile.xml
  159. prpc
  160. prpc.bat
  161. pylint
  162. pylint-1.5
  163. pylint-1.6
  164. pylint-1.7
  165. pylint-1.8
  166. pylint-1.9
  167. pylint.bat
  168. pylint_main.py
  169. pylintrc
  170. python_runner.sh
  171. README.gclient.md
  172. README.git-cl.md
  173. README.md
  174. repo
  175. roll-dep
  176. roll-dep.bat
  177. roll_dep.py
  178. scm.py
  179. setup_color.py
  180. split_cl.py
  181. subcommand.py
  182. subprocess2.py
  183. update_depot_tools
  184. update_depot_tools.bat
  185. update_depot_tools_toggle.py
  186. upload_metrics.py
  187. upload_to_google_storage.py
  188. vpython
  189. vpython.bat
  190. vpython3
  191. vpython3.bat
  192. WATCHLISTS
  193. watchlists.py
  194. weekly
  195. wtf
  196. yapf
  197. 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.