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

Unified Diff: git_cl.py

Issue 348473003: Added support for git cl upload automatic trybot determination. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/depot_tools
Patch Set: Moved around pylint disable comments. Created 6 years, 6 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 | tests/git_cl_test.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 f86a781765a4ab605459d63fbc8628a77f268dae..72770a145e4194197b910b7c0eb7db5cb2469e08 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1552,7 +1552,7 @@ def GerritUpload(options, args, cl):
return 0
-def RietveldUpload(options, args, cl):
+def RietveldUpload(options, args, cl, change):
"""upload the patch to rietveld."""
upload_args = ['--assume_yes'] # Don't ask about untracked files.
upload_args.extend(['--server', cl.GetRietveldServer()])
@@ -1579,6 +1579,22 @@ def RietveldUpload(options, args, cl):
change_desc = ChangeDescription(message)
if options.reviewers:
change_desc.update_reviewers(options.reviewers)
+ if options.auto_bots:
+ masters = presubmit_support.DoGetTryMasters(
+ change,
+ change.LocalPaths(),
+ settings.GetRoot(),
+ None,
+ None,
+ options.verbose,
+ sys.stdout)
+
+ if masters:
+ change_description = change_desc.description + '\nCQ_TRYBOTS='
+ lst = []
+ for master, mapping in masters.iteritems():
+ lst.append(master + ':' + ','.join(mapping.keys()))
+ change_desc.set_description(change_description + ';'.join(lst))
if not options.force:
change_desc.prompt()
@@ -1709,6 +1725,8 @@ def CMDupload(parser, args):
'use for CL. Default: master')
parser.add_option('--email', default=None,
help='email address to use to connect to Rietveld')
+ parser.add_option('--auto-bots', default=False, action='store_true',
+ help='Autogenerate which trybots to use for this CL')
add_git_similarity(parser)
(options, args) = parser.parse_args(args)
@@ -1768,7 +1786,7 @@ def CMDupload(parser, args):
print_stats(options.similarity, options.find_copies, args)
if settings.GetIsGerrit():
return GerritUpload(options, args, cl)
- ret = RietveldUpload(options, args, cl)
+ ret = RietveldUpload(options, args, cl, change)
if not ret:
git_set_branch_value('last-upload-hash',
RunGit(['rev-parse', 'HEAD']).strip())
« no previous file with comments | « no previous file | tests/git_cl_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698