1. 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
  2. 17 Feb, 2021 4 commits
  3. 16 Feb, 2021 3 commits
  4. 12 Feb, 2021 3 commits
  5. 11 Feb, 2021 2 commits
  6. 10 Feb, 2021 2 commits
  7. 09 Feb, 2021 5 commits
  8. 08 Feb, 2021 3 commits
  9. 05 Feb, 2021 6 commits
  10. 04 Feb, 2021 1 commit
  11. 03 Feb, 2021 7 commits
  12. 02 Feb, 2021 2 commits