Fixing errors in gclient on a gclient revert --nohooks on windows....

gclient_scm.py

 # Copyright 2009 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
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 165 matching lines @@
             from_info['Repository Root'],
             to_info['Repository Root'])
       else:
         if CaptureSVNStatus(checkout_path):
           raise gclient_utils.Error("Can't switch the checkout to %s; UUID "
                                     "don't match and there is local changes "
                                     "in %s. Delete the directory and "
                                     "try again." % (url, checkout_path))
         # Ok delete it.
         print("\n_____ switching %s to a new checkout" % self.relpath)
-        RemoveDirectory(checkout_path)
+        gclient_utils.RemoveDirectory(checkout_path)
         # We need to checkout.
         command = ['checkout', url, checkout_path]
         if revision:
           command.extend(['--revision', str(revision)])
         RunSVNAndGetFileList(command, self._root_dir, file_list)
         return
 
 
     # If the provided url has a revision number that matches the revision
     # number of the existing directory, then we don't need to bother updating.
@@ skipping 28 matching lines @@
       file_path = os.path.join(path, file[1])
       print(file_path)
       # Unversioned file or unexpected unversioned file.
       if file[0][0] in ('?', '~'):
         # Remove extraneous file. Also remove unexpected unversioned
         # directories. svn won't touch them but we want to delete these.
         file_list.append(file_path)
         try:
           os.remove(file_path)
         except EnvironmentError:
-          RemoveDirectory(file_path)
+          gclient_utils.RemoveDirectory(file_path)
 
       if file[0][0] != '?':
         # For any other status, svn revert will work.
         file_list.append(file_path)
         files_to_revert.append(file[1])
 
     # Revert them all at once.
     if files_to_revert:
       accumulated_paths = []
       accumulated_length = 0
@@ skipping 322 matching lines @@
                           xml_props_status)
         # Col 2
         if wc_status[0].getAttribute('wc-locked') == 'true':
           statuses[2] = 'L'
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         item = (''.join(statuses), file)
         results.append(item)
   return results