Revert of Run `svn cleanup` before every update and reset.

gclient_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.
 
 """Gclient-specific SCM-specific operations."""
 
 from __future__ import print_function
 
 import logging
 import os
@@ skipping 1178 matching lines @@
       if os.path.exists(os.path.join(self.checkout_path, '.svn')):
         return self.Svnversion()
       return
 
     if 'URL' not in from_info:
       raise gclient_utils.Error(
           ('gclient is confused. Couldn\'t get the url for %s.\n'
            'Try using @unmanaged.\n%s') % (
             self.checkout_path, from_info))
 
-    try:
-      self._Run(['cleanup', self.checkout_path], options)
-    except subprocess2.CalledProcessError, e:
-      # Look for locked directories.
-      dir_info = scm.SVN.CaptureStatus(
-          None, os.path.join(self.checkout_path, '.'))
-      if any(d[0][2] == 'L' for d in dir_info):
+    # Look for locked directories.
+    dir_info = scm.SVN.CaptureStatus(
+        None, os.path.join(self.checkout_path, '.'))
+    if any(d[0][2] == 'L' for d in dir_info):
+      try:
+        self._Run(['cleanup', self.checkout_path], options)
+      except subprocess2.CalledProcessError, e:
+        # Get the status again, svn cleanup may have cleaned up at least
+        # something.
+        dir_info = scm.SVN.CaptureStatus(
+            None, os.path.join(self.checkout_path, '.'))
+
         # Try to fix the failures by removing troublesome files.
         for d in dir_info:
           if d[0][2] == 'L':
             if d[0][0] == '!' and options.force:
               # We don't pass any files/directories to CaptureStatus and set
               # cwd=self.checkout_path, so we should get relative paths here.
               assert not os.path.isabs(d[1])
               path_to_remove = os.path.normpath(
                   os.path.join(self.checkout_path, d[1]))
               self.Print('Removing troublesome path %s' % path_to_remove)
@@ skipping 132 matching lines @@
         return
       if not options.force:
         raise gclient_utils.Error('Invalid checkout path, aborting')
       self.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)
 
-    self._Run(['cleanup', self.checkout_path], options)
-
     def printcb(file_status):
       if file_list is not None:
         file_list.append(file_status[1])
       if logging.getLogger().isEnabledFor(logging.INFO):
         logging.info('%s%s' % (file_status[0], file_status[1]))
       else:
         self.Print(os.path.join(self.checkout_path, file_status[1]))
     scm.SVN.Revert(self.checkout_path, callback=printcb)
 
     # Revert() may delete the directory altogether.
@@ skipping 88 matching lines @@
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'theirs-conflict'))
     elif options.manually_grab_svn_rev:
       new_command.append('--force')
       if command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
         new_command.extend(('--accept', 'postpone'))
     elif command[0] != 'checkout' and scm.SVN.AssertVersion('1.6')[0]:
       new_command.extend(('--accept', 'postpone'))
     return new_command