depot_tools: Remove DoGetTrySlaves, GetTrySlavesExecuter, GetPreferredTrySlaves
Note: This CL originally just removed a deprecated use of Remove use of DoGetTrySlaves, suggested in http://crrev.com/2442153002, then was expanded to remove DoGetTrySlaves, GetPreferredTrySlaves and GetTrySlavesExecuter since these are all deprecated and unused.
BUG=660453
Review-Url: https://codereview.chromium.org/2453823002
diff --git a/git_cl.py b/git_cl.py
index 1321d2f..79fceab 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -349,8 +349,8 @@
if not options.bot:
change = changelist.GetChange(
changelist.GetCommonAncestorWithUpstream(), None)
-
- masters = presubmit_support.DoGetTryMasters(
+ # Get try masters from PRESUBMIT.py files.
+ return presubmit_support.DoGetTryMasters(
change=change,
changed_files=change.LocalPaths(),
repository_root=settings.GetRoot(),
@@ -359,26 +359,6 @@
verbose=options.verbose,
output_stream=sys.stdout)
- if masters:
- return masters
-
- # Fall back to deprecated method: get try slaves from PRESUBMIT.py
- # files.
- # TODO(qyearsley): Remove this.
- options.bot = presubmit_support.DoGetTrySlaves(
- change=change,
- changed_files=change.LocalPaths(),
- repository_root=settings.GetRoot(),
- default_presubmit=None,
- project=None,
- verbose=options.verbose,
- output_stream=sys.stdout)
-
- if not options.bot:
- return {}
-
- # If a bucket or master is passed, then we assume all bots are under
- # that one master.
if options.bucket:
return {options.bucket: {b: [] for b in options.bot}}
if options.master: