gclient: fix to support reading .gclient_entries in old list format

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 728 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):
-          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:
+          modified_files = False
+          if isinstance(prev_entries,list):

[M-A Ruel, 2009/09/28 18:49:08]

if isinstance(prev_entries, list):

+            # old .gclient_entries format was list, now dict
+            modified_files = gclient_scm.CaptureSVNStatus(e_dir)
+          else:
+            file_list = []
+            scm = gclient_scm.CreateSCM(prev_entries[entry], self._root_dir,
+                                        entry_fixed)
+            scm.status(self._options, [], file_list)
+            modified_files = file_list != []
+          if not self._options.delete_unversioned_trees or modified_files:
             # There are modified files in this entry. Keep warning until
             # removed.
             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)
@@ skipping 419 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: