Changeset 90968 in webkit

Timestamp:

Jul 13, 2011 6:39:12 PM (13 years ago)

Author:

abarth@webkit.org

Message:

gardening server should have an API for parsing changelogs
​https://bugs.webkit.org/show_bug.cgi?id=64495

Reviewed by Eric Seidel.

This patch exposes much of the same information from CommitInfo in a
dictionary form, which is easier to send over-the-wire as JSON to the
frontend.

• Scripts/webkitpy/common/checkout/checkout.py:
• Scripts/webkitpy/common/checkout/checkout_unittest.py:
• Scripts/webkitpy/tool/mocktool.py:
• Scripts/webkitpy/tool/servers/gardeningserver.py:
• Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
• Scripts/webkitpy/tool/servers/reflectionhandler.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout.py (modified) (4 diffs)
• Scripts/webkitpy/common/checkout/checkout_unittest.py (modified) (4 diffs)
• Scripts/webkitpy/common/checkout/commitinfo.py (modified) (2 diffs)
• Scripts/webkitpy/tool/mocktool.py (modified) (1 diff)
• Scripts/webkitpy/tool/servers/gardeningserver.py (modified) (1 diff)
• Scripts/webkitpy/tool/servers/gardeningserver_unittest.py (modified) (4 diffs)
• Scripts/webkitpy/tool/servers/reflectionhandler.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-13  Adam Barth  <abarth@webkit.org>
+
+        gardening server should have an API for parsing changelogs
+        https://bugs.webkit.org/show_bug.cgi?id=64495
+
+        Reviewed by Eric Seidel.
+
+        This patch exposes much of the same information from CommitInfo in a
+        dictionary form, which is easier to send over-the-wire as JSON to the
+        frontend.
+
+        * Scripts/webkitpy/common/checkout/checkout.py:
+        * Scripts/webkitpy/common/checkout/checkout_unittest.py:
+        * Scripts/webkitpy/tool/mocktool.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver.py:
+        * Scripts/webkitpy/tool/servers/gardeningserver_unittest.py:
+        * Scripts/webkitpy/tool/servers/reflectionhandler.py:
+
 2011-07-13  Eric Seidel  <eric@webkit.org>
 

trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py

@@ -59 +59 @@
         return ChangeLog.parse_latest_entry_from_file(changelog_file)
 
-    def changelog_entries_for_revision(self, revision):
-        changed_files = self._scm.changed_files_for_revision(revision)
+    def changelog_entries_for_revision(self, revision, changed_files=None):
+        if not changed_files:
+            changed_files = self._scm.changed_files_for_revision(revision)
         # FIXME: This gets confused if ChangeLog files are moved, as
         # deletes are still "changed files" per changed_files_for_revision.
@@ -75 +76 @@
         return changelog_entries
 
-    @memoized
-    def commit_info_for_revision(self, revision):
-        committer_email = self._scm.committer_email_for_revision(revision)
-        changelog_entries = self.changelog_entries_for_revision(revision)
+    def _changelog_data_for_revision(self, revision):
+        changed_files = self._scm.changed_files_for_revision(revision)
+        changelog_entries = self.changelog_entries_for_revision(revision, changed_files=changed_files)
         # Assume for now that the first entry has everything we need:
         # FIXME: This will throw an exception if there were no ChangeLogs.
@@ -84 +84 @@
             return None
         changelog_entry = changelog_entries[0]
