Implement and test git cl try for Gerrit.

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 409 matching lines @@
 
   codereview_host = urlparse.urlparse(codereview_url).hostname
   authenticator = auth.get_authenticator_for_host(codereview_host, auth_config)
   http = authenticator.authorize(httplib2.Http())
   http.force_exception_to_status_code = True
 
   # TODO(tandrii): consider caching Gerrit CL details just like
   # _RietveldChangelistImpl does, then caching values in these two variables
   # won't be necessary.
   owner_email = changelist.GetIssueOwner()
-  project = changelist.GetIssueProject()
 
   buildbucket_put_url = (
       'https://{hostname}/_ah/api/buildbucket/v1/builds/batch'.format(
           hostname=options.buildbucket_host))
   buildset = 'patch/{codereview}/{hostname}/{issue}/{patch}'.format(
       codereview='gerrit' if changelist.IsGerrit() else 'rietveld',
       hostname=codereview_host,
       issue=changelist.GetIssue(),
       patch=patchset)
+
+  shared_parameters_properties = changelist.GetTryjobProperties(patchset)
+  shared_parameters_properties['category'] = category
+  if options.clobber:
+    shared_parameters_properties['clobber'] = True
   extra_properties = _get_properties_from_options(options)
+  if extra_properties:
+    shared_parameters_properties.update(extra_properties)
 
   batch_req_body = {'builds': []}
   print_text = []
   print_text.append('Tried jobs on:')
   for bucket, builders_and_tests in sorted(buckets.iteritems()):
     print_text.append('Bucket: %s' % bucket)
     master = None
     if bucket.startswith(MASTER_PREFIX):
       master = _unprefix_master(bucket)
     for builder, tests in sorted(builders_and_tests.iteritems()):
       print_text.append('  %s: %s' % (builder, tests))
       parameters = {
           'builder_name': builder,
           'changes': [{
               'author': {'email': owner_email},
               'revision': options.revision,
           }],
-          'properties': {
-              'category': category,
-              'issue': changelist.GetIssue(),
-              'patch_project': project,
-              'patch_storage': 'rietveld',
-              'patchset': patchset,
-              'rietveld': codereview_url,
-          },
+          'properties': shared_parameters_properties.copy(),
       }
       if 'presubmit' in builder.lower():
         parameters['properties']['dry_run'] = 'true'
       if tests:
         parameters['properties']['testfilter'] = tests
-      if extra_properties:
-        parameters['properties'].update(extra_properties)
       if options.clobber:

[Michael Achenbach, 2016/11/04 14:44:58]

Looks like this is double now.

[tandrii(chromium), 2016/11/04 14:48:17]

true.

         parameters['properties']['clobber'] = True
 
       tags = [
           'builder:%s' % builder,
           'buildset:%s' % buildset,
           'user_agent:git_cl_try',
       ]
       if master:
         parameters['properties']['master'] = master
         tags.append('master:%s' % master)
@@ skipping 1200 matching lines @@
   def GetStatus(self):
     return self._codereview_impl.GetStatus()
 
   def GetCodereviewServer(self):
     return self._codereview_impl.GetCodereviewServer()
 
   def GetIssueOwner(self):
     """Get owner from codereview, which may differ from this checkout."""
     return self._codereview_impl.GetIssueOwner()
 
-  def GetIssueProject(self):
-    """Get project from codereview, which may differ from what this
-    checkout's codereview.settings or gerrit project URL say.
-    """
-    return self._codereview_impl.GetIssueProject()
-
   def GetApprovingReviewers(self):
     return self._codereview_impl.GetApprovingReviewers()
 
   def GetMostRecentPatchset(self):
     return self._codereview_impl.GetMostRecentPatchset()
 
   def CannotTriggerTryJobReason(self):
     """Returns reason (str) if unable trigger tryjobs on this CL or None."""
     return self._codereview_impl.CannotTriggerTryJobReason()
 
+  def GetTryjobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch tryjob."""
+    return self._codereview_impl.GetTryjobProperties(patchset=patchset)
+
   def __getattr__(self, attr):
     # This is because lots of untested code accesses Rietveld-specific stuff
     # directly, and it's hard to fix for sure. So, just let it work, and fix
     # on a case by case basis.
     # Note that child method defines __getattr__ as well, and forwards it here,
     # because _RietveldChangelistImpl is not cleaned up yet, and given
     # deprecation of Rietveld, it should probably be just removed.
     # Until that time, avoid infinite recursion by bypassing __getattr__
     # of implementation class.
     return self._codereview_impl.__getattribute__(attr)
@@ skipping 112 matching lines @@
     """
     raise NotImplementedError()
 
   def CannotTriggerTryJobReason(self):
     """Returns reason (str) if unable trigger tryjobs on this CL or None."""
     raise NotImplementedError()
 
   def GetIssueOwner(self):
     raise NotImplementedError()
 
-  def GetIssueProject(self):
+  def GetTryjobProperties(self, patchset=None):
     raise NotImplementedError()
 
 
 class _RietveldChangelistImpl(_ChangelistCodereviewBase):
   def __init__(self, changelist, auth_config=None, rietveld_server=None):
     super(_RietveldChangelistImpl, self).__init__(changelist)
     assert settings, 'must be initialized in _ChangelistCodereviewBase'
     if not rietveld_server:
       settings.GetDefaultServerUrl()
 
