Make revert more resilient to partial sync failure.

gclient_scm.py

 # Copyright (c) 2011 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 902 matching lines @@
           options.revision)
       self._Run(command, options, cwd=self._root_dir)
 
   def revert(self, options, args, file_list):
     """Reverts local modifications. Subversion specific.
 
     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):
+      if os.path.exists(self.checkout_path):
+        gclient_utils.rmtree(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)
 
+    if not os.path.isdir(os.path.join(self.checkout_path, '.svn')):
+      if os.path.isdir(os.path.join(self.checkout_path, '.git')):
+        print('________ found .git directory; skipping %s' % self.relpath)
+        return
+      if os.path.isdir(os.path.join(self.checkout_path, '.hg')):
+        print('________ found .hg directory; skipping %s' % self.relpath)
+        return
+      if not options.force:
+        raise gclient_utils.Error('Invalid checkout path, aborting')
+      print(
+          '\n_____ %s is not a valid svn checkout, synching instead' %
+          self.relpath)
+      gclient_utils.rmtree(self.checkout_path)
+      # Don't reuse the args.
+      return self.update(options, [], file_list)
+
     def printcb(file_status):
       file_list.append(file_status[1])
       if logging.getLogger().isEnabledFor(logging.INFO):
         logging.info('%s%s' % (file_status[0], file_status[1]))
       else:
         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
@@ skipping 53 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