Make the presubmit output much more compact.

gcl.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.
 #
 # Wrapper script around Rietveld's upload.py that groups files into
 # changelists.
 
 import getpass
 import os
@@ skipping 710 matching lines @@
       # The file is not modified anymore. It should be removed from the set.
       pass
   os.chdir(previous_cwd)
   return "".join(diff)
 
 
 
 def OptionallyDoPresubmitChecks(change_info, committing, args):
   if FilterFlag(args, "--no_presubmit") or FilterFlag(args, "--force"):
     return True
-  return DoPresubmitChecks(change_info, committing=committing)
+  return DoPresubmitChecks(change_info, committing, True)
 
 
 def UploadCL(change_info, args):
   if not change_info.FileList():
     print "Nothing to upload, changelist is empty."
     return
   if not OptionallyDoPresubmitChecks(change_info, False, args):
     return
   no_try = FilterFlag(args, "--no_try") or FilterFlag(args, "--no-try")
 
@@ skipping 82 matching lines @@
   os.chdir(previous_cwd)
 
 
 def PresubmitCL(change_info):
   """Reports what presubmit checks on the change would report."""
   if not change_info.FileList():
     print "Nothing to presubmit check, changelist is empty."
     return
 
   print "*** Presubmit checks for UPLOAD would report: ***"
-  DoPresubmitChecks(change_info, committing=False)
+  DoPresubmitChecks(change_info, False, False)
 
-  print "\n\n*** Presubmit checks for COMMIT would report: ***"
-  DoPresubmitChecks(change_info, committing=True)
+  print "\n*** Presubmit checks for COMMIT would report: ***"
+  DoPresubmitChecks(change_info, True, False)
 
 
 def TryChange(change_info, args, swallow_exception):
   """Create a diff file of change_info and send it to the try server."""
   try:
     import trychange
   except ImportError:
     if swallow_exception:
       return
     ErrorExit("You need to install trychange.py to use the try server.")
@@ skipping 173 matching lines @@
     if len([file for suffix in CPP_EXTENSIONS if file.endswith(suffix)]):
       if len([file for prefix in IGNORE_PATHS if file.startswith(prefix)]):
         print "Ignoring non-Google styled file %s" % file
       else:
         cpplint.ProcessFile(file, cpplint._cpplint_state.verbose_level)
 
   print "Total errors found: %d\n" % cpplint._cpplint_state.error_count
   os.chdir(previous_cwd)
 
 
-def DoPresubmitChecks(change_info, committing):
+def DoPresubmitChecks(change_info, committing, may_prompt):
   """Imports presubmit, then calls presubmit.DoPresubmitChecks."""
   # Need to import here to avoid circular dependency.
   import presubmit_support
   root_presubmit = GetCachedFile('PRESUBMIT.py', use_root=True)
-  result = presubmit_support.DoPresubmitChecks(change_info,
-                                               committing,
+  result = presubmit_support.DoPresubmitChecks(change_info=change_info,
+                                               committing=committing,
                                                verbose=False,
                                                output_stream=sys.stdout,
                                                input_stream=sys.stdin,
-                                               default_presubmit=root_presubmit)
+                                               default_presubmit=root_presubmit,
+                                               may_prompt=may_prompt)
   if not result:
     print "\nPresubmit errors, can't continue (use --no_presubmit to bypass)"
   return result
 
 
 def Changes():
   """Print all the changelists and their files."""
   for cl in GetCLs():
     change_info = ChangeInfo.Load(cl, True, True)
     print "\n--- Changelist " + change_info.name + ":"
@@ skipping 104 matching lines @@
     # the files. This allows commands such as 'gcl diff xxx' to work.
     args =["svn", command]
     root = GetRepositoryRoot()
     args.extend([os.path.join(root, x) for x in change_info.FileList()])
     RunShell(args, True)
   return 0
 
 
 if __name__ == "__main__":
   sys.exit(main())