Changeset 57870 in webkit

Timestamp:

Apr 19, 2010 10:41:51 PM (14 years ago)

Author:

hamaji@chromium.org

Message:

2010-04-19 Shinichiro Hamaji <​hamaji@chromium.org>

Reviewed by David Levin.

check-webkit-style: exits when encountering a deleted file
​https://bugs.webkit.org/show_bug.cgi?id=37122

This reverts the quick fix done by r57119 and makes check_patch
not call check_file for deleted files.

Also this change fixes the behavior for "-", which should mean
stdin. Before this change, the style checker just ignored "-"
with a warning message.

• Scripts/webkitpy/style/checker.py:
• Scripts/webkitpy/style/checker_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (3 diffs)
• Scripts/webkitpy/style/checker_unittest.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-19  Shinichiro Hamaji  <hamaji@chromium.org>
+
+        Reviewed by David Levin.
+
+        check-webkit-style: exits when encountering a deleted file
+        https://bugs.webkit.org/show_bug.cgi?id=37122
+
+        This reverts the quick fix done by r57119 and makes check_patch
+        not call check_file for deleted files.
+
+        Also this change fixes the behavior for "-", which should mean
+        stdin.  Before this change, the style checker just ignored "-"
+        with a warning message.
+
+        * Scripts/webkitpy/style/checker.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+
 2010-04-19  Daniel Bates  <dbates@rim.com>
 

trunk/WebKitTools/Scripts/webkitpy/style/checker.py

@@ -691 +691 @@
                              class.
 
+        Raises:
+          SystemExit: if the file does not exist.
+
         """
         if mock_handle_style_error is None:
@@ -707 +710 @@
                         mock_process_file)
 
-        if not os_path_exists(file_path):
-            _log.warn("Skipping non-existent file: %s" % file_path)
-            return
+        if not os_path_exists(file_path) and file_path != "-":
+            _log.error("File does not exist: %s" % file_path)
+            sys.exit(1)
 
         _log.debug("Checking: " + file_path)
@@ -767 +770 @@
                        % (len(line_numbers), path))
 
-            self._file_checker.check_file(file_path=path,
-                                          line_numbers=line_numbers)
+            # If line_numbers is empty, the file has no new or
+            # modified lines.  In this case, we don't check the file
+            # because we'll never output errors for the file.
+            # This optimization also prevents the program from exiting
+            # due to a deleted file.
+            if line_numbers:
+                self._file_checker.check_file(file_path=path,
+                                              line_numbers=line_numbers)

trunk/WebKitTools/Scripts/webkitpy/style/checker_unittest.py

@@ -632 +632 @@
             mock_process_file=self.mock_process_file)
 
-        file_count = 1 if self.mock_os_path_exists(file_path) else 0
-
-        self.assertEquals(file_count, style_checker.file_count)
+        self.assertEquals(style_checker.file_count, 1)
 
     def test_check_file_does_not_exist(self):
@@ -643 +641 @@
 
         # Check the outcome.
+        self.assertRaises(SystemExit, self.call_check_file, file_path)
+        self.assertLog(["ERROR: File does not exist: "
+                        "file_does_not_exist.txt\n"])
+
+    def test_check_file_stdin(self):
+        file_path = "-"
+
+        # Confirm that the file does not exist.
+        self.assertFalse(self.mock_os_path_exists(file_path))
+
+        # Check the outcome.
         self.call_check_file(file_path)
-        self.assert_attributes(None, None, None, "")
-        self.assertLog(['WARNING: Skipping non-existent file: '
-                        'file_does_not_exist.txt\n'])
+        expected_processor = CppProcessor(file_path,
+                                          "",
+                                          self.mock_handle_style_error, 3)
+        self.assert_attributes(file_path,
+                               self.mock_handle_style_error,
+                               expected_processor,
+                               "")
 
     def test_check_file_on_skip_without_warning(self):
@@ -783 +796 @@
 """)
         self._assert_checked([("__init__.py", set([2]))])
+
+    def test_check_patch_with_deletion(self):
+        self._call_check_patch("""Index: __init__.py
+===================================================================
+--- __init__.py  (revision 3593)
++++ __init__.py  (working copy)
+@@ -1 +0,0 @@
+-foobar
+""")
+        # _mock_check_file should not be called for the deletion patch.
+        self._assert_checked([])