Move reverting code from gclient_scm to scm to be able to reuse the code.

gclient_scm.py

 # Copyright (c) 2010 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.
 
 """Gclient-specific SCM-specific operations."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 820 matching lines @@
     All reverted files will be appended to file_list, even if Subversion
     doesn't know about them.
     """
     if not os.path.isdir(self.checkout_path):
       # svn revert won't work if the directory doesn't exist. It needs to
       # checkout instead.
       print('\n_____ %s is missing, synching instead' % self.relpath)
       # Don't reuse the args.
       return self.update(options, [], file_list)
 
-    for file_status in scm.SVN.CaptureStatus(self.checkout_path):
-      file_path = os.path.join(self.checkout_path, file_status[1])
-      # Temporarily forcibly delete externals to make sure chromium can build
-      # without svn:external's.
-      #if file_status[0][0] == 'X':
-      #  # Ignore externals.
-      #  logging.info('Ignoring external %s' % file_path)
-      #  continue
-
+    def printcb(file_status):
+      file_list.append(file_status[1])
       if logging.getLogger().isEnabledFor(logging.INFO):
-        logging.info('%s%s' % (file[0], file[1]))
+        logging.info('%s%s' % (file_status[0], file_status[1]))
       else:
-        print(file_path)
-
-      if file_status[0].isspace():
-        logging.error('No idea what is the status of %s.\n'
-                      'You just found a bug in gclient, please ping '
-                      'maruel@chromium.org ASAP!' % file_path)
-      # svn revert is really stupid. It fails on inconsistent line-endings,
-      # on switched directories, etc. So take no chance and delete everything!
-      try:
-        if not os.path.exists(file_path):
-          pass
-        elif 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('gclient_utils.RemoveDirectory(%s)' % file_path)
-          gclient_utils.RemoveDirectory(file_path)
-        else:
-          logging.error('no idea what is %s.\nYou just found a bug in gclient'
-                        ', please ping maruel@chromium.org ASAP!' % file_path)
-      except EnvironmentError:
-        logging.error('Failed to remove %s.' % file_path)
+        print(os.path.join(self.checkout_path, file_status[1]))
+    scm.SVN.Revert(self.checkout_path, callback=printcb)
 
     try:
       # svn revert is so broken we don't even use it. Using
       # "svn up --revision BASE" achieve the same effect.
+      # file_list will contain duplicates.
       self._RunAndGetFileList(['update', '--revision', 'BASE'], options,
           file_list)
     except OSError, e:
-      # Maybe the directory disapeared meanwhile. We don't want it to throw an
-      # exception.
+      # Maybe the directory disapeared meanwhile. Do not throw an exception.
       logging.error('Failed to update:\n%s' % str(e))
 
   def revinfo(self, options, args, file_list):
     """Display revision"""
     try:
       return scm.SVN.CaptureRevision(self.checkout_path)
     except gclient_utils.Error:
       return None
 
   def runhooks(self, options, args, file_list):
@@ skipping 37 matching lines @@
 
     This method returns a new list to be used as a command."""
     new_command = command[:]
     if revision:
       new_command.extend(['--revision', str(revision).strip()])
     # --force was added to 'svn update' in svn 1.5.
     if ((options.force or options.manually_grab_svn_rev) and
         scm.SVN.AssertVersion("1.5")[0]):
       new_command.append('--force')
     return new_command