-        changelog_data = {
+        return {
             "bug_id": parse_bug_id_from_changelog(changelog_entry.contents()),
             "author_name": changelog_entry.author_name(),
@@ -91 +91 @@
             "reviewer_text": changelog_entry.reviewer_text(),
             "reviewer": changelog_entry.reviewer(),
+            "contents": changelog_entry.contents(),
+            "changed_files": changed_files,
         }
-        # 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.
+
+    @memoized
+    def commit_info_for_revision(self, revision):
+        committer_email = self._scm.committer_email_for_revision(revision)
+        changelog_data = self._changelog_data_for_revision(revision)
+        if not changelog_data:
+            return None
         return CommitInfo(revision, committer_email, changelog_data)
 

trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

@@ -179 +179 @@
     def test_commit_info_for_revision(self):
         scm = Mock()
-        scm.committer_email_for_revision = lambda revision: "committer@example.com"
-        checkout = Checkout(scm)
-        checkout.changelog_entries_for_revision = lambda revision: [ChangeLogEntry(_changelog1entry1)]
+        scm.changed_files_for_revision = lambda revision: ['path/to/file', 'another/file']
+        scm.committer_email_for_revision = lambda revision, changed_files=None: "committer@example.com"
+        checkout = Checkout(scm)
+        checkout.changelog_entries_for_revision = lambda revision, changed_files=None: [ChangeLogEntry(_changelog1entry1)]
         commitinfo = checkout.commit_info_for_revision(4)
         self.assertEqual(commitinfo.bug_id(), 36629)
@@ -190 +191 @@
         self.assertEqual(commitinfo.committer_email(), "committer@example.com")
         self.assertEqual(commitinfo.committer(), None)
-
-        checkout.changelog_entries_for_revision = lambda revision: []
+        self.assertEqual(commitinfo.to_json(), {
+            'bug_id': 36629,
+            'author_email': 'vestbo@webkit.org',
+            'changed_files': [
+                'path/to/file',
+                'another/file',
+            ],
+            'reviewer_text': None,
+            'author_name': u'Tor Arne Vestb\xf8',
+        })
+
+        checkout.changelog_entries_for_revision = lambda revision, changed_files=None: []
         self.assertEqual(checkout.commit_info_for_revision(1), None)
 
@@ -198 +209 @@
         scm.committer_email_for_revision = lambda revision: "committer@example.com"
         checkout = Checkout(scm)
-        checkout.changelog_entries_for_revision = lambda revision: [ChangeLogEntry(_changelog1entry1)]
+        checkout.changelog_entries_for_revision = lambda revision, changed_files=None: [ChangeLogEntry(_changelog1entry1)]
         self.assertEqual(checkout.bug_id_for_revision(4), 36629)
 
@@ -216 +227 @@
 
     def test_suggested_reviewers(self):
-        def mock_changelog_entries_for_revision(revision):
+        def mock_changelog_entries_for_revision(revision, changed_files=None):
             if revision % 2 == 0:
                 return [ChangeLogEntry(_changelog1entry1)]

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

@@ -37 +37 @@
         self._revision = revision
         self._committer_email = committer_email
-        self._bug_id = changelog_data["bug_id"]
-        self._author_name = changelog_data["author_name"]
-        self._author_email = changelog_data["author_email"]
-        self._author = changelog_data["author"]
-        self._reviewer_text = changelog_data["reviewer_text"]
-        self._reviewer = changelog_data["reviewer"]
+        self._changelog_data = changelog_data
 
         # Derived values:
@@ -57 +52 @@
 
     def bug_id(self):
-        return self._bug_id  # May be None
+        return self._changelog_data["bug_id"]  # May be None
 
     def author(self):
-        return self._author  # May be None
+        return self._changelog_data["author"]  # May be None
 
     def author_name(self):
-        return self._author_name
+        return self._changelog_data["author_name"]
 
     def author_email(self):
-        return self._author_email
+        return self._changelog_data["author_email"]
 
     def reviewer(self):
-        return self._reviewer # May be None
+        return self._changelog_data["reviewer"]  # May be None
 
     def reviewer_text(self):
-        return self._reviewer_text # May be None
+        return self._changelog_data["reviewer_text"]  # May be None
+
+    def changed_files(self):
+        return self._changelog_data["changed_files"]
+
+    def to_json(self):
+        return {
+            "bug_id": self.bug_id(),
+            "author_name": self.author_name(),
+            "author_email": self.author_email(),
+            "reviewer_text": self.reviewer_text(),
+            "changed_files": self.changed_files(),
+        }
 
     def responsible_parties(self):

trunk/Tools/Scripts/webkitpy/tool/mocktool.py

@@ -544 +544 @@
             "reviewer_text": "Darin Adler",
             "reviewer": self._committer_list.committer_by_name("Darin Adler"),
+            "changed_files": [
+                "path/to/file",
+                "another/file",
+            ],
         })
 

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver.py

