gclient: Actually move or delete mismatched checkouts

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 errno
 import logging
 import os
 import posixpath
 import re
 import shlex
 import sys
 import tempfile
 import traceback
 import urlparse
 
 import download_from_google_storage
 import gclient_utils
 import git_cache
 import scm
+import shutil
 import subprocess2
 
 
 THIS_FILE_PATH = os.path.abspath(__file__)
 
 GSUTIL_DEFAULT_PATH = os.path.join(
     os.path.dirname(os.path.abspath(__file__)),
     'third_party', 'gsutil', 'gsutil')
 
 CHROMIUM_SRC_URL = 'https://chromium.googlesource.com/chromium/src.git'
@@ skipping 156 matching lines @@
 
     actual_remote_url = self.GetActualRemoteURL(options)
     if actual_remote_url:
       return (gclient_utils.SplitUrlRevision(actual_remote_url)[0].rstrip('/')
               == gclient_utils.SplitUrlRevision(self.url)[0].rstrip('/'))
     else:
       # This may occur if the self.checkout_path exists but does not contain a
       # valid git or svn checkout.
       return False
 
-  # TODO(borenet): Remove this once SCMWrapper._DeleteOrMove is enabled.
-  # pylint: disable=R0201
   def _DeleteOrMove(self, force):
     """Delete the checkout directory or move it out of the way.
 
     Args:
         force: bool; if True, delete the directory. Otherwise, just move it.
     """
-    gclient_utils.AddWarning('WARNING: Upcoming change in '
-                             'https://codereview.chromium.org/225403015 would '
-                             'cause %s to be deleted or moved to the side. '
-                             'This is intended to ease changes to DEPS in the '
-                             'future. If you are seeing this warning and '
-                             'haven\'t changed the DEPS file, please contact '
-                             'borenet@ immediately.' % self.checkout_path)
+    if force and os.environ.get('CHROME_HEADLESS') == '1':
+      self.Print('_____ Conflicting directory found in %s. Removing.'
+                 % self.checkout_path)
+      gclient_utils.AddWarning('Conflicting directory %s deleted.'
+                               % self.checkout_path)
+      gclient_utils.rmtree(self.checkout_path)
+    else:
+      bad_scm_dir = os.path.join(self._root_dir, '_bad_scm',
+                                 os.path.dirname(self.relpath))
+
+      try:
+        os.makedirs(bad_scm_dir)
+      except OSError as e:
+        if e.errno != errno.EEXIST:
+          raise
+
+      dest_path = tempfile.mkdtemp(
+          prefix=os.path.basename(self.relpath),
+          dir=bad_scm_dir)
+      self.Print('_____ Conflicting directory found in %s. Moving to %s.'
+                 % (self.checkout_path, dest_path))
+      gclient_utils.AddWarning('Conflicting directory %s moved to %s.'
+                               % (self.checkout_path, dest_path))
+      shutil.move(self.checkout_path, dest_path)
 
 
 class GitWrapper(SCMWrapper):
   """Wrapper for Git"""
   name = 'git'
   remote = 'origin'
 
   cache_dir = None
 
   def __init__(self, url=None, *args):
@@ skipping 857 matching lines @@
       rev_str = ''
 
     exists = os.path.exists(self.checkout_path)
     if exists and managed:
       # Git is only okay if it's a git-svn checkout of the right repo.
       if scm.GIT.IsGitSvn(self.checkout_path):
         remote_url = scm.GIT.Capture(['config', '--local', '--get',
                                       'svn-remote.svn.url'],
                                      cwd=self.checkout_path).rstrip()
         if remote_url.rstrip('/') == base_url.rstrip('/'):
-          print('\n_____ %s looks like a git-svn checkout. Skipping.'
-                % self.relpath)
+          self.Print('\n_____ %s looks like a git-svn checkout. Skipping.'
+                     % self.relpath)
           return # TODO(borenet): Get the svn revision number?
 
     # Get the existing scm url and the revision number of the current checkout.
     if exists and managed:
       try:
         from_info = scm.SVN.CaptureLocalInfo(
             [], os.path.join(self.checkout_path, '.'))
       except (gclient_utils.Error, subprocess2.CalledProcessError):
         self._DeleteOrMove(options.force)
         exists = False
@@ skipping 351 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