Changeset 56216 in webkit

Timestamp:

Mar 18, 2010 11:46:10 PM (14 years ago)

Author:

eric@webkit.org

Message:

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

Reviewed by Adam Barth.

Split out CommitInfo class and add unit tests
​https://bugs.webkit.org/show_bug.cgi?id=36343

Move more logic out of "what-broke" into a shared CommitInfo
class so that it can be used by other commands and unit tested.

• Scripts/webkitpy/commands/queries.py:
• Scripts/webkitpy/commitinfo.py: Added.
• Scripts/webkitpy/commitinfo_unittest.py: Added.
• Scripts/webkitpy/unittests.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/commands/queries.py (modified) (3 diffs)
• Scripts/webkitpy/commitinfo.py (added)
• Scripts/webkitpy/commitinfo_unittest.py (added)
• Scripts/webkitpy/unittests.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-18  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Split out CommitInfo class and add unit tests
+        https://bugs.webkit.org/show_bug.cgi?id=36343
+
+        Move more logic out of "what-broke" into a shared CommitInfo
+        class so that it can be used by other commands and unit tested.
+
+        * Scripts/webkitpy/commands/queries.py:
+        * Scripts/webkitpy/commitinfo.py: Added.
+        * Scripts/webkitpy/commitinfo_unittest.py: Added.
+        * Scripts/webkitpy/unittests.py:
+
 2010-03-18  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

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

@@ -31 +31 @@
 
 from optparse import make_option
-import StringIO
 
 from webkitpy.buildbot import BuildBot
-from webkitpy.bugzilla import parse_bug_id
-from webkitpy.changelogs import ChangeLog, is_path_to_changelog, view_source_url
+from webkitpy.changelogs import view_source_url
+from webkitpy.commitinfo import CommitInfo
 from webkitpy.committers import CommitterList
 from webkitpy.grammar import pluralize
@@ -141 +140 @@
         print "%s : %s" % (builder_name.ljust(max_name_width), status_message)
 
-    def _changelog_entries_for_revision(self, revision):
-        changed_files = self.tool.scm().changed_files_for_revision(revision)
-        changelog_paths = [path for path in changed_files if is_path_to_changelog(path)]
-        changelog_entries = []
-        for changelog_path in changelog_paths:
-            changelog_contents = self.tool.scm().contents_at_revision(changelog_path, revision)
-            changelog_file = StringIO.StringIO(changelog_contents)
-            changelog_entry = ChangeLog.parse_latest_entry_from_file(changelog_file)
-            changelog_entries.append(changelog_entry)
-        return changelog_entries
-
-    def _commit_info_for_revision(self, revision):
-        committer_email = self.tool.scm().committer_email_for_revision(revision)
-        changelog_entries = self._changelog_entries_for_revision(revision)
-        # Assume for now that the first entry has everything we need:
-        changelog_entry = changelog_entries[0]
-        committer_list = CommitterList()
-        # FIXME: This should be a CommitInfo object.
-        return {
-            "bug_id" : parse_bug_id(changelog_entry.contents()),
-            "revision" : revision,
-            "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" : committer_list.committer_by_email(committer_email) if committer_email else None
-        }
-
-    # FIXME: This should be on some CommitInfo object.
     def _print_blame_information_for_commit(self, commit_info):
-        print "r%s:" % commit_info["revision"]
-        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"]))
-        author_line = "\"%s\" <%s>" % (commit_info["author_name"], commit_info["author_email"])
-        print "  Author: %s" % (commit_info["author"] or author_line)
-        print "  Reviewer: %s" % (commit_info["reviewer"] or commit_info["reviewer_text"])
-        print "  Committer: %s" % (commit_info["committer"] or commit_info["committer_email"])
+        print "r%s:" % commit_info.revision()
+        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()))
+        author_line = "\"%s\" <%s>" % (commit_info.author_name(), commit_info.author_email())
+        print "  Author: %s" % (commit_info.author() or author_line)
+        print "  Reviewer: %s" % (commit_info.reviewer() or commit_info.reviewer_text())
+        print "  Committer: %s" % commit_info.committer()
 
     def _print_blame_information_for_builder(self, builder_status, name_width):
@@ -192 +160 @@
         self._print_builder_line(builder_status["name"], name_width, "FAIL (blame-list: %s)" % suspect_revisions)
         for revision in suspect_revisions:
-            commit_info = self._commit_info_for_revision(revision)
+            commit_info = CommitInfo.commit_info_for_revision(self.tool.scm(), revision)
             self._print_blame_information_for_commit(commit_info)
 

trunk/WebKitTools/Scripts/webkitpy/unittests.py

@@ -42 +42 @@
 from webkitpy.commands.queues_unittest import *
 from webkitpy.commands.sheriffbot_unittest import *
+from webkitpy.commitinfo_unittest import *
 from webkitpy.committers_unittest import *
 from webkitpy.credentials_unittest import *