Changeset 56156 in webkit

Timestamp:

Mar 18, 2010 5:47:02 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-18 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

Teach what-broke how to look up reviewer and author Committer objects by name
​https://bugs.webkit.org/show_bug.cgi?id=36264

• Scripts/webkitpy/commands/queries.py:
  • Add committer_by_name lookups for both reviewer and author
  • Improve printing in the cases where lookups fail.
• Scripts/webkitpy/committers.py:
  • Add committer_by_name
• Scripts/webkitpy/committers_unittest.py:
  • Test committer_by_name

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/queries.py (modified) (3 diffs)
• Scripts/webkitpy/committers.py (modified) (1 diff)
• Scripts/webkitpy/committers_unittest.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Teach what-broke how to look up reviewer and author Committer objects by name
+        https://bugs.webkit.org/show_bug.cgi?id=36264
+
+        * Scripts/webkitpy/commands/queries.py:
+         - Add committer_by_name lookups for both reviewer and author
+         - Improve printing in the cases where lookups fail.
+        * Scripts/webkitpy/committers.py:
+         - Add committer_by_name
+        * Scripts/webkitpy/committers_unittest.py:
+         - Test committer_by_name
+
 2010-03-17  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/commands/queries.py

@@ -158 +158 @@
         changelog_entry = changelog_entries[0]
         # FIXME: The commit info dictionary here should probably be its own class?
+        committer_list = CommitterList()
         return {
             "bug_id" : parse_bug_id(changelog_entry.contents()),
@@ -163 +164 @@
             "author_name" : changelog_entry.author_name(),
             "author_email" : changelog_entry.author_email(),
+            "author" : committer_list.committer_by_email(changelog_entry.author_email()) or committer_list.committer_by_name(changelog_entry.author_name()),
             "reviewer_text" : changelog_entry.reviewer_text(), # FIXME: Eventualy we should return an object here.
+            "reviewer" : committer_list.committer_by_name(changelog_entry.reviewer_text()),
             "committer_email" : committer_email,
-            "committer" : CommitterList().committer_by_email(committer_email) if committer_email else None
+            "committer" : committer_list.committer_by_email(committer_email) if committer_email else None
         }
 
@@ -172 +175 @@
         print "  %s" % view_source_url(commit_info["revision"])
         print "  Bug: %s (%s)" % (commit_info["bug_id"], self.tool.bugs.bug_url_for_bug_id(commit_info["bug_id"]))
-        print "  Author: %s <%s>" % (commit_info["author_name"], commit_info["author_email"])
-        print "  Reviewer: %s" % commit_info["reviewer_text"]
-        print "  Committer: %s" % commit_info["committer"]
+        print "  Author: %s" % commit_info["author"] or ("\"%s\" <%s> %" % (commit_info["author_name"], commit_info["author_email"]))
+        print "  Reviewer: %s" % commit_info["reviewer"] or commit_info["reviewer_text"]
+        print "  Committer: %s" % commit_info["committer"] or commit_info["committer_email"]
 
     def _print_blame_information_for_builder(self, builder_status, name_width):

trunk/WebKitTools/Scripts/webkitpy/committers.py

@@ -263 +263 @@
         return self._committers_by_email
 
+    def committer_by_name(self, name):
+        # This could be made into a hash lookup if callers need it to be fast.
+        for committer in self.committers():
+            if committer.full_name == name:
+                return committer
+
     def committer_by_email(self, email):
         return self._email_to_committer_map().get(email)

trunk/WebKitTools/Scripts/webkitpy/committers_unittest.py

@@ -44 +44 @@
         self.assertEqual(committer_list.reviewer_by_email('so_two@gmail.com'), reviewer)
 
+        # Test valid committer and reviewer lookup
+        self.assertEqual(committer_list.committer_by_name("Test One"), committer)
+        self.assertEqual(committer_list.committer_by_name("Test Two"), reviewer)
+        self.assertEqual(committer_list.committer_by_name("Test Three"), None)
+
         # 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')