Skip to content

C
Chromium_Depot_tools
Switch branch/tag
  1. 23 Feb, 2021 1 commit
    • Michael Moss's avatar
      Don't make depot_tools pylintrc override local pylint configs. · ae8b2c6c
      Michael Moss authored 
      In the current pylint handling, the only way to use an alternative
config is to explicitly pass it with the "--rcfile" flag, which is
confusingly inconsistent with normal pylint config file resolution.
This change allows local pylintrc files or PYLINTRC env var to override
the default depot_tools config, which is often desirable to enforce
different style guidelines for different projects.

For reference, the config file search order[1] is:
1) File specified by the "--rcfile" flag
2) pylintrc in the CWD
3) .pylintrc in the CWD
4) first pylintrc found up the python module hierarchy, if CWD is in
   a module hierarchy
5) $PYLINTRC env var
6) $HOME/.pylintrc
7) $HOME/.config/pylintrc
8) /etc/pylintrc (or equivalent on other platforms)

- 1-5 will take precedence over the new depot_tools default.
- If there is no match for 1-5 and there is no PYLINTRC env var,
  depot_tools will set PYLINTRC to its default and that will be used.
- If there is no match for 1-5 and the PYLINTRC env var is empty, then
  it will fall through to 6-8.

[1] Newer pylints have additional options, but these are the options,
and the order, common to all versions of depot_tools pylint.

Change-Id: Ib725b15bb639dc9c7cb9009fd3b504124e0c1f2a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2708749Reviewed-by: 's avatarMike Frysinger <vapier@chromium.org>
Reviewed-by: 's avatarDirk Pranke <dpranke@google.com>
Commit-Queue: Michael Moss <mmoss@chromium.org>
      ae8b2c6c
  3. 22 Feb, 2021 1 commit
  5. 19 Feb, 2021 2 commits
  7. 18 Feb, 2021 2 commits
    • Bruce Dawson's avatar
      Robustly set issue number · f362f6f9
      Bruce Dawson authored 
      When using "git cl patch -b branch_name issue_number" to resolve merge
conflicts in an uploaded CL the cherry-pick stage will probably fail due
to the expected merge conflicts. If you resolve the conflict and then
upload the now-merged CL you will actually create a new CL. This happens
because the SetIssue step is skipped when the cherry-pick fails.

This change sets the issue whenever a new branch is created. This is
safe (the new branch is not being used for anything else) and will
improve the situation in many cases.

crrev.com/c/2636593 is an example of a CL that was accidentally uploaded
as new when it was just supposed to be a resolving of merge conflicts on
an existing CL.

This change was manually tested with crrev.com/c/2107132.

Change-Id: Icb5b8e38feb6f0fa4a007d3924c4d69d2ee4937c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2638979
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>
Reviewed-by: 's avatarGavin Mak <gavinmak@google.com>
      f362f6f9
    • Antonio Sartori's avatar
      Make git map-branches faster · e0dff208
      Antonio Sartori authored 
      This change makes git map-branches a little bit faster by avoiding
fetching the revision list of each branch if git map-branches will not
show the tracking info anyway.

Change-Id: I47458871f904004f910aadd7d774bea5193c979e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2695393Reviewed-by: 's avatarAnthony Polito <apolito@google.com>
Commit-Queue: Antonio Sartori <antoniosartori@chromium.org>
      e0dff208
  9. 17 Feb, 2021 4 commits
  11. 16 Feb, 2021 3 commits
  13. 12 Feb, 2021 3 commits
  15. 11 Feb, 2021 2 commits
  17. 10 Feb, 2021 2 commits
  19. 09 Feb, 2021 5 commits
  21. 08 Feb, 2021 3 commits
  23. 05 Feb, 2021 6 commits
  25. 04 Feb, 2021 1 commit
  27. 03 Feb, 2021 5 commits