Changeset 99786 in webkit

Timestamp:

Nov 9, 2011, 5:07:12 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Add cc-bugs group to watch changes in chromium graphics
​https://bugs.webkit.org/show_bug.cgi?id=71690

Patch by Dana Jansens <​danakj@chromium.org> on 2011-11-09
Reviewed by David Levin.

• Scripts/webkitpy/common/config/committers.py: Make new Account superclass for non-contributor watch accounts
• Scripts/webkitpy/common/config/committers_unittest.py: Test the Account superclass
• Scripts/webkitpy/common/config/watchlist: Add ​cc-bugs@google.com to watch list
• Scripts/webkitpy/common/watchlist/watchlistparser.py: Check for Accounts also, but require it to be the bugzilla email for any Account/Contributor/etc.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/config/committers.py (modified) (7 diffs)
• Scripts/webkitpy/common/config/committers_unittest.py (modified) (2 diffs)
• Scripts/webkitpy/common/config/watchlist (modified) (1 diff)
• Scripts/webkitpy/common/watchlist/watchlistparser.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-09  Dana Jansens  <danakj@chromium.org>
+
+        Add cc-bugs group to watch changes in chromium graphics
+        https://bugs.webkit.org/show_bug.cgi?id=71690
+
+        Reviewed by David Levin.
+
+        * Scripts/webkitpy/common/config/committers.py: Make new Account superclass for non-contributor watch accounts
+        * Scripts/webkitpy/common/config/committers_unittest.py: Test the Account superclass
+        * Scripts/webkitpy/common/config/watchlist: Add cc-bugs@google.com to watch list
+        * Scripts/webkitpy/common/watchlist/watchlistparser.py: Check for Accounts also, but require it to be the bugzilla email for any Account/Contributor/etc.
+
 2011-11-09  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/config/committers.py

@@ -30 +30 @@
 # WebKit's Python module for committer and reviewer validation.
 
-class Contributor(object):
+
+class Account(object):
     def __init__(self, name, email_or_emails, irc_nickname_or_nicknames=None):
         assert(name)
@@ -69 +70 @@
 
 
+class Contributor(Account):
+    def __init__(self, name, email_or_emails, irc_nickname=None):
+        Account.__init__(self, name, email_or_emails, irc_nickname)
+        self.is_contributor = True
+
+
 class Committer(Contributor):
     def __init__(self, name, email_or_emails, irc_nickname=None):
@@ -79 +86 @@
         Committer.__init__(self, name, email_or_emails, irc_nickname)
         self.can_review = True
+
+
+# This is a list of email addresses that have bugzilla accounts but are not
+# used for contributing (such as mailing lists).
+
+
+watchers_who_are_not_contributors = [
+    Account("Chromium Compositor Bugs", ["cc-bugs@google.com"], ""),
+    Account("David Levin", ["levin+threading@chromium.org"], ""),
+    Account("David Levin", ["levin+watchlist@chromium.org"], ""),
+]
 
 
@@ -361 +379 @@
     Reviewer("David Hyatt", "hyatt@apple.com", ["dhyatt", "hyatt"]),
     Reviewer("David Kilzer", ["ddkilzer@webkit.org", "ddkilzer@apple.com"], "ddkilzer"),
-    Reviewer("David Levin", ["levin@chromium.org", "levin+threading@chromium.org", "levin+watchlist@chromium.org"], "dave_levin"),
+    Reviewer("David Levin", "levin@chromium.org", "dave_levin"),
     Reviewer("Dean Jackson", "dino@apple.com", "dino"),
     Reviewer("Dimitri Glazkov", "dglazkov@chromium.org", "dglazkov"),
@@ -439 +457 @@
                  committers=committers_unable_to_review,
                  reviewers=reviewers_list,
-                 contributors=contributors_who_are_not_committers):
+                 contributors=contributors_who_are_not_committers,
+                 watchers=watchers_who_are_not_contributors):
+        self._accounts = watchers + contributors + committers + reviewers
         self._contributors = contributors + committers + reviewers
         self._committers = committers + reviewers
         self._reviewers = reviewers
-        self._contributors_by_email = {}
+        self._accounts_by_email = {}
+        self._accounts_by_login = {}
+
+    def accounts(self):
+        return self._accounts
 
     def contributors(self):
@@ -454 +478 @@
         return self._reviewers
 
-    def _email_to_contributor_map(self):
-        if not len(self._contributors_by_email):
-            for contributor in self._contributors:
-                for email in contributor.emails:
-                    assert(email not in self._contributors_by_email)  # We should never have duplicate emails.
-                    self._contributors_by_email[email] = contributor
-        return self._contributors_by_email
+    def _email_to_account_map(self):
+        if not len(self._accounts_by_email):
+            for account in self._accounts:
+                for email in account.emails:
+                    assert(email not in self._accounts_by_email)  # We should never have duplicate emails.
+                    self._accounts_by_email[email] = account
+        return self._accounts_by_email
+
+    def _login_to_account_map(self):
+        if not len(self._accounts_by_login):
+            for account in self._accounts:
+                if account.emails:
+                    login = account.bugzilla_email()
+                    assert(login not in self._accounts_by_login)  # We should never have duplicate emails.
+                    self._accounts_by_login[login] = account
+        return self._accounts_by_login
+
+    def _contributor_only(self, record):
+        if record and not record.is_contributor:
+            return None
+        return record
 
     def _committer_only(self, record):
@@ -491 +529 @@
         return filter(lambda contributor: contributor.contains_string(string), self.contributors())
 
+    def account_by_login(self, login):
+        return self._login_to_account_map().get(login.lower())
+
+    def account_by_email(self, email):
+        return self._email_to_account_map().get(email.lower())
+
     def contributor_by_email(self, email):
-        return self._email_to_contributor_map().get(email.lower())
+        return self._contributor_only(self.account_by_email(email))
 
     def committer_by_email(self, email):
-        return self._committer_only(self.contributor_by_email(email))
+        return self._committer_only(self.account_by_email(email))
 
     def reviewer_by_email(self, email):
-        return self._reviewer_only(self.contributor_by_email(email))
+        return self._reviewer_only(self.account_by_email(email))

trunk/Tools/Scripts/webkitpy/common/config/committers_unittest.py

@@ -28 +28 @@
 
 import unittest
-from webkitpy.common.config.committers import CommitterList, Contributor, Committer, Reviewer
+from webkitpy.common.config.committers import Account, CommitterList, Contributor, Committer, Reviewer
 
 class CommittersTest(unittest.TestCase):
     def test_committer_lookup(self):
+        account = Account('Test Zero', ['zero@test.com', 'zero@gmail.com'], 'zero')
         committer = Committer('Test One', 'one@test.com', 'one')
         reviewer = Reviewer('Test Two', ['two@test.com', 'Two@rad.com', 'so_two@gmail.com'])
         contributor = Contributor('Test Three', ['Three@test.com'], 'three')
         contributor_with_two_nicknames = Contributor('Other Four', ['otherfour@webkit.org'], ['four', 'otherfour'])
-        committer_list = CommitterList(committers=[committer], reviewers=[reviewer], contributors=[contributor, contributor_with_two_nicknames])
+        committer_list = CommitterList(watchers=[account], committers=[committer], reviewers=[reviewer], contributors=[contributor, contributor_with_two_nicknames])
 
         # Test valid committer, reviewer and contributor lookup
+        self.assertEqual(committer_list.account_by_email('zero@test.com'), account)
         self.assertEqual(committer_list.committer_by_email('one@test.com'), committer)
         self.assertEqual(committer_list.reviewer_by_email('two@test.com'), reviewer)
@@ -54 +56 @@
         # Test that the first email is assumed to be the Bugzilla email address (for now)
         self.assertEqual(committer_list.committer_by_email('two@rad.com').bugzilla_email(), 'two@test.com')
+
+        # Test lookup by login email address
+        self.assertEqual(committer_list.account_by_login('zero@test.com'), account)
+        self.assertEqual(committer_list.account_by_login('zero@gmail.com'), None)
+        self.assertEqual(committer_list.account_by_login('one@test.com'), committer)
+        self.assertEqual(committer_list.account_by_login('two@test.com'), reviewer)
+        self.assertEqual(committer_list.account_by_login('Two@rad.com'), None)
+        self.assertEqual(committer_list.account_by_login('so_two@gmail.com'), None)
 
         # Test that a known committer is not returned during reviewer lookup

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

@@ -116 +116 @@
         # two different accounts as far as bugzilla is concerned.
         "ChromiumDumpRenderTree": [ "tkent@chromium.org", ],
-        "ChromiumGraphics": [ "jamesr@chromium.org", ],
+        "ChromiumGraphics": [ "jamesr@chromium.org", "cc-bugs@google.com" ],
         "ChromiumPublicApi": [ "fishd@chromium.org", ],
         "Forms": [ "tkent@chromium.org", ],

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

@@ -147 +147 @@
         self._validate_definitions(messages_definitions_set, self._MESSAGE_RULES, watch_list)
 
-        contributors = CommitterList()
+        accounts = CommitterList()
         for cc_rule in watch_list.cc_rules:
             # Copy the instructions since we'll be remove items from the original list and
@@ -153 +153 @@
             intructions_copy = cc_rule.instructions()[:]
             for email in intructions_copy:
-                if not contributors.contributor_by_email(email):
+                if not accounts.account_by_login(email):
                     cc_rule.remove_instruction(email)
                     self._log_error("The email alias %s which is in the watchlist is not listed as a contributor in committers.py" % email)