Fix File() to work with SVN 1.4 by using svn export in place...

tests/gclient_scm_test.py

 #!/usr/bin/python
 # Copyright (c) 2010 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."""
 
 # Import before super_mox to keep valid references.
 from os import rename
 from shutil import rmtree
@@ skipping 256 matching lines @@
                             relpath=self.relpath)
     scm.update(options, (), files_list)
 
   def testUpdateSingleCheckout(self):
     options = self.Options(verbose=True)
     base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
+
+    # Checks to make sure that we support svn co --depth.
+    gclient_scm.scm.SVN.current_version = None
+    gclient_scm.scm.SVN.Capture(['--version']
+        ).AndReturn('svn, version 1.5.1 (r32289)')
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
+        ).AndReturn(False)
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, 'DEPS')
+        ).AndReturn(False)
+
     # When checking out a single file, we issue an svn checkout and svn update.
-    gclient_scm.os.path.exists(base_path).AndReturn(False)
     files_list = self.mox.CreateMockAnything()
     gclient_scm.scm.SVN.Run(
         ['checkout', '--depth', 'empty', self.url, base_path], self.root_dir)
     gclient_scm.scm.SVN.RunAndGetFileList(options, ['update', 'DEPS'],
         gclient_scm.os.path.join(self.root_dir, self.relpath), files_list)
 
     # Now we fall back on scm.update().
     gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
-                               ).AndReturn(False)
+        ).AndReturn(False)
     gclient_scm.os.path.exists(base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
         gclient_scm.os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL'], '.').AndReturn(file_info)
     print("\n_____ %s at 42" % self.relpath)
 
     self.mox.ReplayAll()
     scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
                             relpath=self.relpath)
     scm.updatesingle(options, ['DEPS'], files_list)
 
+  def testUpdateSingleCheckoutSVN14(self):
+    options = self.Options(verbose=True)
+    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
+    file_info = {
+      'URL': self.url,
+      'Revision': 42,
+    }
+
+    # Checks to make sure that we support svn co --depth.
+    gclient_scm.scm.SVN.current_version = None
+    gclient_scm.scm.SVN.Capture(['--version']
+        ).AndReturn('svn, version 1.4.4 (r25188)')
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path)
+        ).AndReturn(True)
+
+    # When checking out a single file with svn 1.4, we use svn export
+    files_list = self.mox.CreateMockAnything()
+    gclient_scm.scm.SVN.Run(
+        ['export', gclient_scm.os.path.join(self.url, 'DEPS'),
+            gclient_scm.os.path.join(base_path, 'DEPS')], self.root_dir)
+
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    scm.updatesingle(options, ['DEPS'], files_list)
+
+  def testUpdateSingleCheckoutSVNUpgrade(self):
+    options = self.Options(verbose=True)
+    base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
+    file_info = {
+      'URL': self.url,
+      'Revision': 42,
+    }
+
+    # Checks to make sure that we support svn co --depth.
+    gclient_scm.scm.SVN.current_version = None
+    gclient_scm.scm.SVN.Capture(['--version']
+        ).AndReturn('svn, version 1.5.1 (r32289)')
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
+        ).AndReturn(False)
+    # If DEPS already exists, assume we're upgrading from svn1.4, so delete
+    # the old DEPS file.
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, 'DEPS')
+        ).AndReturn(True)
+    gclient_scm.os.remove(gclient_scm.os.path.join(base_path, 'DEPS'))
+
+    # When checking out a single file, we issue an svn checkout and svn update.
+    files_list = self.mox.CreateMockAnything()
+    gclient_scm.scm.SVN.Run(
+        ['checkout', '--depth', 'empty', self.url, base_path], self.root_dir)
+    gclient_scm.scm.SVN.RunAndGetFileList(options, ['update', 'DEPS'],
+        gclient_scm.os.path.join(self.root_dir, self.relpath), files_list)
+
+    # Now we fall back on scm.update().
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
+        ).AndReturn(False)
+    gclient_scm.os.path.exists(base_path).AndReturn(True)
+    gclient_scm.scm.SVN.CaptureInfo(
+        gclient_scm.os.path.join(base_path, "."), '.'
+        ).AndReturn(file_info)
+    gclient_scm.scm.SVN.CaptureInfo(file_info['URL'], '.').AndReturn(file_info)
+    print("\n_____ %s at 42" % self.relpath)
+
+    self.mox.ReplayAll()
+    scm = self._scm_wrapper(url=self.url, root_dir=self.root_dir,
+                            relpath=self.relpath)
+    scm.updatesingle(options, ['DEPS'], files_list)
+
   def testUpdateSingleUpdate(self):
     options = self.Options(verbose=True)
     base_path = gclient_scm.os.path.join(self.root_dir, self.relpath)
     file_info = {
       'URL': self.url,
       'Revision': 42,
     }
-    gclient_scm.os.path.exists(base_path).AndReturn(True)
+    # Checks to make sure that we support svn co --depth.
+    gclient_scm.scm.SVN.current_version = None
+    gclient_scm.scm.SVN.Capture(['--version']
+        ).AndReturn('svn, version 1.5.1 (r32289)')
+    gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.svn')
+        ).AndReturn(True)
 
     # Now we fall back on scm.update().
     files_list = self.mox.CreateMockAnything()
     gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
                                ).AndReturn(False)
     gclient_scm.os.path.exists(base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
         gclient_scm.os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL'], '.').AndReturn(file_info)
@@ skipping 318 matching lines @@
                                 relpath=self.relpath)
     rev_info = scm.revinfo(options, (), None)
     self.assertEquals(rev_info, '069c602044c5388d2d15c3f875b057c852003458')
 
 
 if __name__ == '__main__':
   import unittest
   unittest.main()
 
 # vim: ts=2:sw=2:tw=80:et: