Remove gclient_utils.RemoveDirectory().

scm.py

 # 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.
 
 """SCM-specific utility classes."""
 
 import cStringIO
 import glob
 import logging
 import os
@@ skipping 549 matching lines @@
           # directory.
           if len(file_list) == previous_list_len:
             if not IsKnownFailure():
               # No known svn error was found, bail out.
               raise
             # No file were checked out, so make sure the directory is
             # deleted in case it's messed up and try again.
             # Warning: It's bad, it assumes args[2] is the directory
             # argument.
             if os.path.isdir(args[2]):
-              gclient_utils.RemoveDirectory(args[2])
+              gclient_utils.rmtree(args[2])
           else:
             # Progress was made, convert to update since an aborted checkout
             # is now an update.
             args = ['update'] + args[1:]
         else:
           # It was an update or export.
           # We enforce that some progress has been made or a known failure.
           if len(file_list) == previous_list_len and not IsKnownFailure():
             # No known svn error was found and no progress, bail out.
             raise
@@ skipping 268 matching lines @@
             filename, cwd, data[filename], bogus_dir, full_move, revision))
       # Use StringIO since it can be messy when diffing a directory move with
       # full_move=True.
       buf = cStringIO.StringIO()
       for d in filter(None, diffs):
         buf.write(d)
       result = buf.getvalue()
       buf.close()
       return result
     finally:
-      gclient_utils.RemoveDirectory(bogus_dir)
+      gclient_utils.rmtree(bogus_dir)
 
   @staticmethod
   def _DiffItemInternal(filename, cwd, info, bogus_dir, full_move, revision):
     """Grabs the diff data."""
     command = ["diff", "--config-dir", bogus_dir, filename]
     if revision:
       command.extend(['--revision', revision])
     data = None
     if SVN.IsMovedInfo(info):
       if full_move:
@@ skipping 177 matching lines @@
       if os.path.exists(file_path):
         # svn revert is really stupid. It fails on inconsistent line-endings,
         # on switched directories, etc. So take no chance and delete everything!
         # In theory, it wouldn't be necessary for property-only change but then
         # it'd have to look for switched directories, etc so it's not worth
         # optimizing this use case.
         if os.path.isfile(file_path) or os.path.islink(file_path):
           logging.info('os.remove(%s)' % file_path)
           os.remove(file_path)
         elif os.path.isdir(file_path):
-          logging.info('RemoveDirectory(%s)' % file_path)
-          gclient_utils.RemoveDirectory(file_path)
+          logging.info('rmtree(%s)' % file_path)
+          gclient_utils.rmtree(file_path)
         else:
           logging.critical(
             ('No idea what is %s.\nYou just found a bug in gclient'
               ', please ping maruel@chromium.org ASAP!') % file_path)
 
       if (file_status[0][0] in ('D', 'A', '!') or
           not file_status[0][1:].isspace()):
         # Added, deleted file requires manual intervention and require calling
         # revert, like for properties.
         if not os.path.isdir(cwd):
           # '.' was deleted. It's not worth continuing.
           return
         try:
           SVN.Capture(['revert', file_status[1]], cwd=cwd)
         except subprocess2.CalledProcessError:
           if not os.path.exists(file_path):
             continue
           raise