Fix output on Windows when gclient warns the user about a stale directory.

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 1360 matching lines @@
 
     is_using_git = IsUsingGit(self._root_dir, entries.keys())
     self._RunHooks(command, file_list, is_using_git)
 
     if command == 'update':
       # 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:
-        e_dir = os.path.join(self._root_dir, entry)
+        # 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 \
              CaptureSVNStatus(e_dir):
-            # There are modified files in this entry
-            entries[entry] = None  # Keep warning until removed.
-            print("\nWARNING: \"%s\" is no longer part of this client.  "
-                  "It is recommended that you manually remove it.\n") % entry
+            # 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, self._root_dir)
+                  "in \'%s\'") % (entry_fixed, self._root_dir)
             RemoveDirectory(e_dir)
       # record the current list of entries for next time
       self._SaveEntries(entries)
 
   def PrintRevInfo(self):
     """Output revision info mapping for the client and its dependencies. This
     allows the capture of a overall "revision" for the source tree that can
     be used to reproduce the same tree in the future. The actual output
     contains enough information (source paths, svn server urls and revisions)
     that it can be used either to generate external svn commands (without
@@ skipping 387 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: