From 13ccc77201d9027f1f1a10958f698df10eb1e565 Mon Sep 17 00:00:00 2001 From: "thestig@chromium.org" Date: Mon, 23 Nov 2015 23:07:38 +0000 Subject: [PATCH] Remove unused CheckSvnModifiedDirectories. Review URL: https://codereview.chromium.org/1435333005 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@297676 0039d316-1c4b-4281-b951-d872f2087c98 --- presubmit_canned_checks.py | 36 ------------------------------------ tests/presubmit_unittest.py | 27 --------------------------- 2 files changed, 63 deletions(-) diff --git a/presubmit_canned_checks.py b/presubmit_canned_checks.py index 3abdbb499..7438c8c15 100644 --- a/presubmit_canned_checks.py +++ b/presubmit_canned_checks.py @@ -161,42 +161,6 @@ def CheckChangeHasNoCR(input_api, output_api, source_file_filter=None): return [] -def CheckSvnModifiedDirectories(input_api, output_api, source_file_filter=None): - """Checks for files in svn modified directories. - - They will get submitted on accident because svn commits recursively by - default, and that's very dangerous. - """ - if input_api.change.scm != 'svn': - return [] - - errors = [] - current_cl_files = input_api.change.GetModifiedFiles() - all_modified_files = input_api.change.GetAllModifiedFiles() - # Filter out files in the current CL. - modified_files = [f for f in all_modified_files if f not in current_cl_files] - modified_abspaths = [input_api.os_path.abspath(f) for f in modified_files] - - for f in input_api.AffectedFiles(file_filter=source_file_filter): - if f.Action() == 'M' and f.IsDirectory(): - curpath = f.AbsoluteLocalPath() - bad_files = [] - # Check if any of the modified files in other CLs are under curpath. - for i in xrange(len(modified_files)): - abspath = modified_abspaths[i] - if input_api.os_path.commonprefix([curpath, abspath]) == curpath: - bad_files.append(modified_files[i]) - if bad_files: - if input_api.is_committing: - error_type = output_api.PresubmitPromptWarning - else: - error_type = output_api.PresubmitNotifyResult - errors.append(error_type( - 'Potential accidental commits in changelist %s:' % f.LocalPath(), - items=bad_files)) - return errors - - def CheckChangeHasOnlyOneEol(input_api, output_api, source_file_filter=None): """Checks the files ends with one and only one \n (LF).""" eof_files = [] diff --git a/tests/presubmit_unittest.py b/tests/presubmit_unittest.py index 6456e0e6c..8f52a9ffd 100755 --- a/tests/presubmit_unittest.py +++ b/tests/presubmit_unittest.py @@ -1887,7 +1887,6 @@ class CannedChecksUnittest(PresubmitTestsBase): 'CheckGNFormatted', 'CheckRietveldTryJobExecution', 'CheckSingletonInHeaders', - 'CheckSvnModifiedDirectories', 'CheckSvnForCommonMimeTypes', 'CheckSvnProperty', 'RunPythonUnitTests', 'RunPylint', 'RunUnitTests', 'RunUnitTestsInDirectory', @@ -2334,32 +2333,6 @@ class CannedChecksUnittest(PresubmitTestsBase): ) self._LicenseCheck(text, license_text, True, None, accept_empty_files=True) - def testCannedCheckSvnAccidentalSubmission(self): - modified_dir_file = 'foo/' - accidental_submssion_file = 'foo/bar.cc' - - change = self.mox.CreateMock(presubmit.SvnChange) - change.scm = 'svn' - change.GetModifiedFiles().AndReturn([modified_dir_file]) - change.GetAllModifiedFiles().AndReturn([modified_dir_file, - accidental_submssion_file]) - input_api = self.MockInputApi(change, True) - - affected_file = self.mox.CreateMock(presubmit.SvnAffectedFile) - affected_file.Action().AndReturn('M') - affected_file.IsDirectory().AndReturn(True) - affected_file.AbsoluteLocalPath().AndReturn(accidental_submssion_file) - affected_file.LocalPath().AndReturn(accidental_submssion_file) - input_api.AffectedFiles(file_filter=None).AndReturn([affected_file]) - - self.mox.ReplayAll() - - check = presubmit_canned_checks.CheckSvnModifiedDirectories - results = check(input_api, presubmit.OutputApi, None) - self.assertEquals(len(results), 1) - self.assertEquals(results[0].__class__, - presubmit.OutputApi.PresubmitPromptWarning) - def testCheckSvnForCommonMimeTypes(self): self.mox.StubOutWithMock(presubmit_canned_checks, 'CheckSvnProperty') input_api = self.MockInputApi(None, False)