Revert of CQ to always post a message when Commit box is unchecked.

pending_manager.py

 # coding=utf8
 # 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.
 """Commit queue manager class.
 
 Security implications:
 
 The following hypothesis are made:
 - Commit queue:
@@ skipping 179 matching lines @@
 
       raise
 
     # If there is an issue in processed_issues that is not in new_issues,
     # discard it.
     for pending in self.queue.iterate():
       # Note that pending.issue is a int but self.queue.pending_commits keys
       # are str due to json support.
       if pending.issue not in new_issues:
         logging.info('Flushing issue %d' % pending.issue)
+        self.context.status.send(
+            pending,
+            { 'verification': 'abort',
+              'payload': {
+                'output': 'CQ bit was unchecked on CL. Ignoring.' }})
         pending.get_state = lambda: base.IGNORED
-        self._discard_pending(pending, 'CQ bit was unchecked on CL. Ignoring.')
+        self._discard_pending(pending, None)
 
     # Find new issues.
     for issue_id in new_issues:
       if str(issue_id) not in self.queue.pending_commits:
         try:
           issue_data = self.context.rietveld.get_issue_properties(
               issue_id, True)
         except urllib2.HTTPError as e:
           if e.code in (500, 502, 503):
             # Temporary AppEngine hiccup. Just log it and continue.
@@ skipping 47 matching lines @@
         # Take in account the case where a verifier was removed.
         done = set(pending.verifications.keys())
         missing = expected - done
         if (not missing or pending.get_state() != base.PROCESSING):
           continue
         logging.info(
             'Processing issue %s (%s, %d)' % (
                 pending.issue, missing, pending.get_state()))
         self._verify_pending(pending)
       except base.DiscardPending as e:
-        message = e.status
-        if not message:
-          message = 'process_new_pending_commit: ' + self.FAILED_NO_MESSAGE
-        self._discard_pending(e.pending, message)
+        self._discard_pending(e.pending, e.status)
 
   def update_status(self):
     """Updates the status for each pending commit verifier."""
     why_nots = dict((p.issue, p.why_not()) for p in self.queue.iterate())
 
     for verifier in self.all_verifiers:
       try:
         verifier.update_status(self.queue.iterate())
       except base.DiscardPending as e:
         # It's not efficient since it takes a full loop for each pending
         # commit to discard.
-        message = e.status
-        if not message:
-          message = 'update_status: ' + self.FAILED_NO_MESSAGE
-        self._discard_pending(e.pending, message)
+        self._discard_pending(e.pending, e.status)
 
     for pending in self.queue.iterate():
       why_not = pending.why_not()
       if why_nots[pending.issue] != why_not:
         self.context.status.send(
             pending,
             {'verification': 'why not',
              'payload': {'message': why_not}})
 
 
   def scan_results(self):
     """Scans pending commits that can be committed or discarded."""
     for pending in self.queue.iterate():
       state = pending.get_state()
       if state == base.FAILED:
-        message = pending.error_message()
-        if not message:
-          message = 'scan_results(FAILED): ' + self.FAILED_NO_MESSAGE
-        self._discard_pending(pending, message)
+        self._discard_pending(
+            pending, pending.error_message() or self.FAILED_NO_MESSAGE)
       elif state == base.SUCCEEDED:
         if self._throttle(pending):
           continue
         try:
           # Runs checks. It's be nice to run the test before the postpone,
           # especially if the tree is closed for a long moment but at the same
           # time it would keep fetching the rietveld status constantly.
           self._last_minute_checks(pending)
           self.context.status.send(
               pending,
               {'verification': 'why not',
                'payload': {'message': ''}})
 
           self._commit_patch(pending)
         except base.DiscardPending as e:
-          message = e.status
-          if not message:
-            message = 'scan_results(discard): ' + self.FAILED_NO_MESSAGE
-          self._discard_pending(e.pending, message)
+          self._discard_pending(e.pending, e.status)
         except Exception as e:
-          message = 'scan_result(Exception): ' + self.INTERNAL_EXCEPTION
-          self._discard_pending(pending, message)
+          self._discard_pending(pending, self.INTERNAL_EXCEPTION)
           raise
       else:
         # When state is IGNORED, we need to keep this issue so it's not fetched
         # another time but we can't discard it since we don't want to remove the
         # commit bit for another project hosted on the same code review
         # instance.
         assert state in (base.PROCESSING, base.IGNORED)
 
   def _verify_pending(self, pending):
     """Initiates all the verifiers on a pending change."""
@@ skipping 84 matching lines @@
           pending,
           'List of reviewers changed. %s did a drive-by without LGTM\'ing!' %
           ','.join(drivers_by))
     if pending.patchset != pending_data['patchsets'][-1]:
       raise base.DiscardPending(pending,
           'Commit queue failed due to new patchset.')
 
   def _discard_pending(self, pending, message):
     """Discards a pending commit. Attach an optional message to the review."""
     logging.debug('_discard_pending(%s, %s)', pending.issue, message)
-    msg = message or self.FAILED_NO_MESSAGE
     try:
       try:
         if pending.get_state() != base.IGNORED:
           self.context.rietveld.set_flag(
               pending.issue, pending.patchset, 'commit', False)
       except urllib2.HTTPError as e:
         logging.error(
             'Failed to set the flag to False for %s with message %s' % (
-              pending.pending_name(), msg))
+              pending.pending_name(), message))
         traceback.print_stack()
         logging.error(str(e))
         errors.send_stack(e)
-      try:
-        self.context.rietveld.add_comment(pending.issue, msg)
-      except urllib2.HTTPError as e:
-        logging.error(
-            'Failed to add comment for %s with message %s' % (
-              pending.pending_name(), msg))
-        traceback.print_stack()
-        errors.send_stack(e)
-      self.context.status.send(
-          pending,
-          { 'verification': 'abort',
-            'payload': {
-              'output': msg }})
+      if message:
+        try:
+          self.context.rietveld.add_comment(pending.issue, message)
+        except urllib2.HTTPError as e:
+          logging.error(
+              'Failed to add comment for %s with message %s' % (
+                pending.pending_name(), message))
+          traceback.print_stack()
+          errors.send_stack(e)
+        self.context.status.send(
+            pending,
+            { 'verification': 'abort',
+              'payload': {
+                'output': message }})
     finally:
       # Most importantly, remove the PendingCommit from the queue.
       self.queue.remove(pending.issue)
 
   def _commit_patch(self, pending):
     """Commits the pending patch to the repository.
 
     Do the checkout and applies the patch.
     """
     try:
@@ skipping 58 matching lines @@
       except (
           checkout.PatchApplicationFailed, patch.UnsupportedPatchFormat) as e:
         raise base.DiscardPending(pending, str(e))
       except subprocess2.CalledProcessError as e:
         stdout = getattr(e, 'stdout', None)
         out = 'Failed to apply the patch.'
         if stdout:
           out += '\n%s' % stdout
         raise base.DiscardPending(pending, out)
     except base.DiscardPending as e:
-      message = e.status
-      if not message:
-        message = '_commit_patch: ' + self.FAILED_NO_MESSAGE
-      self._discard_pending(e.pending, message)
+      self._discard_pending(e.pending, e.status)
 
   def _throttle(self, pending):
     """Returns True if a commit should be delayed."""
     if pending.postpone():
       self.context.status.send(
           pending,
           {'verification': 'why not',
            'payload': {
                'message': pending.why_not()}})
       return True
@@ skipping 19 matching lines @@
     """Loads the commit queue state from a JSON file."""
     self.queue = model.load_from_json_file(filename)
 
   def save(self, filename):
     """Save the commit queue state in a simple JSON file."""
     model.save_to_json_file(filename, self.queue)
 
   def close(self):
     """Close all the active pending manager items."""
     self.context.status.close()