Remove more unversioned directories.

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."""
 
 import logging
 import os
 import posixpath
 import re
@@ skipping 911 matching lines @@
         # Reconstruct the url.
         url = '%s@%s' % (url, revision)
         rev_str = ' at %s' % revision
       else:
         managed = False
         revision = None
     else:
       forced_revision = False
       rev_str = ''
 
-    if not os.path.exists(self.checkout_path):
+    # Get the existing scm url and the revision number of the current checkout.
+    exists = os.path.exists(self.checkout_path)
+    if exists and managed:
+      try:
+        from_info = scm.SVN.CaptureLocalInfo(
+            [], os.path.join(self.checkout_path, '.'))
+      except (gclient_utils.Error, subprocess2.CalledProcessError):
+        if options.reset and options.delete_unversioned_trees:
+          print 'Removing troublesome path %s' % self.checkout_path
+          gclient_utils.rmtree(self.checkout_path)

[Peter Mayo, 2012/11/14 22:30:25]

How does this report errors (e.g. owned by root subdirs)?
Should catch or check accordingly and fall back to old message.

[M-A Ruel, 2012/11/14 23:17:32]

That will throw, IMHO it's not a big deal to not catch, we can't do anything
about it anyway.

[Peter Mayo, 2012/11/15 01:37:10]

It's not a big deal to me either, it's just a way that the code can stay as
friendly as it is today for a tiny corner case.  I like it when troopering a bot
is a matter of looking at the meta reason for something as you decide whether to
follow the instructions if they make sense.

+          exists = False
+        else:
+          msg = ('Can\'t update/checkout %s if an unversioned directory is '
+                 'present. Delete the directory and try again.')
+          raise gclient_utils.Error(msg % self.checkout_path)
+
+    if not exists:
       gclient_utils.safe_makedirs(os.path.dirname(self.checkout_path))
       # We need to checkout.
       command = ['checkout', url, self.checkout_path]
       command = self._AddAdditionalUpdateFlags(command, options, revision)
       self._RunAndGetFileList(command, options, file_list, self._root_dir)
       return
 
     if not managed:
       print ('________ unmanaged solution; skipping %s' % self.relpath)
       return
 
-    # Get the existing scm url and the revision number of the current checkout.
-    try:
-      from_info = scm.SVN.CaptureLocalInfo(
-          [], os.path.join(self.checkout_path, '.'))
-    except (gclient_utils.Error, subprocess2.CalledProcessError):
-      raise gclient_utils.Error(
-          ('Can\'t update/checkout %s if an unversioned directory is present. '
-           'Delete the directory and try again.') % self.checkout_path)
-
     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))
 
     # 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):
@@ skipping 245 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