Another attempt: gclient: delete mismatching checkouts

scm.py

 # Copyright (c) 2012 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 148 matching lines @@
   def GetBranchRef(cwd):
     """Returns the full branch reference, e.g. 'refs/heads/master'."""
     return GIT.Capture(['symbolic-ref', 'HEAD'], cwd=cwd)
 
   @staticmethod
   def GetBranch(cwd):
     """Returns the short branch name, e.g. 'master'."""
     return GIT.ShortBranchName(GIT.GetBranchRef(cwd))
 
   @staticmethod
+  def IsGit(cwd):
+    """Returns True if this repo looks like it's using git."""
+    if os.path.exists(os.path.join(cwd, '.git')):
+      return True
+    if os.path.isdir(os.path.join(cwd, '.svn')):
+      return False
+    try:
+      GIT.Capture(['config', '--local', '--list'], cwd=cwd)
+      return True
+    except subprocess2.CalledProcessError:
+      return False
+
+  @staticmethod
   def IsGitSvn(cwd):
-    """Returns true if this repo looks like it's using git-svn."""
+    """Returns True if this repo looks like it's using git-svn."""
     # If you have any "svn-remote.*" config keys, we think you're using svn.
     try:
       GIT.Capture(['config', '--local', '--get-regexp', r'^svn-remote\.'],
                   cwd=cwd)
       return True
     except subprocess2.CalledProcessError:
       return False
 
   @staticmethod
   def MatchSvnGlob(url, base_url, glob_spec, allow_wildcards):
@@ skipping 926 matching lines @@
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise