Fix gclient revert for external, switched and conflicted directories.

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,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
 
+import logging
 import os
 import re
 import subprocess
 import sys
 import xml.dom.minidom
 
 import gclient_utils
 
 SVN_COMMAND = "svn"
 
@@ skipping 185 matching lines @@
     doesn't know about them.
     """
     path = os.path.join(self._root_dir, self.relpath)
     if not os.path.isdir(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)
 
-    files = CaptureSVNStatus(path)
     # Batch the command.
     files_to_revert = []
-    for file in files:
+    for file in CaptureSVNStatus(path):
       file_path = os.path.join(path, file[1])
+      if file_path[0][0] == 'X':
+        # Ignore externals.
+        continue
+
       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)
+      # Unversioned file, unexpected unversioned files, switched directories
+      # or conflicted trees.
+      if file[0][0] in ('?', '~') or file[0][4] == 'S' or file[0][6] == 'C':
+        # Remove then since svn revert won't touch them.
         try:
+          # TODO(maruel): Look if it is a file or a directory.
+          logging.info('os.remove(%s)' % file_path)
           os.remove(file_path)
         except EnvironmentError:
+          logging.info('gclient_utils.RemoveDirectory(%s)' % 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 = []
@@ skipping 323 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