@@ skipping 60 matching lines @@
   def CannotTriggerTryJobReason(self):
     props = self.GetIssueProperties()
     if not props:
       return 'Rietveld doesn\'t know about your issue %s' % self.GetIssue()
     if props.get('closed'):
       return 'CL %s is closed' % self.GetIssue()
     if props.get('private'):
       return 'CL %s is private' % self.GetIssue()
     return None
 
+  def GetTryjobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch tryjob."""
+    project = (self.GetIssueProperties() or {}).get('project')
+    return {
+      'issue': self.GetIssue(),
+      'patch_project': project,
+      'patch_storage': 'rietveld',
+      'patchset': patchset or self.GetPatchset(),
+      'rietveld': self.GetCodereviewServer(),
+    }
+
   def GetApprovingReviewers(self):
     return get_approving_reviewers(self.GetIssueProperties())
 
   def GetIssueOwner(self):
     return (self.GetIssueProperties() or {}).get('owner_email')
 
-  def GetIssueProject(self):
-    return (self.GetIssueProperties() or {}).get('project')
-
   def AddComment(self, message):
     return self.RpcServer().add_comment(self.GetIssue(), message)
 
   def GetStatus(self):
     """Apply a rough heuristic to give a simple summary of an issue's review
     or CQ status, assuming adherence to a common workflow.
 
     Returns None if no issue for this branch, or one of the following keywords:
       * 'error'   - error from review tool (including deleted issues)
       * 'unsent'  - not sent for review
@@ skipping 919 matching lines @@
     """Sets the Commit-Queue label assuming canonical CQ config for Gerrit."""
     vote_map = {
         _CQState.NONE:    0,
         _CQState.DRY_RUN: 1,
         _CQState.COMMIT : 2,
     }
     gerrit_util.SetReview(self._GetGerritHost(), self.GetIssue(),
                           labels={'Commit-Queue': vote_map[new_state]})
 
   def CannotTriggerTryJobReason(self):
-    # TODO(tandrii): implement for Gerrit.
-    raise NotImplementedError()
+    try:
+      data = self._GetChangeDetail()
+    except GerritIssueNotExists:
+      return 'Gerrit doesn\'t know about your issue %s' % self.GetIssue()
+
+    if data['status'] in ('ABANDONED', 'MERGED'):
+      return 'CL %s is closed' % (self.GetIssue())

[Michael Achenbach, 2016/11/04 14:44:58]

nit: no parentheses needed

[tandrii(chromium), 2016/11/04 14:48:17]

Done.

+
+  def GetTryjobProperties(self, patchset=None):
+    """Returns dictionary of properties to launch tryjob."""
+    data = self._GetChangeDetail(['ALL_REVISIONS'])
+    patchset = int(patchset or self.GetPatchset())
+    assert patchset
+    revision_data = None  # Pylint wants it to be defined.
+    for revision_data in data['revisions'].itervalues():
+      if int(revision_data['_number']) == patchset:
+        break
+    else:
+      raise Exception('Patchset %d is not known in Gerrit issue %d' %
+                      (patchset, self.GetIssue()))
+    return {
+      'patch_issue': self.GetIssue(),
+      'patch_set': patchset or self.GetPatchset(),
+      'patch_project': data['project'],
+      'patch_storage': 'gerrit',
+      'patch_ref': revision_data['fetch']['http']['ref'],
+      'patch_repository_url': revision_data['fetch']['http']['url'],
+      'patch_gerrit_url': self.GetCodereviewServer(),
+    }
 
   def GetIssueOwner(self):
-    # TODO(tandrii): implement for Gerrit.
-    raise NotImplementedError()
-
-  def GetIssueProject(self):
-    # TODO(tandrii): implement for Gerrit.
-    raise NotImplementedError()
+    return self._GetChangeDetail(['DETAILED_ACCOUNTS'])['owner']['email']
 
 
 _CODEREVIEW_IMPLEMENTATIONS = {
   'rietveld': _RietveldChangelistImpl,
   'gerrit': _GerritChangelistImpl,
 }
 
 
 def _add_codereview_issue_select_options(parser, extra=""):
   _add_codereview_select_options(parser)
@@ skipping 1930 matching lines @@
   if bad_params:
     parser.error('Got properties with missing "=": %s' % bad_params)
 
   if args:
     parser.error('Unknown arguments: %s' % args)
 
   cl = Changelist(auth_config=auth_config)
   if not cl.GetIssue():
     parser.error('Need to upload first')
 
-  if cl.IsGerrit():
-    parser.error(
-        'Not yet supported for Gerrit (http://crbug.com/599931).\n'
-        'If your project has Commit Queue, dry run is a workaround:\n'
-        '  git cl set-commit --dry-run')
-
   error_message = cl.CannotTriggerTryJobReason()
   if error_message:
     parser.error('Can\'t trigger try jobs: %s' % error_message)
 
   if options.bucket and options.master:
     parser.error('Only one of --bucket and --master may be used.')
 
   buckets = _get_bucket_map(cl, options, parser)
 
   # If no bots are listed and we couldn't get a list based on PRESUBMIT files,
@@ skipping 522 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)