Add code to automatically svn cleanup during svn update.

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 237 matching lines @@
     options.force = True
     options.nohooks = False
     file_info = {
       'Repository Root': 'blah',
       'URL': self.url,
       'UUID': 'ABC',
       'Revision': 42,
     }
     gclient_scm.os.path.exists(gclient_scm.os.path.join(base_path, '.git')
                                ).AndReturn(False)
+
+    # Verify no locked files.
+    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+        ).AndReturn([])
+
     # Checkout or update.
     gclient_scm.os.path.exists(base_path).AndReturn(True)
     gclient_scm.scm.SVN.CaptureInfo(
         gclient_scm.os.path.join(base_path, "."), '.'
         ).AndReturn(file_info)
     # Cheat a bit here.
     gclient_scm.scm.SVN.CaptureInfo(file_info['URL'], '.').AndReturn(file_info)
     additional_args = []
     if options.manually_grab_svn_rev:
       additional_args = ['--revision', str(file_info['Revision'])]
@@ skipping 20 matching lines @@
 
     # 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)
 
+    # Verify no locked files.
+    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+        ).AndReturn([])
+
     # 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)
@@ skipping 48 matching lines @@
     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'))
 
+    # Verify no locked files.
+    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+        ).AndReturn([])
+
     # 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)
@@ skipping 16 matching lines @@
       '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(True)
 
+    # Verify no locked files.
+    gclient_scm.scm.SVN.CaptureStatus(gclient_scm.os.path.join(base_path, '.')
+        ).AndReturn([])
+
     # 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)
     print("\n_____ %s at 42" % self.relpath)
@@ skipping 323 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: