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

tests/gclient_smoketest.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.
 
 """Smoke tests for gclient.py.
 
 Shell out 'gclient' and run basic conformance tests.
 
 This test assumes GClientSmokeBase.URL_BASE is valid.
@@ skipping 745 matching lines @@
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     self.gclient(['sync'])
     # Cripple the checkout.
     os.remove(join(self.root_dir, '.gclient_entries'))
     src = join(self.root_dir, 'src')
     res = self.gclient(['sync', '--jobs', '1'], src)
     self.checkBlock(res[0],
                     ['running', 'running', 'running'])
 
   def testUnversionedRepository(self):

[borenet, 2013/11/25 13:55:42]

I'm a little confused about what this is testing, but the behavior has certainly
changed.  Since third_party/foo is still in DEPS, it gets deleted and re-synced
on the second call to "gclient sync".

     # Check that gclient automatically deletes crippled SVN repositories.
     if not self.enabled:
       return
     self.gclient(['config', self.svn_base + 'trunk/src/'])
     cmd = ['sync', '--jobs', '1', '--delete_unversioned_trees', '--reset']
     self.assertEquals(0, self.gclient(cmd)[-1])
     third_party = join(self.root_dir, 'src', 'third_party')
     subprocess2.check_call(['svn', 'propset', '-q', 'svn:ignore', 'foo', '.'],
                            cwd=third_party)
 
     # Cripple src/third_party/foo and make sure gclient still succeeds.
     gclient_utils.rmtree(join(third_party, 'foo', '.svn'))
-    self.assertEquals(0, self.gclient(cmd)[-1])
+    self.assertEquals(0, self.gclient(cmd + ['--force'])[-1])
 
 
 class GClientSmokeSVNTransitive(GClientSmokeBase):
   FAKE_REPOS_CLASS = FakeRepoTransitive
 
   def setUp(self):
     super(GClientSmokeSVNTransitive, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
 
   def testSyncTransitive(self):
@@ skipping 270 matching lines @@
                             ['running', 'running'])
     self.assertEquals(1, len(out[0]))
     self.assertEquals(1, len(out[1]))
     tree = self.mangle_git_tree(('repo_1@2', 'src'),
                                 ('repo_2@1', 'src/repo2'),
                                 ('repo_3@2', 'src/repo2/repo_renamed'))
     tree['src/git_hooked1'] = 'git_hooked1'
     tree['src/git_hooked2'] = 'git_hooked2'
     self.assertTree(tree)
 
   def testPreDepsHooks(self):

[borenet, 2013/11/25 13:55:42]

This test is removed in https://codereview.chromium.org/68853002/, but since
that hasn't been merged yet...

     if not self.enabled:
       return
     self.gclient(['config', self.git_base + 'repo_5', '--name', 'src'])
     expectation = [
         ('running', self.root_dir),                 # git clone repo_5
         ('running', self.root_dir + '/src'),        # git checkout src
         ('running', self.root_dir),                 # pre-deps hook
         ('running', self.root_dir),                 # git clone repo_1
         ('running', self.root_dir + '/src/repo1'),  # git checkout repo1
         ('running', self.root_dir),                 # git clone repo_1
@@ skipping 15 matching lines @@
 
     # Pre-DEPS hooks don't run with runhooks.
     self.gclient(['runhooks', '--deps', 'mac'])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     self.assertTree(tree)
 
     # Pre-DEPS hooks run when syncing with --nohooks.
-    self.gclient(['sync', '--deps', 'mac', '--nohooks',
+    self.gclient(['sync', '--deps', 'mac', '--nohooks', '--force',
                   '--revision', 'src@' + self.githash('repo_5', 2)])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     tree['src/git_pre_deps_hooked'] = 'git_pre_deps_hooked'
     self.assertTree(tree)
 
     os.remove(join(self.root_dir, 'src', 'git_pre_deps_hooked'))
 
     # Pre-DEPS hooks don't run with --noprehooks
-    self.gclient(['sync', '--deps', 'mac', '--noprehooks',
+    self.gclient(['sync', '--deps', 'mac', '--noprehooks', '--force',
                   '--revision', 'src@' + self.githash('repo_5', 2)])
     tree = self.mangle_git_tree(('repo_5@2', 'src'),
                                 ('repo_1@2', 'src/repo1'),
                                 ('repo_2@1', 'src/repo2')
                                 )
     self.assertTree(tree)
 
   def testPreDepsHooksError(self):
     if not self.enabled:
       return
@@ skipping 207 matching lines @@
         ('svn', 'trunk/other', 'src/other'),
         ('git', 'repo_2@' + self.githash('repo_2', 1)[:7], 'src/repo2'),
         ('git', 'repo_3', 'src/repo2/repo_renamed'),
         ('svn', 'trunk/third_party/foo@1', 'src/third_party/foo'),
       ]
     expected = [(scm, bases[scm] + url, os.path.join(self.root_dir, path))
                 for (scm, url, path) in expected_source]
 
     self.assertEquals(sorted(entries), sorted(expected))
 
+  def testDeleteConflictingCheckout(self):
+    if not self.enabled:
+      return
+
+    # Create an initial svn checkout.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.svn_base + 'trunk/src"},'
+        ']'
+    ])
+    results = self.gclient(['sync', '--deps', 'mac'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we have the expected svn checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %strunk/src' % self.svn_base,
+      'src/file/other: File("%strunk/other/DEPS")' % self.svn_base,
+      'src/other: %strunk/other' % self.svn_base,
+      'src/third_party/foo: %strunk/third_party/foo@1' % self.svn_base,
+    ]
+    self.assertEquals(actual, expected)
+
+    # Change the desired checkout to git.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.git_base + 'repo_1"},'
+        ']'
+    ])
+
+    # Verify that the sync succeeds with --force.
+    results = self.gclient(['sync', '--deps', 'mac', '--force'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we got the desired git checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %srepo_1' % self.git_base,
+      'src/repo2: %srepo_2@%s' % (self.git_base, self.githash('repo_2', 1)[:7]),
+      'src/repo2/repo_renamed: %srepo_3' % self.git_base,
+    ]
+    self.assertEquals(actual, expected)
+
+    # Change the desired checkout back to svn.
+    self.gclient(['config', '--spec',
+        'solutions=['
+        '{"name": "src",'
+        ' "url": "' + self.svn_base + 'trunk/src"},'
+        ']'
+    ])
+
+    # Verify that the sync succeeds.
+    results = self.gclient(['sync', '--deps', 'mac', '--force'])
+    self.assertEqual(results[2], 0, 'Sync failed!')
+
+    # Verify that we have the expected svn checkout.
+    results = self.gclient(['revinfo', '--deps', 'mac'])
+    actual = results[0].splitlines()
+    expected = [
+      'src: %strunk/src' % self.svn_base,
+      'src/file/other: File("%strunk/other/DEPS")' % self.svn_base,
+      'src/other: %strunk/other' % self.svn_base,
+      'src/third_party/foo: %strunk/third_party/foo@1' % self.svn_base,
+    ]
+    self.assertEquals(actual, expected)
+
 
 class GClientSmokeFromCheckout(GClientSmokeBase):
   # WebKit abuses this. It has a .gclient and a DEPS from a checkout.
   def setUp(self):
     super(GClientSmokeFromCheckout, self).setUp()
     self.enabled = self.FAKE_REPOS.set_up_svn()
     os.rmdir(self.root_dir)
     if self.enabled:
       usr, pwd = self.FAKE_REPOS.USERS[0]
       subprocess2.check_call(
@@ skipping 88 matching lines @@
 
   if '-c' in sys.argv:
     COVERAGE = True
     sys.argv.remove('-c')
     if os.path.exists('.coverage'):
       os.remove('.coverage')
     os.environ['COVERAGE_FILE'] = os.path.join(
         os.path.dirname(os.path.dirname(os.path.abspath(__file__))),
         '.coverage')
   unittest.main()