Improve presubmit_support.py handling of git checkout.

presubmit_support.py

 #!/usr/bin/python
 # Copyright (c) 2010 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.5'
 
@@ skipping 1035 matching lines @@
         dirs.remove('.svn')
       if '.git' in dirs:
         dirs.remove('.git')
       for name in files:
         if fnmatch.fnmatch(name, mask):
           results.append(os.path.join(root, name))
     return results
 
 
 def ParseFiles(args, recursive):
+  logging.debug('Searching for %s' % args)
   files = []
   for arg in args:
     files.extend([('M', f) for f in ScanSubDirs(arg, recursive)])
   return files
 
 
 def Main(argv):
   parser = optparse.OptionParser(usage="%prog [options]",
                                  version="%prog " + str(__version__))
   parser.add_option("-c", "--commit", action="store_true", default=False,
@@ skipping 10 matching lines @@
   parser.add_option("--issue", type='int', default=0)
   parser.add_option("--patchset", type='int', default=0)
   parser.add_option("--root", default=os.getcwd(),
                     help="Search for PRESUBMIT.py up to this directory. "
                     "If inherit-review-settings-ok is present in this "
                     "directory, parent directories up to the root file "
                     "system directories will also be searched.")
   parser.add_option("--default_presubmit")
   parser.add_option("--may_prompt", action='store_true', default=False)
   options, args = parser.parse_args(argv[1:])
-  if os.path.isdir(os.path.join(options.root, '.git')):
-    change_class = GitChange
-    if not options.files:
-      if args:
-        options.files = ParseFiles(args, options.recursive)
-      else:
-        # Grab modified files.
-        options.files = scm.GIT.CaptureStatus([options.root])
-  elif os.path.isdir(os.path.join(options.root, '.svn')):
+  if options.verbose:
+    logging.basicConfig(level=logging.DEBUG)
+  if os.path.isdir(os.path.join(options.root, '.svn')):
     change_class = SvnChange
     if not options.files:
       if args:
         options.files = ParseFiles(args, options.recursive)
       else:
         # Grab modified files.
         options.files = scm.SVN.CaptureStatus([options.root])
   else:
-    # Doesn't seem under source control.
-    change_class = Change
+    is_git = os.path.isdir(os.path.join(options.root, '.git'))
+    if not is_git:
+      is_git = (0 == subprocess.call(
+          ['git', 'rev-parse', '--show-cdup'],
+          stdout=subprocess.PIPE, cwd=options.root))
+    if is_git:
+      # Only look at the subdirectories below cwd.
+      change_class = GitChange
+      if not options.files:
+        if args:
+          options.files = ParseFiles(args, options.recursive)
+        else:
+          # Grab modified files.
+          options.files = scm.GIT.CaptureStatus([options.root])
+    else:
+      logging.info('Doesn\'t seem under source control.')
+      change_class = Change
   if options.verbose:
-    if len(options.files) != 1:
+    if not options.files:
+      print "Found no files."
+    elif len(options.files) != 1:
       print "Found %d files." % len(options.files)
     else:
       print "Found 1 file."
   return not DoPresubmitChecks(change_class(options.name,
                                             options.description,
                                             options.root,
                                             options.files,
                                             options.issue,
                                             options.patchset),
                                options.commit,
                                options.verbose,
                                sys.stdout,
                                sys.stdin,
                                options.default_presubmit,
                                options.may_prompt)
 
 
 if __name__ == '__main__':
   sys.exit(Main(sys.argv))