depot_tools: Remove DoGetTrySlaves, GetTrySlavesExecuter, GetPreferredTrySlaves

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld and Gerrit."""
 
 from __future__ import print_function
@@ skipping 331 matching lines @@
 
 def _get_bucket_map(changelist, options, option_parser):
   """Returns a dict mapping bucket names to builders and tests,
   for triggering try jobs.
   """
   # If no bots are listed, we try to get a set of builders and tests based
   # on GetPreferredTryMasters functions in PRESUBMIT.py files.
   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(),
         default_presubmit=None,
         project=None,
         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:
     return {_prefix_master(options.master): {b: [] for b in options.bot}}
 
   # If bots are listed but no master or bucket, then we need to find out
   # the corresponding master for each bot.
   bucket_map, error_message = _get_bucket_map_for_builders(options.bot)
   if error_message:
     option_parser.error(
@@ skipping 4984 matching lines @@
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   setup_color.init()
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     sys.stderr.write('interrupted\n')
     sys.exit(1)