Add a way to require approval from owners other than the author.

presubmit_canned_checks.py

 # 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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 import os as _os
 _HERE = _os.path.dirname(_os.path.abspath(__file__))
 
 
@@ skipping 751 matching lines @@
       out.append('%s has %d build(s) pending' %
                   (builder_name, pending_builds_len))
   if out:
     return [output_api.PresubmitPromptWarning(
         'Build(s) pending. It is suggested to wait that no more than %d '
             'builds are pending.' % max_pendings,
         long_text='\n'.join(out))]
   return []
 
 
-def CheckOwners(input_api, output_api, source_file_filter=None):
+def CheckOwners(input_api, output_api, source_file_filter=None,
+                author_counts_as_owner=True):
   if input_api.is_committing:
     if input_api.tbr:
       return [output_api.PresubmitNotifyResult(
           '--tbr was specified, skipping OWNERS check')]
     if not input_api.change.issue:
       return [output_api.PresubmitError("OWNERS check failed: this change has "
           "no Rietveld issue number, so we can't check it for approvals.")]
     needed = 'LGTM from an OWNER'
     output = output_api.PresubmitError
   else:
     needed = 'OWNER reviewers'
     output = output_api.PresubmitNotifyResult
 
   affected_files = set([f.LocalPath() for f in
       input_api.change.AffectedFiles(file_filter=source_file_filter)])
 
   owners_db = input_api.owners_db
   owner_email, reviewers = _RietveldOwnerAndReviewers(
       input_api,
       owners_db.email_regexp,
       approval_needed=input_api.is_committing)
 
-  if owner_email:
+  if author_counts_as_owner:
+    if owner_email:
+      message = ''
+      reviewers_plus_owner = reviewers.union(set([owner_email]))
+    else:
+      message = ('\nUntil the issue is uploaded, this list will include '
+                 'files for which you are an OWNER.')
+      owner_email = ''
+      reviewers_plus_owner = set()
+    missing_files = owners_db.files_not_covered_by(affected_files,
+                                                   reviewers_plus_owner)
+  else:
     message = ''
-    reviewers_plus_owner = reviewers.union(set([owner_email]))
-  else:
-    message = ('\nUntil the issue is uploaded, this list will include '
-               'files for which you are an OWNER.')
-    owner_email = ''
-    reviewers_plus_owner = set()
+    missing_files = owners_db.files_not_covered_by(affected_files, reviewers)
 
-  missing_files = owners_db.files_not_covered_by(affected_files,
-                                                 reviewers_plus_owner)
   if missing_files:
     output_list = [
         output('Missing %s for these files:\n    %s%s' %
                (needed, '\n    '.join(missing_files), message))]
     if not input_api.is_committing:
-      suggested_owners = owners_db.reviewers_for(affected_files)
+      suggested_owners = owners_db.reviewers_for(affected_files, owner_email)
       output_list.append(output('Suggested OWNERS:\n    %s' %
-                                ('\n    '.join(suggested_owners))))
+                                ('\n    '.join(suggested_owners or []))))
     return output_list
 
   if input_api.is_committing and not reviewers:
     return [output('Missing LGTM from someone other than %s' % owner_email)]
   return []
 
 
 def _GetRietveldIssueProps(input_api, messages):
   """Gets the issue properties from rietveld."""
   issue = input_api.change.issue
@@ skipping 184 matching lines @@
     snapshot("checking description")
     results.extend(input_api.canned_checks.CheckChangeHasDescription(
         input_api, output_api))
     results.extend(input_api.canned_checks.CheckDoNotSubmitInDescription(
         input_api, output_api))
     snapshot("checking do not submit in files")
     results.extend(input_api.canned_checks.CheckDoNotSubmitInFiles(
         input_api, output_api))
   snapshot("done")
   return results