Context Navigation

Changeset 64743 in webkit

Timestamp:

Aug 5, 2010 6:41:17 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-08-05 Kenichi Ishibashi <bashi@google.com>

Reviewed by Shinichiro Hamaji.

check-webkit-style returns non-zero when patch is entirely minus lines.
https://bugs.webkit.org/show_bug.cgi?id=38169

Scripts/check-webkit-style: Check whether a patch contains modified files that are entirely minus lines.
Scripts/webkitpy/style/filereader.py: Add a variable that holds number of files that contain only deleted lines.
Scripts/webkitpy/style/patchreader.py: Count up modified files that contain only deleted lines.

Location:

trunk/WebKitTools

Files:

-                      r64729
+                      r64743
+-08-05  Kenichi Ishibashi  <bashi@google.com>
+        Reviewed by Shinichiro Hamaji.
+        check-webkit-style returns non-zero when patch is entirely minus lines.
+        https://bugs.webkit.org/show_bug.cgi?id=38169
+        * Scripts/check-webkit-style:
+        Check whether a patch contains modified files that are entirely minus lines.
+        * Scripts/webkitpy/style/filereader.py:
+        Add a variable that holds number of files that contain only deleted lines.
+        * Scripts/webkitpy/style/patchreader.py:
+        Count up modified files that contain only deleted lines.
 -08-05  Pavel Feldman  <pfeldman@chromium.org>

-                      r63004
+                      r64743
     error_count = style_processor.error_count
     file_count = file_reader.file_count
+    delete_only_file_count = file_reader.delete_only_file_count
     _log.info("Total errors found: %d in %d files"
               % (error_count, file_count))
     # We fail when style errors are found or there are no checked files.
     sys.exit(error_count > 0 or file_count == 0)
+    sys.exit(error_count > 0 or (file_count == 0 and delete_only_file_count == 0))

-                      r58249
+                      r64743
                      for processing, including non-text files and files
                      that should be skipped.
+         delete_only_file_count: The total number of files that are not
+                                 processed this instance actually because
+                                 the files don't have any modified lines
+                                 but should be treated as processed.
     """
 …
         self._processor = processor
         self.file_count = 0
+        self.delete_only_file_count = 0
     def _read_lines(self, file_path):
 …
             else:
                 self.process_file(path)
+    def count_delete_only_file(self):
+        """Count up files that contains only deleted lines.
+        Files which has no modified or newly-added lines don't need
+        to check style, but should be treated as checked. For that
+        purpose, we just count up the number of such files.
+        """
+        self.delete_only_file_count += 1

-                      r58249
+                      r64743
                      (['foo'], file_path1, None)]
         self._assert_file_reader(processed, 2)
+    def test_count_delete_only_file(self):
+        self._file_reader.count_delete_only_file()
+        delete_only_file_count = self._file_reader.delete_only_file_count
+        self.assertEquals(delete_only_file_count, 1)

-                      r60053
+                      r64743
                 self._text_file_reader.process_file(file_path=path,
                                                     line_numbers=line_numbers)
+            else:
+                # We don't check the file which contains deleted lines only
+                # but would like to treat it as to be processed so that
+                # we count up number of such files.
+                self._text_file_reader.count_delete_only_file()

-                      r60053
+                      r64743
             self.passed_to_process_file = []
             """A list of (file_path, line_numbers) pairs."""
+            self.delete_only_file_count = 0
+            """A number of times count_delete_only_file() called"""
         def process_file(self, file_path, line_numbers):
             self.passed_to_process_file.append((file_path, line_numbers))
+        def count_delete_only_file(self):
+            self.delete_only_file_count += 1
     def setUp(self):
 …
         self._patch_checker.check(patch_string)
     def _assert_checked(self, passed_to_process_file):
+    def _assert_checked(self, passed_to_process_file, delete_only_file_count):
         self.assertEquals(self._file_reader.passed_to_process_file,
                           passed_to_process_file)
+        self.assertEquals(self._file_reader.delete_only_file_count,
+                          delete_only_file_count)
     def test_check_patch(self):
 …
 +# New line
 """)
         self._assert_checked([("__init__.py", set([2]))])
+        self._assert_checked([("__init__.py", set([2]))], 0)
     def test_check_patch_with_deletion(self):
 …
 """)
         # _mock_check_file should not be called for the deletion patch.
         self._assert_checked([])
+        self._assert_checked([], 1)

Note: See TracChangeset for help on using the changeset viewer.