Make the presubmit output much more compact.

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2006-2009 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.
 
 """Enables directory-specific presubmit checks to run at upload and/or commit.
 """
 
 __version__ = '1.3.1'
 
@@ skipping 73 matching lines @@
         output_stream: Where to write
 
       Returns:
         True if execution may continue, False otherwise.
       """
       output_stream.write(self._message)
       output_stream.write('\n')
       for item in self._items:
         output_stream.write('  %s\n' % item)
       if self._long_text:
-        output_stream.write('\n***************\n%s\n***************\n\n' %
+        output_stream.write('\n***************\n%s\n***************\n' %
                             self._long_text)
 
       if self.ShouldPrompt() and may_prompt:
         output_stream.write('Are you sure you want to continue? (y/N): ')
         response = input_stream.readline()
         if response.strip().lower() != 'y':
           return False
 
       return not self.IsFatal()
 
@@ skipping 582 matching lines @@
       result = ()  # no error since the script doesn't care about current event.
 
     return result
 
 
 def DoPresubmitChecks(change_info,
                       committing,
                       verbose,
                       output_stream,
                       input_stream,
-                      default_presubmit):
+                      default_presubmit,
+                      may_prompt):
   """Runs all presubmit checks that apply to the files in the change.
 
   This finds all PRESUBMIT.py files in directories enclosing the files in the
   change (up to the repository root) and calls the relevant entrypoint function
   depending on whether the change is being committed or uploaded.
 
   Prints errors, warnings and notifications.  Prompts the user for warnings
   when needed.
 
   Args:
     change_info: The ChangeInfo object for the change.
     committing: True if 'gcl commit' is running, False if 'gcl upload' is.
     verbose: Prints debug info.
     output_stream: A stream to write output from presubmit tests to.
     input_stream: A stream to read input from the user.
     default_presubmit: A default presubmit script to execute in any case.
+    may_prompt: Enable (y/n) questions on warning or error.
 
   Return:
     True if execution can continue, False if not.
   """
   checkout_root = gcl.GetRepositoryRoot()
   presubmit_files = ListRelevantPresubmitFiles(change_info.FileList(),
                                                checkout_root)
   if not presubmit_files and verbose:
     output_stream.write("Warning, no presubmit.py found.\n")
   results = []
@@ skipping 20 matching lines @@
     elif result.ShouldPrompt():
       warnings.append(result)
     else:
       errors.append(result)
 
   error_count = 0
   for name, items in (('Messages', notifications),
                       ('Warnings', warnings),
                       ('ERRORS', errors)):
     if items:
-      output_stream.write('\n** Presubmit %s **\n\n' % name)
+      output_stream.write('** Presubmit %s **\n' % name)
       for item in items:
         if not item._Handle(output_stream, input_stream,
                             may_prompt=False):
           error_count += 1
         output_stream.write('\n')
   if not errors and warnings:
     output_stream.write(
       'There were presubmit warnings. Sure you want to continue? (y/N): ')
     response = input_stream.readline()
     if response.strip().lower() != 'y':
@@ skipping 33 matching lines @@
                    help="Verbose output")
   options, args = parser.parse_args(argv[1:])
   files = ParseFiles(args, options.recursive)
   if options.verbose:
     print "Found %d files." % len(files)
   return not DoPresubmitChecks(gcl.ChangeInfo('No name', 0, 0, '', files),
                                options.commit,
                                options.verbose,
                                sys.stdout,
                                sys.stdin,
-                               default_presubmit=None)
+                               None,
+                               False)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))