Changeset 51959 in webkit

Timestamp:

Dec 10, 2009 1:17:00 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-09 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

bugzilla-tool needs a command to list patches needing cq+
​https://bugs.webkit.org/show_bug.cgi?id=32351

• Scripts/modules/bugzilla.py:
  • Parse attacher_email from attachment xml.
• Scripts/modules/bugzilla_unittest.py:
  • Test new attacher_email parsing.
• Scripts/modules/commands/queries.py:
  • Add PatchesToCommitQueue
• Scripts/modules/commands/queries_unittest.py:
  • Tests for PatchesToCommitQueue
• Scripts/modules/mock_bugzillatool.py:
  • Add necessary mock methods for running PatchesToCommitQueue

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/modules/bugzilla.py (modified) (4 diffs)
• Scripts/modules/bugzilla_unittest.py (modified) (1 diff)
• Scripts/modules/commands/queries.py (modified) (2 diffs)
• Scripts/modules/commands/queries_unittest.py (modified) (2 diffs)
• Scripts/modules/mock_bugzillatool.py (modified) (3 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-09  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        bugzilla-tool needs a command to list patches needing cq+
+        https://bugs.webkit.org/show_bug.cgi?id=32351
+
+        * Scripts/modules/bugzilla.py:
+         - Parse attacher_email from attachment xml.
+        * Scripts/modules/bugzilla_unittest.py:
+         - Test new attacher_email parsing.
+        * Scripts/modules/commands/queries.py:
+         - Add PatchesToCommitQueue
+        * Scripts/modules/commands/queries_unittest.py:
+         - Tests for PatchesToCommitQueue
+        * Scripts/modules/mock_bugzillatool.py:
+         - Add necessary mock methods for running PatchesToCommitQueue
+
 2009-12-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/modules/bugzilla.py

@@ -177 +177 @@
         attachment['url'] = self.attachment_url_for_id(attachment['id'])
         attachment['name'] = unicode(element.find('desc').string)
+        attachment['attacher_email'] = str(element.find('attacher').string)
         attachment['type'] = str(element.find('type').string)
         self._parse_attachment_flag(element, 'review', attachment, 'reviewer_email')
@@ -308 +309 @@
         for bug_link_cell in soup('td', "first-child"): # tds with the class "first-child"
             bug_link = bug_link_cell.find("a")
-            bug_ids.append(bug_link.string) # the contents happen to be the bug id
+            bug_ids.append(int(bug_link.string)) # the contents happen to be the bug id
 
         return bug_ids
@@ -324 +325 @@
         commit_queue_url = self.bug_server_url + "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=commit-queue%2B"
         return self._fetch_bug_ids_advanced_query(commit_queue_url)
+
+    # List of all r+'d bugs.
+    def fetch_bug_ids_from_needs_commit_list(self):
+        needs_commit_query_url = self.bug_server_url + "buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=review%2B"
+        return self._fetch_bug_ids_advanced_query(needs_commit_query_url)
 
     def fetch_bug_ids_from_review_queue(self):
@@ -339 +345 @@
             patches_to_land += patches
         return patches_to_land
+
+    def fetch_patches_from_pending_commit_list(self):
+        patches_needing_commit = []
+        for bug_id in self.fetch_bug_ids_from_needs_commit_list():
+            patches = self.fetch_reviewed_patches_from_bug(bug_id)
+            patches_needing_commit += patches
+        return patches_needing_commit
 
     def fetch_patches_from_review_queue(self, limit=None):

trunk/WebKitTools/Scripts/modules/bugzilla_unittest.py

@@ -73 +73 @@
         'commit-queue' : '+',
         'committer_email' : 'two@test.com',
+        'attacher_email' : 'christian.plesner.hansen@gmail.com',
     }
 

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

@@ -33 +33 @@
 
 from modules.buildbot import BuildBot
+from modules.committers import CommitterList
 from modules.logging import log
 from modules.multicommandtool import Command
+
 
 class BugsToCommit(Command):
@@ -59 +61 @@
         for patch in patches:
             print "%s" % patch["url"]
+
+
+class PatchesToCommitQueue(Command):
+    name = "patches-to-commit-queue"
+    show_in_main_help = False
+    def __init__(self):
+        options = [
+            make_option("--bugs", action="store_true", dest="bugs", help="Output bug links instead of patch links"),
+        ]
+        Command.__init__(self, "Patches which should be added to the commit queue", options=options)
+
+    @staticmethod
+    def _needs_commit_queue(patch):
+        commit_queue_flag = patch.get("commit-queue")
+        if (commit_queue_flag and commit_queue_flag == '+'): # If it's already cq+, ignore the patch.
+            log("%s already has cq=%s" % (patch["id"], commit_queue_flag))
+            return False
+
+        # We only need to worry about patches from contributers who are not yet committers.
+        committer_record = CommitterList().committer_by_email(patch["attacher_email"])
+        if committer_record:
+            log("%s committer = %s" % (patch["id"], committer_record))
+        return not committer_record
+
+    def execute(self, options, args, tool):
+        patches = tool.bugs.fetch_patches_from_pending_commit_list()
+        patches_needing_cq = filter(self._needs_commit_queue, patches)
+        if options.bugs:
+            bugs_needing_cq = map(lambda patch: patch['bug_id'], patches_needing_cq)
+            bugs_needing_cq = sorted(set(bugs_needing_cq))
+            for bug_id in bugs_needing_cq:
+                print "%s" % tool.bugs.bug_url_for_bug_id(bug_id)
+        else:
+            for patch in patches_needing_cq:
+                print "%s" % tool.bugs.attachment_url_for_id(patch["id"], action="edit")
 
 

trunk/WebKitTools/Scripts/modules/commands/queries_unittest.py

@@ -29 +29 @@
 import unittest
 
+from modules.bugzilla import Bugzilla
 from modules.commands.commandtest import CommandsTest
 from modules.commands.queries import *
+from modules.mock import Mock
+from modules.mock_bugzillatool import MockBugzillaTool
 
 class QueryCommandsTest(CommandsTest):
@@ -40 +43 @@
         expected_stderr = "Patches in commit queue:\n"
         self.assert_execute_outputs(PatchesToCommit(), None, expected_stdout, expected_stderr)
+
+    def test_patches_to_commit_queue(self):
+        expected_stdout = "http://example.com/197&action=edit\nhttp://example.com/128&action=edit\n"
+        expected_stderr = ""
+        options = Mock()
+        options.bugs = False
+        self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_stderr, options=options)
+
+        expected_stdout = "http://example.com/42\n"
+        options.bugs = True
+        self.assert_execute_outputs(PatchesToCommitQueue(), None, expected_stdout, expected_stderr, options=options)
 
     def test_patches_to_review(self):

trunk/WebKitTools/Scripts/modules/mock_bugzillatool.py

@@ -32 +32 @@
 from modules.scm import CommitMessage
 
+
 class MockBugzilla(Mock):
     patch1 = {
-        "id": 197,
-        "bug_id": 42,
-        "url": "http://example.com/197",
-        "is_obsolete": False,
-        "reviewer": "Reviewer1"
+        "id" : 197,
+        "bug_id" : 42,
+        "url" : "http://example.com/197",
+        "is_obsolete" : False,
+        "reviewer" : "Reviewer1",
+        "attacher_email" : "Contributer1",
     }
     patch2 = {
-        "id": 128,
-        "bug_id": 42,
-        "url": "http://example.com/128",
-        "is_obsolete": False,
-        "reviewer": "Reviewer2"
+        "id" : 128,
+        "bug_id" : 42,
+        "url" : "http://example.com/128",
+        "is_obsolete" : False,
+        "reviewer" : "Reviewer2",
+        "attacher_email" : "Contributer2",
     }
+    bug_server_url = "http://example.com"
 
     def fetch_bug_ids_from_commit_queue(self):
@@ -55 +59 @@
 
     def fetch_patches_from_commit_queue(self):
+        return [self.patch1, self.patch2]
+
+    def fetch_patches_from_pending_commit_list(self):
         return [self.patch1, self.patch2]
 
@@ -78 +85 @@
             return self.patch2
         raise Exception("Bogus attachment_id in fetch_attachment.")
+
+    def bug_url_for_bug_id(self, bug_id):
+        return "%s/%s" % (self.bug_server_url, bug_id)
+
+    def attachment_url_for_id(self, attachment_id, action):
+        action_param = ""
+        if action and action != "view":
+            action_param = "&action=%s" % action
+        return "%s/%s%s" % (self.bug_server_url, attachment_id, action_param)