Another attempt: gclient: delete mismatching 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."""
 
 import collections
 import logging
 import os
 import posixpath
@@ skipping 284 matching lines @@
     if revision.startswith('refs/'):
       rev_type = "branch"
     elif revision.startswith(self.remote + '/'):
       # For compatibility with old naming, translate 'origin' to 'refs/heads'
       revision = revision.replace(self.remote + '/', 'refs/heads/')
       rev_type = "branch"
     else:
       # hash is also a tag, only make a distinction at checkout
       rev_type = "hash"
 
-    if (not os.path.exists(self.checkout_path) or
-        (os.path.isdir(self.checkout_path) and
-         not os.path.exists(os.path.join(self.checkout_path, '.git')))):
+    if (not os.path.exists(self.checkout_path)):
       self._Clone(revision, url, options)
       self.UpdateSubmoduleConfig()
       if file_list is not None:
         files = self._Capture(['ls-files']).splitlines()
         file_list.extend([os.path.join(self.checkout_path, f) for f in files])
       if not verbose:
         # Make the output a little prettier. It's nice to have some whitespace
         # between projects when cloning.
         print('')
       return self._Capture(['rev-parse', '--verify', 'HEAD'])
 
     if not managed:
       self._UpdateBranchHeads(options, fetch=False)
       self.UpdateSubmoduleConfig()
       print ('________ unmanaged solution; skipping %s' % self.relpath)
       return self._Capture(['rev-parse', '--verify', 'HEAD'])
 
     if not os.path.exists(os.path.join(self.checkout_path, '.git')):
-      raise gclient_utils.Error('\n____ %s%s\n'
-                                '\tPath is not a git repo. No .git dir.\n'
-                                '\tTo resolve:\n'
-                                '\t\trm -rf %s\n'
-                                '\tAnd run gclient sync again\n'
-                                % (self.relpath, rev_str, self.relpath))
+      if options.force:
+        # Delete and re-sync.
+        print('_____ Conflicting directory found in %s. Removing.'
+              % self.checkout_path)
+        gclient_utils.rmtree(self.checkout_path)
+        self._Clone(revision, url, options)
+        self.UpdateSubmoduleConfig()
+        if file_list is not None:
+          files = self._Capture(['ls-files']).splitlines()
+          file_list.extend([os.path.join(self.checkout_path, f) for f in files])
+        if not verbose:
+          # Make the output a little prettier. It's nice to have some whitespace
+          # between projects when cloning.
+          print('')
+        return self._Capture(['rev-parse', '--verify', 'HEAD'])
+      else:
+        raise gclient_utils.Error('\n____ %s%s\n'
+                                  '\tPath is not a git repo. No .git dir.\n'
+                                  '\tTo resolve:\n'
+                                  '\t\trm -rf %s\n'
+                                  '\tAnd run gclient sync again\n'
+                                  '\tOr run with --force\n'
+                                  % (self.relpath, rev_str, self.relpath))
 
     # See if the url has changed (the unittests use git://foo for the url, let
     # that through).
     current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
     return_early = False
     # TODO(maruel): Delete url != 'git://foo' since it's just to make the
     # unit test pass. (and update the comment above)
     # Skip url auto-correction if remote.origin.gclient-auto-fix-url is set.
     # This allows devs to use experimental repos which have a different url
     # but whose branch(s) are the same as official repos.
-    if (current_url != url and
+    if (current_url.rstrip('/') != url.rstrip('/') and

[borenet, 2014/02/28 21:54:23]

The smoketest was behaving incorrectly because of a trailing '/'.

         url != 'git://foo' and
         subprocess2.capture(
             ['git', 'config', 'remote.%s.gclient-auto-fix-url' % self.remote],
             cwd=self.checkout_path).strip() != 'False'):
       print('_____ switching %s to a new upstream' % self.relpath)
       # Make sure it's clean
       self._CheckClean(rev_str)
       # Switch over to the new upstream
       self._Run(['remote', 'set-url', self.remote, url], options)
       self._FetchAndReset(revision, file_list, options)
@@ skipping 744 matching lines @@
         filter_fn=SvnDiffFilterer(self.relpath).Filter)
 
   def update(self, options, args, file_list):
     """Runs svn to update or transparently checkout the working copy.
 
     All updated files will be appended to file_list.
 
     Raises:
       Error: if can't get URL for relative path.
     """
-    # Only update if git or hg is not controlling the directory.
-    git_path = os.path.join(self.checkout_path, '.git')
-    if os.path.exists(git_path):
-      print('________ found .git directory; skipping %s' % self.relpath)
-      return
-
+    # Only update if hg is not controlling the directory.
     hg_path = os.path.join(self.checkout_path, '.hg')
     if os.path.exists(hg_path):
       print('________ found .hg directory; skipping %s' % self.relpath)
       return
 
     if args:
       raise gclient_utils.Error("Unsupported argument(s): %s" % ",".join(args))
 
     # revision is the revision to match. It is None if no revision is specified,
     # i.e. the 'deps ain't pinned'.
@@ skipping 10 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 = ''
 
+    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.IsGit(self.checkout_path):

[szager1, 2014/02/28 22:17:52]

Isn't the scm.GIT.IsGit check redundant?  Can't you just use scm.GIT.IsGitSvn? 
And isn't 'exists' redundant too?

I think you could squash this down to:

if managed and scm.GIT.IsGitSvn(self.checkout_path):
  if svn url is unchanged:
    return
  else:
    delete checkout

[borenet, 2014/03/03 18:31:11]

Not quite.  As written, the checkout is deleted if it's a git-svn checkout of
the wrong repo OR if it's a pure-git checkout.  The change you suggest would
cause the checkout only to be deleted if it's a git-svn checkout of the wrong
repo.  The pure-git case is particularly important for the Skia DEPS transition.

[szager1, 2014/03/03 18:50:40]

But wouldn't the next stanza take care of the pure-git case?

[szager1, 2014/03/03 18:54:20]

Ah, I see... the next stanza relies on options.reset and
options.delete_unversioned_trees.  I would prefer it if you could use that
existing code to remove pure git checkouts, and align your flags with the
existing logic.

[borenet, 2014/03/03 19:14:22]

Okay, I can remove everything but the early return here.  Assuming that the bots
run with --reset, this will still work.  Can I add a --force clause to the below
as well?

if (options.reset and options.delete_unversioned trees) or options.force:

?

[borenet, 2014/03/03 21:09:05]

Done.

+        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)
+            return # TODO(borenet): Get the svn revision number?
+
+        if not options.force and not options.reset:
+          raise gclient_utils.Error(
+              '%s contains a git checkout. Delete the directory and try again.'
+              % self.checkout_path)
+        else:
+          gclient_utils.rmtree(self.checkout_path)
+          exists = False
+
     # 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)
           exists = False
         else:
@@ skipping 115 matching lines @@
               if d[0][0] == '!':
                 print 'You can pass --force to enable automatic removal.'
               raise e
 
     # Retrieve the current HEAD version because svn is slow at null updates.
     if options.manually_grab_svn_rev and not revision:
       from_info_live = scm.SVN.CaptureRemoteInfo(from_info['URL'])
       revision = str(from_info_live['Revision'])
       rev_str = ' at %s' % revision
 
-    if from_info['URL'] != base_url:
+    if from_info['URL'].rstrip('/') != base_url.rstrip('/'):
       # The repository url changed, need to switch.
       try:
         to_info = scm.SVN.CaptureRemoteInfo(url)
       except (gclient_utils.Error, subprocess2.CalledProcessError):
         # The url is invalid or the server is not accessible, it's safer to bail
         # out right now.
         raise gclient_utils.Error('This url is unreachable: %s' % url)
       can_switch = ((from_info['Repository Root'] != to_info['Repository Root'])
                     and (from_info['UUID'] == to_info['UUID']))
       if can_switch:
@@ skipping 215 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