gclient: fix --delete_unversioned_trees bug

gclient.py

 #!/usr/bin/env python
 # 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 1296 matching lines @@
               for path in path_list)
 
         # Use entry and not entry_fixed there.
         if (entry not in entries and
             (not any(path.startswith(entry + '/') for path in entries)) and
             os.path.exists(e_dir)):
           scm = gclient_scm.CreateSCM(
               prev_url, self.root_dir, entry_fixed, self.outbuf)
 
           # Check to see if this directory is now part of a higher-up checkout.
-          if scm.GetCheckoutRoot() in full_entries:
+          # The directory might be part of a git OR svn checkout.
+          scm_root = None
+          for scm_class in (gclient_scm.scm.GIT, gclient_scm.scm.SVN):
+            try:
+              scm_root = scm_class.GetCheckoutRoot(scm.checkout_path)
+            except subprocess2.CalledProcessError:
+              pass
+            if scm_root:
+              break
+          else:
+            logging.warning('Could not find checkout root for %s. Unable to '
+                            'determine whether it is part of a higher-level '
+                            'checkout, so not removing.' % entry)
+            continue
+          if scm_root in full_entries:
             logging.info('%s is part of a higher level checkout, not '
                          'removing.', scm.GetCheckoutRoot())
             continue
 
           file_list = []
           scm.status(self._options, [], file_list)
           modified_files = file_list != []
           if (not self._options.delete_unversioned_trees or
               (modified_files and not self._options.force)):
             # There are modified files in this entry. Keep warning until
@@ skipping 640 matching lines @@
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
   finally:
     gclient_utils.PrintWarnings()
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: