Make more tests pass on Windows.

scm.py

Index: scm.py
diff --git a/scm.py b/scm.py
index 67dd747d4d47938c823c58314b1697a87664ee9e..31b18f67796c0cc5659e12339067d6eaa97ffd5f 100644
--- a/scm.py
+++ b/scm.py
@@ -74,14 +74,16 @@ def determine_scm(root):
   """
   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