@@ -56 +56 @@
         return self.server.tool.executive.run_command([self.server.tool.path()] + args)
 
+    def changelog(self):
+        revision = self.query['revision'][0]
+        head_revision = self.server.tool.scm().head_svn_revision()
+        if revision > head_revision:
+            # Updating the working copy could conflict with any rebaselines we have in progress.
+            update_webkit_command = self.server.tool.port().update_webkit_command()
+            self.server.tool.executive.run_and_throw_if_fail(update_webkit_command, quiet=True)
+        commit_info = self.server.tool.checkout().commit_info_for_revision(revision)
+        if not commit_info:
+            self.send_error(404, "File not found")
+        else:
+            self._serve_json(commit_info.to_json())
+
     def rollout(self):
         revision = self.query['revision'][0]

trunk/Tools/Scripts/webkitpy/tool/servers/gardeningserver_unittest.py

@@ -27 +27 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+try:
+    import json
+except ImportError:
+    # python 2.5 compatibility
+    import webkitpy.thirdparty.simplejson as json
+
 import unittest
 
@@ -52 +58 @@
         print "== End Response =="
 
+    def _serve_json(self, json_object):
+        print "== Begin JSON Response =="
+        print json.dumps(json_object)
+        print "== End JSON Response =="
+
 
 class GardeningServerTest(unittest.TestCase):
@@ -59 +70 @@
         OutputCapture().assert_outputs(self, handler.do_POST, expected_stderr=expected_stderr, expected_stdout=expected_stdout)
 
+    def test_changelog(self):
+        expected_stderr = "MOCK run_and_throw_if_fail: ['mock-update-webkit']\n"
+        expected_stdout = """== Begin JSON Response ==
+{"bug_id": 42, "author_email": "abarth@webkit.org", "reviewer_text": "Darin Adler", "author_name": "Adam Barth", "changed_files": ["path/to/file", "another/file"]}
+== End JSON Response ==
+"""
+        self._post_to_path("/changelog?revision=2314", expected_stderr=expected_stderr, expected_stdout=expected_stdout)
+
     def test_rollout(self):
         expected_stderr = "MOCK run_command: ['echo', 'rollout', '--force-clean', '--non-interactive', '2314', 'MOCK rollout reason']\n"
@@ -64 +83 @@
         self._post_to_path("/rollout?revision=2314&reason=MOCK+rollout+reason", expected_stderr=expected_stderr, expected_stdout=expected_stdout)
 
-    def test_rebaseline_test(self):
+    def test_rebaseline(self):
         expected_stderr = "MOCK run_command: ['echo', 'rebaseline-test', 'MOCK builder', 'user-scripts/another-test.html', 'txt']\n"
         expected_stdout = "== Begin Response ==\nsuccess\n== End Response ==\n"

trunk/Tools/Scripts/webkitpy/tool/servers/reflectionhandler.py

@@ -28 +28 @@
 
 from __future__ import with_statement
+
+try:
+    import json
+except ImportError:
+    # python 2.5 compatibility
+    import webkitpy.thirdparty.simplejson as json
 
 import BaseHTTPServer
@@ -93 +99 @@
         self.wfile.write(text)
 
-    def _serve_json(self, json):
+    def _serve_json(self, json_object):
         self.send_response(200)
         self.send_header('Content-type', 'application/json')
         self.end_headers()
-        simplejson.dump(json, self.wfile)
+        json.dump(json_object, self.wfile)
 
     def _serve_file(self, file_path, cacheable_seconds=0):