Update man files related to merge-base with better description

Change-Id: I9796d2034a8a3c1243defc7f18f0aee1d701ba00
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2414569
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>
Commit-Queue: Gavin Mak <gavinmak@google.com>
3 files changed
tree: 08671ca7739f655e9353a74c0b05f726e047c418
  1. .cipd_impl.ps1
  2. .gitattributes
  3. .gitignore
  4. .style.yapf
  5. .vpython
  6. .vpython3
  7. CROS_OWNERS
  8. GOMA_OWNERS
  9. LICENSE
  10. LUCI_OWNERS
  11. OWNERS
  12. PRESUBMIT.py
  13. README.gclient.md
  14. README.git-cl.md
  15. README.md
  16. WATCHLISTS
  17. auth.py
  18. autoninja
  19. autoninja.bat
  20. autoninja.py
  21. bb
  22. bb.bat
  23. bootstrap/
  24. bootstrap_python3
  25. breakpad.py
  26. cipd
  27. cipd.bat
  28. cipd_bin_setup.bat
  29. cipd_bin_setup.sh
  30. cipd_client_version
  31. cipd_client_version.digests
  32. cipd_manifest.txt
  33. cipd_manifest.versions
  34. cit
  35. cit.bat
  36. cit.py
  37. clang-format
  38. clang-format.bat
  39. clang_format.py
  40. clang_format_merge_driver
  41. clang_format_merge_driver.bat
  42. clang_format_merge_driver.py
  43. codereview.settings
  44. compile_single_file
  45. compile_single_file.bat
  46. compile_single_file.py
  47. cpplint.bat
  48. cpplint.py
  49. cpplint_chromium.py
  50. cros
  51. crosjobs
  52. detect_host_arch.py
  53. dirmd
  54. dirmd.bat
  55. download_from_google_storage
  56. download_from_google_storage.bat
  57. download_from_google_storage.py
  58. ensure_bootstrap
  59. fetch
  60. fetch.bat
  61. fetch.py
  62. fetch_configs/
  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-templates/
  98. git-thaw
  99. git-upstream-diff
  100. git_cache.py
  101. git_cl.py
  102. git_cl_completion.sh
  103. git_common.py
  104. git_dates.py
  105. git_drover.py
  106. git_find_releases.py
  107. git_footers.py
  108. git_freezer.py
  109. git_hyper_blame.py
  110. git_map.py
  111. git_map_branches.py
  112. git_mark_merge_base.py
  113. git_nav_downstream.py
  114. git_new_branch.py
  115. git_number.py
  116. git_rebase_update.py
  117. git_rename_branch.py
  118. git_reparent_branch.py
  119. git_retry.py
  120. git_squash_branch.py
  121. git_upstream_diff.py
  122. gn
  123. gn.bat
  124. gn.py
  125. goma_auth
  126. goma_auth.bat
  127. goma_ctl
  128. goma_ctl.bat
  129. gsutil.py
  130. gsutil.py.bat
  131. gsutil.vpython
  132. infra/
  133. led
  134. led.bat
  135. lockfile.py
  136. luci-auth
  137. luci-auth.bat
  138. lucicfg
  139. lucicfg.bat
  140. mac_toolchain
  141. man/
  142. metrics.README.md
  143. metrics.py
  144. metrics_utils.py
  145. my_activity.py
  146. ninja
  147. ninja-linux32
  148. ninja-linux64
  149. ninja-mac
  150. ninja.exe
  151. ninjalog.README.md
  152. ninjalog_uploader.py
  153. ninjalog_uploader_wrapper.py
  154. owners.py
  155. owners_finder.py
  156. post_build_ninja_summary.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-bin/
  172. python_runner.sh
  173. rdb
  174. rdb.bat
  175. rdb_wrapper.py
  176. recipes/
  177. repo
  178. roll-dep
  179. roll-dep.bat
  180. roll_dep.py
  181. scm.py
  182. setup_color.py
  183. split_cl.py
  184. subcommand.py
  185. subprocess2.py
  186. testing_support/
  187. tests/
  188. third_party/
  189. update_depot_tools
  190. update_depot_tools.bat
  191. update_depot_tools_toggle.py
  192. upload_metrics.py
  193. upload_to_google_storage.py
  194. vpython
  195. vpython.bat
  196. vpython3
  197. vpython3.bat
  198. watchlists.py
  199. weekly
  200. win32imports.py
  201. win_toolchain/
  202. wtf
  203. yapf
  204. yapf.bat
  205. zsh-goodies/
README.md

depot_tools

Tools for working with Chromium development. It requires python 2.7 or 3.8 for python 3 support.

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.