Make more tests pass on Windows.

scm.py

 # 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 56 matching lines @@
   return result
 
 
 def determine_scm(root):
   """Similar to upload.py's version but much simpler.
 
   Returns 'svn', 'git' or None.
   """
   if os.path.isdir(os.path.join(root, '.svn')):
     return 'svn'
-  elif os.path.isdir(os.path.join(root, '.svn')):
+  elif os.path.isdir(os.path.join(root, '.git')):
     return 'git'
   else:
-    if (0 == subprocess.call(
+    try:
+      subprocess2.check_output(

[Dirk Pranke, 2011/04/05 21:01:29]

I wonder if it makes sense to have another method in subprocess2 that executes a
command and raises on error, but doesn't return any output at all. Here
check_output() is returning stdout and you're ignoring it; I had to go look at
subprocess2 to remember what the difference between this and check_call() was.

           ['git', 'rev-parse', '--show-cdup'],
-          stdout=subprocess.PIPE, cwd=root)):
+          stdout=subprocess2.VOID,
+          cwd=root)
       return 'git'
-    else:
+    except (OSError, subprocess2.CalledProcessError):
       return None
 
 
 class GIT(object):
   @staticmethod
   def Capture(args, **kwargs):
     return gclient_utils.CheckCall(['git'] + args, print_error=False,
         **kwargs)[0]
 
   @staticmethod
@@ skipping 885 matching lines @@
       if (file_status[0][0] in ('D', 'A', '!') or
           not file_status[0][1:].isspace()):
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         try:
           SVN.Capture(['revert', file_status[1]], cwd=repo_root)
         except gclient_utils.CheckCallError:
           if not os.path.exists(file_path):
             continue
           raise