Changeset 53715 in webkit

Timestamp:

Jan 22, 2010 2:04:51 PM (14 years ago)

Author:

Chris Jerdonek

Message:

33791: Proposed patch 1 (amended with preferred license)

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/check-webkit-style (modified) (2 diffs)
• Scripts/webkitpy/style/__init__.py (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (2 diffs)
• Scripts/webkitpy/style_references.py (added)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-22  Chris Jerdonek  <cjerdonek@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Made check-webkit-style able to check patches when script not
+        run from source root. Also consolidated external references
+        to a single file.
+
+        https://bugs.webkit.org/show_bug.cgi?id=33791
+
+        * Scripts/check-webkit-style:
+          - Changed to import style_references.py.
+
+        * Scripts/webkitpy/style/__init__.py:
+          - Removed __path__ hack that allowed searching Scripts/ directory.
+
+        * Scripts/webkitpy/style/checker.py:
+          - Changed to import style_references.py.
+
+        * Scripts/webkitpy/style_references.py: Added.
+
 2010-01-22  Dmitry Titov  <dimich@chromium.org>
 

trunk/WebKitTools/Scripts/check-webkit-style

@@ -49 +49 @@
 
 import webkitpy.style.checker as checker
-from webkitpy.scm import detect_scm_system
-
+from webkitpy.style_references import SimpleScm
 
 def main():
@@ -72 +71 @@
 
     else:
-        cwd = os.path.abspath('.')
-        scm = detect_scm_system(cwd)
+        scm = SimpleScm()
+
+        os.chdir(scm.checkout_root())
 
         if options.git_commit:

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

@@ -1 +1 @@
 # Required for Python to search this directory for module files
-
-import os
-
-# Add containing "webkitpy" package directory to search path.
-__path__.append(os.path.join(__path__[0], ".."))

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

@@ -35 +35 @@
 import sys
 
-from diff_parser import DiffParser
+from .. style_references import parse_patch
 from cpp_style import CppProcessor
 from text_style import TextProcessor
@@ -890 +890 @@
 
         """
-        patch = DiffParser(patch_string.splitlines())
-        for file_path, diff in patch.files.iteritems():
+        patch_files = parse_patch(patch_string)
+        for file_path, diff in patch_files.iteritems():
             line_numbers = set()