Add a presubmit check for accidental checkins of files under a SVN modified d...

presubmit_canned_checks.py

 #!/usr/bin/env python
 # Copyright (c) 2006-2009 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.
 
 """Generic presubmit checks that can be reused by other presubmit checks."""
 
 
 ### Description checks
 
@@ skipping 70 matching lines @@
   cr_files = []
   for f in input_api.AffectedSourceFiles(source_file_filter):
     if '\r' in input_api.ReadFile(f, 'rb'):
       cr_files.append(f.LocalPath())
   if cr_files:
     return [output_api.PresubmitPromptWarning(
         "Found a CR character in these files:", items=cr_files)]
   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(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 = []
   for f in input_api.AffectedSourceFiles(source_file_filter):
     contents = input_api.ReadFile(f, 'rb')
     # Check that the file ends in one and only one newline character.
     if len(contents) > 1 and (contents[-1:] != "\n" or contents[-2:-1] == "\n"):
       eof_files.append(f.LocalPath())
 
   if eof_files:
@@ skipping 112 matching lines @@
   RunCheck('image/bmp', FilterFiles(['.bmp']))
   RunCheck('image/gif', FilterFiles(['.gif']))
   RunCheck('image/png', FilterFiles(['.png']))
   RunCheck('image/jpeg', FilterFiles(['.jpg', '.jpeg', '.jpe']))
   RunCheck('image/vnd.microsoft.icon', FilterFiles(['.ico']))
   return output
 
 
 def CheckSvnProperty(input_api, output_api, prop, expected, affected_files):
   """Checks that affected_files files have prop=expected."""
-  bad = filter(lambda f: f.scm == 'svn' and f.Property(prop) != expected,
-               affected_files)
+  if input_api.change.scm != 'svn':
+    return []
+
+  bad = filter(lambda f: f.Property(prop) != expected, affected_files)
   if bad:
     if input_api.is_committing:
       type = output_api.PresubmitError
     else:
       type = output_api.PresubmitNotifyResult
     message = "Run `svn pset %s %s <item>` on these files:" % (prop, expected)
     return [type(message, items=bad)]
   return []
 
 
@@ skipping 66 matching lines @@
         stderr=input_api.subprocess.PIPE)
     stdoutdata, stderrdata = subproc.communicate()
     # Discard the output if returncode == 0
     if subproc.returncode:
       outputs.append("Test '%s' failed with code %d\n%s\n%s\n" % (
           unit_test_name, subproc.returncode, stdoutdata, stderrdata))
   if outputs:
     return [message_type("%d unit tests failed." % len(outputs),
                                 long_text='\n'.join(outputs))]
   return []