Git support in presubmit tests....

gclient_scm.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 
 import logging
 import os
 import re
 import subprocess
 import sys
 import xml.dom.minidom
 
 import gclient_utils
 
 SVN_COMMAND = "svn"
+GIT_COMMAND = "git"
 
 
 ### SCM abstraction layer
 
 
 # Factory Method for SCM wrapper creation
 
 def CreateSCM(url=None, root_dir=None, relpath=None, scm_name='svn'):
   # TODO(maruel): Deduce the SCM from the url.
   scm_map = {
@@ skipping 394 matching lines @@
               line.startswith(self.working_prefix)):
             self.ReplaceAndPrint(line)
           else:
             print line
 
     filterer = DiffFilterer(self.relpath)
     RunSVNAndFilterOutput(command, path, False, False, filterer.Filter)
 
 
 # -----------------------------------------------------------------------------
+# Git utils:
+
+
+def CaptureGit(args, in_directory=None, print_error=True):
+  """Runs git, capturing output sent to stdout as a string.
+
+  Args:
+    args: A sequence of command line parameters to be passed to git.
+    in_directory: The directory where git is to be run.
+
+  Returns:
+    The output sent to stdout as a string.
+  """
+  c = [GIT_COMMAND]
+  c.extend(args)
+
+  # *Sigh*:  Windows needs shell=True, or else it won't search %PATH% for
+  # the git.exe executable, but shell=True makes subprocess on Linux fail
+  # when it's called with a list because it only tries to execute the
+  # first string ("git").
+  stderr = None
+  if not print_error:
+    stderr = subprocess.PIPE
+  return subprocess.Popen(c,
+                          cwd=in_directory,
+                          shell=sys.platform.startswith('win'),
+                          stdout=subprocess.PIPE,
+                          stderr=stderr).communicate()[0]
+
+
+def CaptureGitStatus(files):
+  """Returns git status.
+
+  @files can be a string (one file) or a list of files.
+
+  Returns an array of (status, file) tuples."""
+  command = ["diff", "--name-status", "-r", "origin.."]
+  if not files:
+    pass
+  elif isinstance(files, basestring):
+    command.append(files)
+  else:
+    command.extend(files)
+
+  status = CaptureGit(command).rstrip()
+  results = []
+  if status:
+    for statusline in status.split('\n'):
+      m = re.match('^(\w)\t(.+)$', statusline)
+      if not m:
+        raise Exception("status currently unsupported: %s" % statusline)
+      results.append(('%s      ' % m.group(1), m.group(2)))
+  return results
+
+
+# -----------------------------------------------------------------------------
 # SVN utils:
 
 
 def RunSVN(args, in_directory):
   """Runs svn, sending output to stdout.
 
   Args:
     args: A sequence of command line parameters to be passed to svn.
     in_directory: The directory where svn is to be run.
 
@@ skipping 241 matching lines @@
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         # Col 4
         if wc_status[0].getAttribute('switched') == 'true':
           statuses[4] = 'S'
         # TODO(maruel): Col 5 and 6
         item = (''.join(statuses), file)
         results.append(item)
   return results