gclient: don't make SVN-specific calls in RunOnDeps

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 54 matching lines @@
     ]
 """
 
 __author__ = "darinf@gmail.com (Darin Fisher)"
 __version__ = "0.3.3"
 
 import errno
 import logging
 import optparse
 import os
+import pprint
 import re
 import stat
 import sys
 import urlparse
 import urllib
 
 import gclient_scm
 import gclient_utils
 from gclient_utils import Error, FileRead, FileWrite
 
@@ skipping 282 matching lines @@
     })
 
   def _SaveEntries(self, entries):
     """Creates a .gclient_entries file to record the list of unique checkouts.
 
     The .gclient_entries file lives in the same directory as .gclient.
 
     Args:
       entries: A sequence of solution names.
     """
-    text = "entries = [\n"
-    for entry in entries:
-      text += "  \"%s\",\n" % entry
-    text += "]\n"
-    FileWrite(os.path.join(self._root_dir, self._options.entries_filename),
-              text)
+    text = "entries = \\\n" + pprint.pformat(entries, 2) + '\n'
+    file_path = os.path.join(self._root_dir, self._options.entries_filename)
+    FileWrite(file_path, text)
 
   def _ReadEntries(self):
     """Read the .gclient_entries file for the given client.
 
     Args:
       client: The client for which the entries file should be read.
 
     Returns:
       A sequence of solution names, which will be empty if there is the
       entries file hasn't been created yet.
@@ skipping 348 matching lines @@
       # Notify the user if there is an orphaned entry in their working copy.
       # Only delete the directory if there are no changes in it, and
       # delete_unversioned_trees is set to true.
       prev_entries = self._ReadEntries()
       for entry in prev_entries:
         # Fix path separator on Windows.
         entry_fixed = entry.replace('/', os.path.sep)
         e_dir = os.path.join(self._root_dir, entry_fixed)
         # Use entry and not entry_fixed there.
         if entry not in entries and os.path.exists(e_dir):
-          if not self._options.delete_unversioned_trees or \
-             gclient_scm.CaptureSVNStatus(e_dir):
+          file_list = []
+          scm = gclient_scm.CreateSCM(prev_entries[entry], self._root_dir,
+                                      entry_fixed)
+          scm.status(self._options, [], file_list)
+          if not self._options.delete_unversioned_trees or file_list:
             # There are modified files in this entry. Keep warning until
             # removed.
-            entries[entry] = None
             print(("\nWARNING: \"%s\" is no longer part of this client.  "
                    "It is recommended that you manually remove it.\n") %
                       entry_fixed)
           else:
             # Delete the entry
             print("\n________ deleting \'%s\' " +
                   "in \'%s\'") % (entry_fixed, self._root_dir)
             gclient_utils.RemoveDirectory(e_dir)
       # record the current list of entries for next time
       self._SaveEntries(entries)
@@ skipping 417 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: