Revert 250482 "Re-reland r245404 ("If the destination directory ..."

trunk/tools/depot_tools/tests/gclient_scm_test.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.
 
 """Unit tests for gclient_scm.py."""
 
 # pylint: disable=E1103
 
 # Import before super_mox to keep valid references.
@@ skipping 83 matching lines @@
 
   def setUp(self):
     BaseTestCase.setUp(self)
     self.url = self.SvnUrl()
 
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetCheckoutRoot',
-        'GetRemoteURL',
         'GetRevisionDate',
         'GetUsableRev',
         'Svnversion',
         'RunCommand',
         'cleanup',
         'diff',
         'name',
         'pack',
         'relpath',
         'revert',
@@ skipping 40 matching lines @@
   def testGITFakeHttpsUrl(self):
     self.url = 'git+https://foo'
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     self.assertEqual(scm.url, 'https://foo')
 
   def testRunCommandException(self):
     options = self.Options(verbose=False)
-    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
+
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     exception = "Unsupported argument(s): %s" % ','.join(self.args)
     self.assertRaisesError(exception, scm.RunCommand,
                            'update', options, self.args)
 
   def testRunCommandUnknown(self):
     # TODO(maruel): if ever used.
     pass
 
   def testRevertMissing(self):
     options = self.Options(verbose=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
         ).AndReturn('1.5.1')
     # It'll to a checkout instead.
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
     gclient_scm.os.path.exists(parent).AndReturn(False)
     gclient_scm.os.makedirs(parent)
     gclient_scm.os.path.exists(parent).AndReturn(True)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
         cwd=self.root_dir,
         file_list=files_list)
 
     gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.'
         ).AndReturn({'Revision': 100})
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.revert(options, self.args, files_list)
     self.checkstdout(
         ('\n_____ %s is missing, synching instead\n' % self.relpath))
 
   def testRevertNoDotSvn(self):
     options = self.Options(verbose=True, force=True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(False)
+    gclient_scm.os.path.isdir(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.isdir(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
     gclient_scm.os.path.exists(parent).AndReturn(False)
     gclient_scm.os.makedirs(parent)
     gclient_scm.os.path.exists(parent).AndReturn(True)
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
         ).AndReturn('1.6')
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['checkout', self.url, self.base_path, '--force', '--ignore-externals'],
         cwd=self.root_dir,
         file_list=files_list)
     gclient_scm.gclient_utils.rmtree(self.base_path)
     gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.'
@@ skipping 99 matching lines @@
 
   # TODO(maruel):  TEST REVISIONS!!!
   # TODO(maruel):  TEST RELOCATE!!!
   def testUpdateCheckout(self):
     options = self.Options(verbose=True)
     file_info = gclient_scm.gclient_utils.PrintableObject()
     file_info.root = 'blah'
     file_info.url = self.url
     file_info.uuid = 'ABC'
     file_info.revision = 42
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     # Checkout.
     gclient_scm.os.path.exists(self.base_path).AndReturn(False)
     parent = gclient_scm.os.path.dirname(self.base_path)
     gclient_scm.os.path.exists(parent).AndReturn(False)
     gclient_scm.os.makedirs(parent)
     gclient_scm.os.path.exists(parent).AndReturn(True)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
         ).AndReturn('1.5.1')
     gclient_scm.scm.SVN.RunAndGetFileList(
@@ skipping 11 matching lines @@
   def testUpdateUpdate(self):
     options = self.Options(verbose=True)
     options.force = True
     options.nohooks = False
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path).AndReturn([])
 
     # Cheat a bit here.
@@ skipping 24 matching lines @@
 
   def testUpdateReset(self):
     options = self.Options(verbose=True)
     options.reset = True
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Create an untracked file and directory.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path
         ).AndReturn([['?  ', 'dir'], ['?  ', 'file']])
 
@@ skipping 14 matching lines @@
     options = self.Options(verbose=True)
     options.reset = True
     options.delete_unversioned_trees = True
 
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
 
     # Checkout or update.
     dotted_path = join(self.base_path, '.')
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
 
     # Create an untracked file and directory.
     gclient_scm.scm.SVN.CaptureStatus(None, dotted_path
         ).AndReturn([['?  ', 'dir'], ['?  ', 'file']])
 
@@ skipping 44 matching lines @@
         ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True,
         cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', 'DEPS', '--ignore-externals'],
         cwd=self.base_path,
         file_list=files_list)
 
     # Now we fall back on scm.update().
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN._CaptureInfo([], dotted_path).AndReturn(file_info)
     gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None
         ).AndReturn(file_info)
 
     gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.'
         ).AndReturn({'Revision': 100})
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
@@ skipping 48 matching lines @@
         ['svn', 'checkout', '--depth', 'empty', self.url, self.base_path],
         always=True,
         cwd=self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(
         options.verbose,
         ['update', 'DEPS', '--ignore-externals'],
         cwd=self.base_path,
         file_list=files_list)
 
     # Now we fall back on scm.update().
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN._CaptureInfo(
         [], join(self.base_path, ".")).AndReturn(file_info)
     gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None
         ).AndReturn(file_info)
 
     gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.'
         ).AndReturn({'Revision': 100})
 
     self.mox.ReplayAll()
@@ skipping 14 matching lines @@
     gclient_scm.scm.SVN.Capture(['--version', '--quiet'], None
         ).AndReturn('1.5.1')
     gclient_scm.os.path.exists(join(self.base_path, '.svn')).AndReturn(True)
 
     # Verify no locked files.
     gclient_scm.scm.SVN.CaptureStatus(None, join(self.base_path, '.')
         ).AndReturn([])
 
     # Now we fall back on scm.update().
     files_list = self.mox.CreateMockAnything()
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(False)
     gclient_scm.os.path.exists(self.base_path).AndReturn(True)
     gclient_scm.scm.SVN._CaptureInfo(
         [], join(self.base_path, '.')).AndReturn(file_info)
     gclient_scm.scm.SVN._CaptureInfo([file_info['URL']], None
         ).AndReturn(file_info)
 
     gclient_scm.scm.SVN._CaptureInfo([], self.base_path+'/.'
         ).AndReturn({'Revision': 100})
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
     self.checkstdout('\n_____ %s at 42\n' % self.relpath)
 
-  def testUpdateGitSvn(self):
+  def testUpdateGit(self):
     options = self.Options(verbose=True)
-    gclient_scm.os.path.exists(self.base_path).AndReturn(True)
-    self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).AndReturn(True)
+    file_path = gclient_scm.os.path.join(self.root_dir, self.relpath, '.git')
+    gclient_scm.os.path.exists(file_path).AndReturn(True)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     file_list = []
     scm.update(options, self.args, file_list)
     self.checkstdout(
-        ('________ %s looks like git-svn; skipping.\n' % self.relpath))
+        ('________ found .git directory; skipping %s\n' % self.relpath))
+
+  def testUpdateHg(self):
+    options = self.Options(verbose=True)
+    gclient_scm.os.path.exists(join(self.base_path, '.git')).AndReturn(False)
+    gclient_scm.os.path.exists(join(self.base_path, '.hg')).AndReturn(True)
+
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    file_list = []
+    scm.update(options, self.args, file_list)
+    self.checkstdout(
+        ('________ found .hg directory; skipping %s\n' % self.relpath))
 
   def testGetUsableRevSVN(self):
     # pylint: disable=E1101
     options = self.Options(verbose=True)
 
     # Mock SVN revision validity checking.
     self.mox.StubOutWithMock(
         gclient_scm.scm.SVN, 'IsValidRevision', True)
     gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 1)
         ).AndReturn(True)
     gclient_scm.scm.SVN.IsValidRevision(url='%s@%s' % (self.url, 'fake')
         ).AndReturn(False)
 
     self.mox.ReplayAll()
 
     svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir)
     # With an SVN checkout, 1 an example of a valid usable rev.
     self.assertEquals(svn_scm.GetUsableRev(1, options), 1)
     # With an SVN checkout, a fake or unknown rev should raise an excpetion.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       svn_scm.GetUsableRev, 'fake', options)
 
-  def testGetRemoteURL(self):
-    self.mox.UnsetStubs()
-    options = self.Options(verbose=True)
-    self.mox.StubOutWithMock(gclient_scm.scm.SVN, 'Capture', True)
-    svn_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
-                                relpath=self.relpath)
-
-    if svn_scm.relpath:
-      cwd = os.path.join(svn_scm._root_dir, svn_scm.relpath)
-    else:
-      cwd = svn_scm._root_dir
-
-    gclient_scm.scm.SVN.Capture(['info', '--xml', os.curdir], cwd).AndReturn(
-"""<?xml version="1.0"?>
-<info>
-<entry
-   path="."
-   revision="1234"
-   kind="dir">
-<url>%s</url>
-<repository>
-<root>https://dummy.repo.com/svn</root>
-<uuid>FAKE</uuid>
-</repository>
-<wc-info>
-<schedule>normal</schedule>
-<depth>infinity</depth>
-</wc-info>
-<commit
-   revision="1234">
-<author>fakedev@chromium.org</author>
-<date>2013-11-14T15:08:21.757885Z</date>
-</commit>
-</entry>
-</info>
-""" % svn_scm.url)
-
-    self.mox.ReplayAll()
-
-    self.assertEquals(svn_scm.GetRemoteURL(options), self.url)
-
-
 class BaseGitWrapperTestCase(GCBaseTestCase, StdoutCheck, TestCaseUtils,
                              unittest.TestCase):
   """This class doesn't use pymox."""
   class OptionsObject(object):
     def __init__(self, verbose=False, revision=None):
       self.verbose = verbose
       self.revision = revision
       self.manually_grab_svn_rev = True
       self.deps_os = None
       self.force = False
