Changeset 51030 in webkit

Timestamp:

Nov 16, 2009 4:29:21 AM (14 years ago)

Author:

abarth@webkit.org

Message:

2009-11-16 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

Move StyleQueue over to using PatchCollection
​https://bugs.webkit.org/show_bug.cgi?id=31544

That's what the class it's for.

• Scripts/bugzilla-tool:
• Scripts/modules/patchcollection.py:
• Scripts/modules/patchcollection_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (4 diffs)
• Scripts/modules/patchcollection.py (modified) (1 diff)
• Scripts/modules/patchcollection_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-11-16  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Move StyleQueue over to using PatchCollection
+        https://bugs.webkit.org/show_bug.cgi?id=31544
+
+        That's what the class it's for.
+
+        * Scripts/bugzilla-tool:
+        * Scripts/modules/patchcollection.py:
+        * Scripts/modules/patchcollection_unittest.py:
+
 2009-11-16  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -46 +46 @@
 from modules.comments import bug_comment_from_commit_text
 from modules.logging import error, log, tee
+from modules.patchcollection import PatchCollection
 from modules.scm import CommitMessage, detect_scm_system, ScriptError, CheckoutNeedsUpdate
 from modules.buildbot import BuildBot
@@ -752 +753 @@
         WebKitLandingScripts.run_and_throw_if_fail(bugzilla_tool_args)
 
+    def log_progress(self, patch_ids):
+        log("%s in %s [%s]" % (pluralize('patch', len(patch_ids)), self._name, ", ".join(patch_ids)))
+
     def execute(self, options, args, tool):
         self.options = options
@@ -798 +802 @@
 class StyleQueue(AbstractQueue):
     def __init__(self):
-        self.patches = []
         AbstractQueue.__init__(self, "style-queue")
 
@@ -804 +807 @@
         return None # FIXME: A hack until we come up with a more generic status page.
 
+    def begin_work_queue(self):
+        AbstractQueue.begin_work_queue(self)
+        self._patches = PatchCollection(self.tool.bugs)
+        self._patches.add_patches(self.tool.bugs.fetch_patches_from_review_queue(limit=10))
+
     def next_work_item(self):
-        if not self.patches:
-            self.patches = self.tool.bugs.fetch_patches_from_review_queue(limit=10)
-            if not self.patches:
-                return None
-        patch_ids = map(lambda patch: patch['id'], self.patches)
-        log("%s in review queue [%s]" % (pluralize('patch', len(self.patches)), ", ".join(patch_ids)))
-        return self.patches.pop(0)
+        self.log_progress(self._patches.patch_ids())
+        return self._patches.next()
 
     def should_proceed_with_work_item(self, patch):

trunk/WebKitTools/Scripts/modules/patchcollection.py

@@ -34 +34 @@
         self._patches = []
 
-    def add(self, patch_id):
-        patch = self._bugs.fetch_attachment(patch_id)
-        if not patch:
-            return
-        if self._filter and not self._filter(patch):
-            return
-        self._patches.append(patch)
+    def add(self, patch):
+        self.add_patches([patch])
 
-    def add_all_from_bug(self, bug_id):
-        patches = self._bugs.fetch_patches_from_bug(bug_id)
+    def add_patches(self, patches):
         for patch in patches:
+            if not patch:
+                continue
             if self._filter and not self._filter(patch):
                 continue
             self._patches.append(patch)
 
+    def add_patches_from_bug(self, bug_id):
+        self.add_patches(self._bugs.fetch_patches_from_bug(bug_id))
+
     def next(self):
+        if not self._patches:
+            return None
         return self._patches.pop(0)
+
+    def patch_ids(self):
+        return map(lambda patch: patch['id'], self._patches)
 
     def __len__(self):

trunk/WebKitTools/Scripts/modules/patchcollection_unittest.py

@@ -61 +61 @@
         patches = PatchCollection(bugs, filter=test_filter)
         self.assertEqual(len(patches), 0)
-        patches.add(42)
+        patches.add(bugs.fetch_attachment(42))
         self.assertEqual(len(patches), 1)
         patch = patches.next()
         self.assertEqual(patch, MockBugzilla.patch_1)
         self.assertEqual(len(patches), 0)
-        patches.add_all_from_bug(38)
+        patches.add_patches_from_bug(38)
         # Notice that one of the patches gets filtered out.
         self.assertEqual(len(patches), 2)
@@ -80 +80 @@
         patches = PatchCollection(bugs, filter=test_filter)
         self.assertEqual(len(patches), 0)
-        patches.add(42)
+        patches.add(bugs.fetch_attachment(42))
         self.assertEqual(len(patches), 0)
-        patches.add_all_from_bug(38)
+        patches.add_patches_from_bug(38)
         self.assertEqual(len(patches), 0)
+
+    def test_add_patches(self):
+        patches = PatchCollection(None)
+        self.assertEqual(patches.patch_ids(), [])
+        patches.add_patches([{'id': 42}, {'id': 74}])
+        self.assertEqual(len(patches), 2)
+        self.assertEqual(patches.patch_ids(), [42, 74])
+
+    def test_patch_ids(self):
+        patches = PatchCollection(None)
+        self.assertEqual(patches.patch_ids(), [])
+        patches.add({'id': 42})
+        patches.add({'id': 74})
+        self.assertEqual(patches.patch_ids(), [42, 74])
+
+    def test_empty(self):
+        patches = PatchCollection(None)
+        self.assertEqual(patches.next(), None)
 
 if __name__ == '__main__':