Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Unified Diff: git_cl.py

Issue 2453823002: depot_tools: Remove DoGetTrySlaves, GetTrySlavesExecuter, GetPreferredTrySlaves (Closed)
Patch Set: Rebase Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | presubmit_support.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index 1321d2f49d835cab504d282f4c9d557ce3dd9d38..79fceab2431323208297b9807606d383da50ae00 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -349,8 +349,8 @@ def _get_bucket_map(changelist, options, option_parser):
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 @@ def _get_bucket_map(changelist, options, option_parser):
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:
« no previous file with comments | « no previous file | presubmit_support.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698