@@ skipping 125 matching lines @@
       gclient_scm.GitWrapper.BinaryExists = self._original_GitBinaryExists
       gclient_scm.SVNWrapper.BinaryExists = self._original_SVNBinaryExists
 
 
 class ManagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testDir(self):
     members = [
         'BinaryExists',
         'FullUrlForRelativeUrl',
         'GetCheckoutRoot',
-        'GetRemoteURL',
         'GetRevisionDate',
         'GetUsableRev',
         'RunCommand',
         'cache_dir',
         'cache_locks',
         'cleanup',
         'diff',
         'name',
         'pack',
         'UpdateSubmoduleConfig',
@@ skipping 306 matching lines @@
 
   def testGetUsableRevGit(self):
     # pylint: disable=E1101
     options = self.Options(verbose=True)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1
         ).AndReturn(True)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).MultipleTimes(
+    gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes(
         ).AndReturn(False)
 
     gclient_scm.scm.os.path.isdir(self.base_path).AndReturn(True)
     gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
 
     self.mox.ReplayAll()
 
     git_scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                     relpath=self.relpath)
     # A [fake] git sha1 with a git repo should work (this is in the case that
@@ skipping 28 matching lines @@
                                 cwd=self.base_path).AndReturn('blah')
     gclient_scm.scm.GIT.Capture(['fetch'], cwd=self.base_path)
     gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path)
     error = subprocess2.CalledProcessError(1, 'cmd', '/cwd', 'stdout', 'stderr')
     gclient_scm.scm.GIT.Capture(['config', '--get', 'svn-remote.svn.fetch'],
                                 cwd=self.base_path).AndRaise(error)
     gclient_scm.scm.GIT.Capture(['svn', 'fetch'], cwd=self.base_path)
     gclient_scm.scm.GIT.Capture(['fetch', 'origin'], cwd=self.base_path)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsGitSvn', True)
-    gclient_scm.scm.GIT.IsGitSvn(self.base_path).MultipleTimes(
+    gclient_scm.scm.GIT.IsGitSvn(cwd=self.base_path).MultipleTimes(
         ).AndReturn(True)
 
     self.mox.StubOutWithMock(gclient_scm.scm.GIT, 'IsValidRevision', True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=self.fake_hash_1
         ).AndReturn(True)
     gclient_scm.scm.GIT.IsValidRevision(cwd=self.base_path, rev=too_big
         ).MultipleTimes(2).AndReturn(False)
 
     gclient_scm.os.path.isdir(self.base_path).AndReturn(False)
     gclient_scm.os.path.isdir(self.base_path).MultipleTimes().AndReturn(True)
@@ skipping 19 matching lines @@
     self.assertEquals(git_svn_scm.GetUsableRev('3', options),
                       self.fake_hash_2)
     # Given a git sha1 with a git-svn checkout, it should be used as is.
     self.assertEquals(git_svn_scm.GetUsableRev(self.fake_hash_1, options),
                       self.fake_hash_1)
     # We currently check for seemingly valid SVN revisions by assuming 6 digit
     # numbers, so assure that numeric revs >= 1000000 don't work.
     self.assertRaises(gclient_scm.gclient_utils.Error,
                       git_svn_scm.GetUsableRev, too_big, options)
 
-  def testGetRemoteURL(self):
-    options = self.Options(verbose=True)
-    self.mox.StubOutWithMock(gclient_scm.GitWrapper, '_Capture', True)
-    git_scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
-                                relpath=self.relpath)
-    git_scm._Capture(['config', 'remote.origin.url'], cwd='/tmp/fake'
-                     ).AndReturn('%s\n' % git_scm.url)
-
-    self.mox.ReplayAll()
-
-    self.assertEquals(git_scm.GetRemoteURL(options), self.url)
-
 
 class UnmanagedGitWrapperTestCase(BaseGitWrapperTestCase):
   def testUpdateUpdate(self):
     if not self.enabled:
       return
     options = self.Options()
     expected_file_list = []
     scm = gclient_scm.CreateSCM(url=self.url, root_dir=self.root_dir,
                                 relpath=self.relpath)
     file_list = []
     options.revision = 'unmanaged'
     scm.update(options, (), file_list)
     self.assertEquals(file_list, expected_file_list)
     self.assertEquals(scm.revinfo(options, (), None),
                       '069c602044c5388d2d15c3f875b057c852003458')
     self.checkstdout('________ unmanaged solution; skipping .\n')
 
 
 if __name__ == '__main__':
   if '-v' in sys.argv:
     logging.basicConfig(
         level=logging.DEBUG,
         format='%(asctime).19s %(levelname)s %(filename)s:'
                '%(lineno)s %(message)s')
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: