Make checkout.*.prepare() delete the svn:ignored files.
Add corresponding support to scm.SVN.Revert() to clobber the svn:ignore'd files.
This makes the commit queue remove all the unversioned files, which could have
improved its stability. It failed in practice to improve it but it's still a
good thing to do overall.
R=petermayo@chromium.org
BUG=
TEST=
Review URL: http://codereview.chromium.org/10355014
git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@135333 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tests/gclient_scm_test.py b/tests/gclient_scm_test.py
index 0d8e722..d7425c5 100755
--- a/tests/gclient_scm_test.py
+++ b/tests/gclient_scm_test.py
@@ -239,7 +239,8 @@
options = self.Options(verbose=True)
gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
gclient_scm.os.path.isdir(join(self.base_path, '.svn')).AndReturn(True)
- gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn([])
+ gclient_scm.scm.SVN.CaptureStatus(
+ None, self.base_path, no_ignore=False).AndReturn([])
gclient_scm.os.path.isdir(self.base_path).AndReturn(True)
gclient_scm.scm.SVN.RunAndGetFileList(
options.verbose,
@@ -260,7 +261,8 @@
items = [
('~ ', 'a'),
]
- gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn(items)
+ gclient_scm.scm.SVN.CaptureStatus(
+ None, self.base_path, no_ignore=False).AndReturn(items)
file_path = join(self.base_path, 'a')
gclient_scm.os.path.exists(file_path).AndReturn(True)
gclient_scm.os.path.isfile(file_path).AndReturn(False)
@@ -289,7 +291,8 @@
items = [
('~ ', '.'),
]
- gclient_scm.scm.SVN.CaptureStatus(None, self.base_path).AndReturn(items)
+ gclient_scm.scm.SVN.CaptureStatus(
+ None, self.base_path, no_ignore=False).AndReturn(items)
# RemoveDirectory() doesn't work on path ending with '.', like 'foo/.'.
file_path = self.base_path
gclient_scm.os.path.exists(file_path).AndReturn(True)