Changeset 96441 in webkit

Timestamp:

Sep 30, 2011 5:39:52 PM (13 years ago)

Author:

levin@chromium.org

Message:

watchlist: Add a way to detect a net increase or decrease of a pattern (in a file).
​https://bugs.webkit.org/show_bug.cgi?id=69031

Reviewed by Adam Barth.

• Scripts/webkitpy/common/config/watchlist: Added usage of the new pattern,

a comment to explain something important about the email addresses, and
a comment to let emacs know to treat the file as a python file.

• Scripts/webkitpy/common/watchlist/amountchangedpattern.py: Added.

Detects increases or decreases in a pattern.

• Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py: Added.
• Scripts/webkitpy/common/watchlist/watchlist_unittest.py:

Added unit tests for watchlist which has "more" or "less".

• Scripts/webkitpy/common/watchlist/watchlistparser.py:

Added support for "more" or "less".

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/watchlist (modified) (1 diff)
• Scripts/webkitpy/common/watchlist/amountchangedpattern.py (added)
• Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py (added)
• Scripts/webkitpy/common/watchlist/watchlist_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/common/watchlist/watchlistparser.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-30  David Levin  <levin@chromium.org>
+
+        watchlist: Add a way to detect a net increase or decrease of a pattern (in a file).
+        https://bugs.webkit.org/show_bug.cgi?id=69031
+
+        Reviewed by Adam Barth.
+
+        * Scripts/webkitpy/common/config/watchlist: Added usage of the new pattern,
+        a comment to explain something important about the email addresses, and
+        a comment to let emacs know to treat the file as a python file.
+        * Scripts/webkitpy/common/watchlist/amountchangedpattern.py: Added.
+        Detects increases or decreases in a pattern.
+        * Scripts/webkitpy/common/watchlist/amountchangedpattern_unittest.py: Added.
+        * Scripts/webkitpy/common/watchlist/watchlist_unittest.py:
+        Added unit tests for watchlist which has "more" or "less".
+        * Scripts/webkitpy/common/watchlist/watchlistparser.py:
+        Added support for "more" or "less".
+
 2011-09-30  Sam Weinig  <sam@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/config/watchlist

@@ +1 @@
+#  -*- mode: Python;-*-
 {
     "DEFINITIONS": {
         "WatchListScript": {
-            "filename": (r"Tools/Scripts/webkitpy/common/watchlist/.*"),
+            "filename": r"Tools/Scripts/webkitpy/common/watchlist/.*",
+        },
+        "ThreadingFiles": {
+            "filename": r"Source/JavaScriptCore/wtf/ThreadSafeRefCounted\.h"
+                        r"|Source/JavaScriptCore/wtf/Threading\.h",
+        },
+        "ThreadingUsage": {
+            "more": r"deprecatedTurnOffVerifier|crossThreadString|threadsafeCopy|ThreadSafeRefCounted|CrossThreadRefCounted",
         },
     },
     "CC_RULES": {
+        # Note: All email addresses listed must be registered with bugzilla.
+        # Specifically, levin@chromium.org and levin+threading@chromium.org are
+        # two different accounts as far as bugzilla is concerned.
         "WatchListScript": [ "levin+watchlist@chromium.org", ],
+        "ThreadingFiles|ThreadingUsage": [ "levin+threading@chromium.org", ],
     },
 }

trunk/Tools/Scripts/webkitpy/common/watchlist/watchlist_unittest.py

@@ -213 +213 @@
                 }, cc_set_and_messages)
 
+    def test_more_and_less_match(self):
+        watch_list = self._watch_list_parser.parse(
+            '{'
+            '    "DEFINITIONS": {'
+            '        "WatchList1": {'
+            # This pattern is in both added and deleted lines, so no match.
+            '            "more": r"userSelect == o\.userSelect",'
+            '        },'
+            '        "WatchList2": {'
+            '            "more": r"boxOrient\(o\.boxOrient\)",'
+            '        },'
+            '        "WatchList3": {'
+            '            "less": r"unsigned orient"'
+            '        },'
+            '     },'
+            '    "CC_RULES": {'
+            '        "WatchList1": [ "eric@webkit.org", ],'
+            '        "WatchList2": [ "levin@chromium.org", ],'
+            '    },'
+            '    "MESSAGE_RULES": {'
+            '        "WatchList3": ["Test message."],'
+            '    },'
+            '}')
+        cc_set_and_messages = watch_list.determine_cc_set_and_messages(DIFF_TEST_DATA)
+        self.assertEquals({
+                'cc_set': set(['levin@chromium.org']),
+                'messages': set(["Test message."]),
+                }, cc_set_and_messages)
+
     def test_complex_match(self):
         watch_list = self._watch_list_parser.parse(
@@ -219 +248 @@
             '        "WatchList1": {'
             '            "filename": r"WebCore/rendering/style/StyleRareInheritedData\.cpp",'
-            '            "in_added_lines": r"\&\& boxOrient == o.boxOrient;",'
-            '            "in_deleted_lines": r"\&\& userSelect == o.userSelect;",'
+            '            "in_added_lines": r"\&\& boxOrient == o\.boxOrient;",'
+            '            "in_deleted_lines": r"\&\& userSelect == o\.userSelect;",'
+            '            "more": r"boxOrient\(o\.boxOrient\)",'
             '        },'
             '        "WatchList2": {'
             '            "filename": r"WebCore/rendering/style/StyleRareInheritedData\.cpp",'
             '            "in_added_lines": r"RenderStyle::initialBoxOrient",'
+            '            "less": r"userSelect;"'
             '        },'
             # WatchList3 won't match because these two patterns aren't in the same file.

trunk/Tools/Scripts/webkitpy/common/watchlist/watchlistparser.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+
 import difflib
 import re
 
+from webkitpy.common.watchlist.amountchangedpattern import AmountChangedPattern
 from webkitpy.common.watchlist.changedlinepattern import ChangedLinePattern
 from webkitpy.common.watchlist.filenamepattern import FilenamePattern
@@ -52 +54 @@
             'in_added_lines': (lambda regex: ChangedLinePattern(regex, 0)),
             'in_deleted_lines': (lambda regex: ChangedLinePattern(regex, 1)),
+            'less': (lambda regex: AmountChangedPattern(regex, 1)),
+            'more': (lambda regex: AmountChangedPattern(regex, 0)),
         }