Add verbose support throught presubmit checks

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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."""
 
 import errno
@@ skipping 38 matching lines @@
 DESCRIPTION_BACKUP_FILE = '~/.git_cl_description_backup'
 
 
 def DieWithError(message):
   print >> sys.stderr, message
   sys.exit(1)
 
 
 def Popen(cmd, **kwargs):
   """Wrapper for subprocess.Popen() that logs and watch for cygwin issues"""
-  logging.info('Popen: ' + ' '.join(cmd))
+  logging.debug('Popen: ' + ' '.join(cmd))
   try:
     return subprocess.Popen(cmd, **kwargs)
   except OSError, e:
     if e.errno == errno.EAGAIN and sys.platform == 'cygwin':
       DieWithError(
           'Visit '
           'http://code.google.com/p/chromium/wiki/CygwinDllRemappingFailure to '
           'learn how to fix this error; you need to rebase your cygwin dlls')
     raise
 
@@ skipping 733 matching lines @@
 
 
 def ConvertToInteger(inputval):
   """Convert a string to integer, but returns either an int or None."""
   try:
     return int(inputval)
   except (TypeError, ValueError):
     return None
 
 
-def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt):
+def RunHook(committing, upstream_branch, rietveld_server, tbr, may_prompt,
+    verbose):
   """Calls sys.exit() if the hook fails; returns a HookResults otherwise."""
   root = RunCommand(['git', 'rev-parse', '--show-cdup']).strip()
   if not root:
     root = '.'
   absroot = os.path.abspath(root)
   if not root:
     raise Exception('Could not get root directory.')
 
   # We use the sha1 of HEAD as a name of this change.
   name = RunCommand(['git', 'rev-parse', 'HEAD']).strip()
@@ skipping 12 matching lines @@
                               '%s...' % (upstream_branch)]).strip()
   change = presubmit_support.GitChange(name, description, absroot, files,
                                        issue, patchset)
 
   # Apply watchlists on upload.
   if not committing:
     watchlist = watchlists.Watchlists(change.RepositoryRoot())
     files = [f.LocalPath() for f in change.AffectedFiles()]
     cl.SetWatchers(watchlist.GetWatchersForPaths(files))
 
-  output = presubmit_support.DoPresubmitChecks(change, committing,
-      verbose=False, output_stream=sys.stdout, input_stream=sys.stdin,
-      default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
-      host_url=cl.GetRietveldServer())
+  try:
+    output = presubmit_support.DoPresubmitChecks(change, committing,
+        verbose=verbose, output_stream=sys.stdout, input_stream=sys.stdin,
+        default_presubmit=None, may_prompt=may_prompt, tbr=tbr,
+        host_url=cl.GetRietveldServer())
+  except presubmit_support.PresubmitFailure, e:
+    DieWithError(
+        ('%s\nMaybe your depot_tools is out of date?\n'
+         'If all fails, contact maruel@') % e)
 
   # TODO(dpranke): We should propagate the error out instead of calling exit().
   if not output.should_continue():
     sys.exit(1)
 
   return output
 
 
 def CMDpresubmit(parser, args):
   """run presubmit tests on the current changelist"""
@@ skipping 10 matching lines @@
 
   cl = Changelist()
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
 
   RunHook(committing=not options.upload, upstream_branch=base_branch,
           rietveld_server=cl.GetRietveldServer(), tbr=False,
-          may_prompt=False)
+          may_prompt=False, verbose=options.verbose)
   return 0
 
 
 @usage('[args to "git diff"]')
 def CMDupload(parser, args):
   """upload the current changelist to codereview"""
   parser.add_option('--bypass-hooks', action='store_true', dest='bypass_hooks',
                     help='bypass upload presubmit hook')
   parser.add_option('-f', action='store_true', dest='force',
                     help="force yes to questions (don't prompt)")
@@ skipping 23 matching lines @@
   if args:
     base_branch = args[0]
   else:
     # Default to diffing against the "upstream" branch.
     base_branch = cl.GetUpstreamBranch()
     args = [base_branch + "..."]
 
   if not options.bypass_hooks and not options.force:
     hook_results = RunHook(committing=False, upstream_branch=base_branch,
                            rietveld_server=cl.GetRietveldServer(), tbr=False,
-                           may_prompt=True)
+                           may_prompt=True, verbose=options.verbose)
     if not options.reviewers and hook_results.reviewers:
       options.reviewers = hook_results.reviewers
 
 
   # --no-ext-diff is broken in some versions of Git, so try to work around
   # this by overriding the environment (but there is still a problem if the
   # git config key "diff.external" is used).
   env = os.environ.copy()
   if 'GIT_EXTERNAL_DIFF' in env:
     del env['GIT_EXTERNAL_DIFF']
@@ skipping 132 matching lines @@
     if extra_commits:
       print ('This branch has %d additional commits not upstreamed yet.'
              % len(extra_commits.splitlines()))
       print ('Upstream "%s" or rebase this branch on top of the upstream trunk '
              'before attempting to %s.' % (base_branch, cmd))
       return 1
 
   if not options.bypass_hooks and not options.force:
     RunHook(committing=True, upstream_branch=base_branch,
             rietveld_server=cl.GetRietveldServer(), tbr=options.tbr,
-            may_prompt=True)
+            may_prompt=True, verbose=options.verbose)
 
     if cmd == 'dcommit':
       # Check the tree status if the tree status URL is set.
       status = GetTreeStatus()
       if 'closed' == status:
         print ('The tree is closed.  Please wait for it to reopen. Use '
                '"git cl dcommit -f" to commit on a closed tree.')
         return 1
       elif 'unknown' == status:
         print ('Unable to determine tree status.  Please verify manually and '
@@ skipping 312 matching lines @@
 def main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
   # Do it late so all commands are listed.
   CMDhelp.usage_more = ('\n\nCommands are:\n' + '\n'.join([
       '  %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip())
       for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
 
   # Create the option parse and add --verbose support.
   parser = optparse.OptionParser()
-  parser.add_option('-v', '--verbose', action='store_true')
+  parser.add_option(
+      '-v', '--verbose', action='count', default=0,
+      help='Use 2 times for more debugging info')
   old_parser_args = parser.parse_args
   def Parse(args):
     options, args = old_parser_args(args)
-    if options.verbose:
+    if options.verbose >= 2:
       logging.basicConfig(level=logging.DEBUG)
+    elif options.verbose:
+      logging.basicConfig(level=logging.INFO)
     else:
       logging.basicConfig(level=logging.WARNING)
     return options, args
   parser.parse_args = Parse
 
   if argv:
     command = Command(argv[0])
     if command:
       # "fix" the usage and the description now that we know the subcommand.
       GenUsage(parser, argv[0])
       try:
         return command(parser, argv[1:])
       except urllib2.HTTPError, e:
         if e.code != 500:
           raise
         DieWithError(
             ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
              'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
   # Not a known command. Default to help.
   GenUsage(parser, 'help')
   return CMDhelp(parser, argv)
 
 
 if __name__ == '__main__':
   fix_encoding.fix_encoding()
   sys.exit(main(sys.argv[1:]))