commit c98c0c52498632481f0073f55b4ef2918d0b5d63
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Apr 06 13:39:43 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Apr 06 13:39:43 2011 +0000
tree 46535f69243cb3e40fcb32fdccd65cbe63700b25
parent ccbb781aa74edd28411c9f77b3477242841f6b5b

Make more tests pass on Windows.

Also fix a few issues found along the way.

Tests had regressed a lot. Add a lot of tweaks to make most test pass.

R=dpranke@chromium.org
BUG=
TEST=

Review URL: http://codereview.chromium.org/6792060

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@80618 0039d316-1c4b-4281-b951-d872f2087c98

scm.py

diff --git a/scm.py b/scm.py
index 67dd747..31b18f6 100644
--- a/scm.py
+++ b/scm.py
@@ -74,14 +74,16 @@
   """
   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(
           ['git', 'rev-parse', '--show-cdup'],
-          stdout=subprocess.PIPE, cwd=root)):
+          stdout=subprocess2.VOID,
+          cwd=root)
       return 'git'
-    else:
+    except (OSError, subprocess2.CalledProcessError):
       return None