Changeset 56632 in webkit

Timestamp:

Mar 26, 2010 10:32:31 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-03-26 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Remove some evil statics from CommitInfo
​https://bugs.webkit.org/show_bug.cgi?id=36637

These methods should really be on checkout. You can tell because they
know about ChangeLogs and take an SCM as an argument. :)

• Scripts/webkitpy/common/checkout/api.py:
• Scripts/webkitpy/common/checkout/changelog.py:
• Scripts/webkitpy/common/checkout/commitinfo.py:
• Scripts/webkitpy/tool/commands/queries.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/api.py (modified) (2 diffs)
• Scripts/webkitpy/common/checkout/changelog.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/commitinfo.py (modified) (2 diffs)
• Scripts/webkitpy/tool/commands/queries.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-26  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Remove some evil statics from CommitInfo
+        https://bugs.webkit.org/show_bug.cgi?id=36637
+
+        These methods should really be on checkout.  You can tell because they
+        know about ChangeLogs and take an SCM as an argument.  :)
+
+        * Scripts/webkitpy/common/checkout/api.py:
+        * Scripts/webkitpy/common/checkout/changelog.py:
+        * Scripts/webkitpy/common/checkout/commitinfo.py:
+        * Scripts/webkitpy/tool/commands/queries.py:
+
 2010-03-23  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/api.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import os
 import subprocess
 
-from webkitpy.common.checkout.changelog import ChangeLog, is_path_to_changelog
+from webkitpy.common.checkout.changelog import ChangeLog
 from webkitpy.common.checkout.commitinfo import CommitInfo
 from webkitpy.common.checkout.scm import CommitMessage
@@ -43 +44 @@
         self._scm = scm
 
-    def commit_info_for_revision(self, svn_revision):
-        return CommitInfo.commit_info_for_revision(self._scm, svn_revision)
+    def _is_path_to_changelog(self, path):
+        return os.path.basename(path) == "ChangeLog"
+
+    def _latest_entry_for_changelog_at_revision(self, changelog_path, revision):
+        changelog_contents = self._scm.contents_at_revision(changelog_path, revision)
+        return ChangeLog.parse_latest_entry_from_file(StringIO.StringIO(changelog_contents))
+
+    def changelog_entries_for_revision(self, revision):
+        changed_files = self._scm.changed_files_for_revision(revision)
+        return [self._latest_entry_for_changelog_at_revision(path, revision) for path in changed_files if self._is_path_to_changelog(path)]
+
+    def commit_info_for_revision(self, revision):
+        committer_email = self._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]
+        changelog_data = {
+            "bug_id": parse_bug_id(changelog_entry.contents()),
+            "author_name": changelog_entry.author_name(),
+            "author_email": changelog_entry.author_email(),
+            "author": changelog_entry.author(),
+            "reviewer_text": changelog_entry.reviewer_text(),
+            "reviewer": changelog_entry.reviewer(),
+        }
+        # We could pass the changelog_entry instead of a dictionary here, but that makes
+        # mocking slightly more involved, and would make aggregating data from multiple
+        # entries more difficult to wire in if we need to do that in the future.
+        return CommitInfo(revision, committer_email, changelog_data)
 
     def modified_changelogs(self):
-        return [path for path in self._scm.changed_files() if is_path_to_changelog(path)]
+        return [path for path in self._scm.changed_files() if self._is_path_to_changelog(path)]
 
     # FIXME: Requires unit test

trunk/WebKitTools/Scripts/webkitpy/common/checkout/changelog.py

@@ -42 +42 @@
     # Maybe eventually a webkit_config.py?
     return "http://trac.webkit.org/changeset/%s" % revision_number
-
-# Used by Checkout.modified_changelogs()
-def is_path_to_changelog(path):
-    return os.path.basename(path) == "ChangeLog"
 
 

trunk/WebKitTools/Scripts/webkitpy/common/checkout/commitinfo.py

@@ -31 +31 @@
 import StringIO
 
-from webkitpy.common.checkout.changelog import ChangeLog, is_path_to_changelog
 from webkitpy.common.config.committers import CommitterList
 from webkitpy.common.net.bugzilla import parse_bug_id
@@ -37 +36 @@
 
 class CommitInfo(object):
-    @classmethod
-    def _latest_entry_for_changelog_at_revision(cls, scm, changelog_path, revision):
-        changelog_contents = scm.contents_at_revision(changelog_path, revision)
-        return ChangeLog.parse_latest_entry_from_file(StringIO.StringIO(changelog_contents))
-
-    @classmethod
-    def _changelog_entries_for_revision(cls, scm, revision):
-        changed_files = scm.changed_files_for_revision(revision)
-        return [cls._latest_entry_for_changelog_at_revision(scm, path, revision) for path in changed_files if is_path_to_changelog(path)]
-
-    @classmethod
-    def commit_info_for_revision(cls, scm, revision):
-        committer_email = scm.committer_email_for_revision(revision)
-        changelog_entries = cls._changelog_entries_for_revision(scm, revision)
-        # Assume for now that the first entry has everything we need:
-        changelog_entry = changelog_entries[0]
-        changelog_data = {
-            "bug_id": parse_bug_id(changelog_entry.contents()),
-            "author_name": changelog_entry.author_name(),
-            "author_email": changelog_entry.author_email(),
-            "author": changelog_entry.author(),
-            "reviewer_text": changelog_entry.reviewer_text(),
-            "reviewer": changelog_entry.reviewer(),
-        }
-        # We could pass the changelog_entry instead of a dictionary here, but that makes
-        # mocking slightly more involved, and would make aggregating data from multiple
-        # entries more difficult to wire in if we need to do that in the future.
-        return cls(revision, committer_email, changelog_data)
-
     def __init__(self, revision, committer_email, changelog_data, committer_list=CommitterList()):
         self._revision = revision

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

@@ -147 +147 @@
         self._print_builder_line(builder.name(), name_width, "FAIL (blame-list: %s%s)" % (suspect_revisions, first_failure_message))
         for revision in suspect_revisions:
-            commit_info = CommitInfo.commit_info_for_revision(self.tool.scm(), revision)
+            commit_info = self.tool.checkout().commit_info_for_revision(revision)
             self._print_blame_information_for_commit(commit_info)