If the destination directory doesn't contain the desired repo, delete it

gclient.py

 #!/usr/bin/env python
 # 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.
 
 """Meta checkout manager supporting both Subversion and GIT."""
 # Files
 #   .gclient      : Current client configuration, written by 'config' command.
 #                   Format is a Python script defining 'solutions', a list whose
 #                   entries each are maps binding the strings "name" and "url"
@@ skipping 650 matching lines @@
           self._used_scm.RunCommand('updatesingle',
               options, args + [parsed_url.GetFilename()], file_list)
       else:
         # Create a shallow copy to mutate revision.
         options = copy.copy(options)
         options.revision = revision_overrides.get(self.name)
         self.maybeGetParentRevision(
             command, options, parsed_url, self.parent.name, revision_overrides)
         self._used_scm = gclient_scm.CreateSCM(
             parsed_url, self.root.root_dir, self.name)
+
+        def enable_deletion_of_conflicting_checkouts():
+          """This function determines whether the new behavior of deleting

[M-A Ruel, 2014/01/13 17:31:39]

"""Determines ..

[borenet, 2014/01/13 18:17:57]

Done.

+          checkouts which conflict with those in DEPS should be enabled. It

[M-A Ruel, 2014/01/13 17:31:39]

Empty line between one liner summary and detailed explanation.

[borenet, 2014/01/13 18:17:57]

Done.

+          enables the new functionality on a small set of bots initially."""
+          # TODO(borenet): Remove this hack as soon as we've verified that it
+          # doesn't cause the bots to break.
+          import socket

[M-A Ruel, 2014/01/13 17:31:39]

I'd prefer the import at the top of the file. Even if it is a "temporary hack".

[borenet, 2014/01/13 18:17:57]

Done.

+          return (socket.gethostname() in ('vm859-m1', 'build1-m1', 'vm630-m1')
+                  and os.environ.get('CHROME_HEADLESS'))

[M-A Ruel, 2014/01/13 17:31:39]

You should inverse the check. Checking for os.environ is much faster than
calling socket.gethostname().

[borenet, 2014/01/13 18:17:57]

Done.

+
+        def should_delete_conflicting_checkout(options):
+          """Determine whether a checkout which conflicts with the DEPS entry

[M-A Ruel, 2014/01/13 17:31:39]

imperactive

+          should be deleted. Returns True if running with --force or when

[M-A Ruel, 2014/01/13 17:31:39]

empty line

+          running on a bot. Otherwise, prompts for deletion."""
+          should_delete = options.force or os.environ.get('CHROME_HEADLESS')

[M-A Ruel, 2014/01/13 17:31:39]

Do not use an environment variable to determine this, only use flags. Otherwise
it's totally black magic.

+          if sys.__stdout__.isatty() and not should_delete:
+            usr_input = ''
+            while usr_input not in ('y', 'n'):
+              usr_input = raw_input('%s does not contain a checkout of %s. '
+                                    'Do you want to delete the directory? '
+                                    'If not, the update will be canceled '
+                                    '(y/n): ' % (dest_dir, url)).lower()
+            should_delete = (usr_input == 'y')
+          return should_delete
+
+        # When updating, determine whether the destination directory contains a
+        # checkout of the desired repository. If not, avoid conflicts by
+        # deleting the directory before running the update.
+        if (command == 'update' and enable_deletion_of_conflicting_checkouts()):

[M-A Ruel, 2014/01/13 17:31:39]

() are not needed

[borenet, 2014/01/13 18:17:57]

Done.

+          logging.warning('Experimental deletion of mismatching checkouts '
+                          'enabled.')
+          actual_remote_url = self._used_scm.GetRemoteURL(options)
+          url, _ = gclient_utils.SplitUrlRevision(parsed_url)
+          url = url.rstrip('/')
+          dest_dir = os.path.join(self.root.root_dir, self.name) 
+          if os.path.isdir(dest_dir) and actual_remote_url != url:
+            if should_delete_conflicting_checkout(options):
+              logging.warning('%s does not contain a checkout of %s. Removing '
+                              ' %s' % (dest_dir, url, dest_dir))
+              gclient_utils.rmtree(dest_dir)
+            else:
+              raise gclient_utils.Error('%s does not contain a checkout of %s. '
+                                        'Please fix the solution manually or '
+                                        'run with --force to delete '
+                                        'automatically.' % (dest_dir, url))
+
         self._got_revision = self._used_scm.RunCommand(command, options, args,
                                                        file_list)
         if file_list:
           file_list = [os.path.join(self.name, f.strip()) for f in file_list]
 
       # TODO(phajdan.jr): We should know exactly when the paths are absolute.
       # Convert all absolute paths to relative.
       for i in range(len(file_list or [])):
         # It depends on the command being executed (like runhooks vs sync).
         if not os.path.isabs(file_list[i]):
@@ skipping 1235 matching lines @@
     raise
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: