2009-11-18 Eric Seidel <eric@webkit.org>
authoreric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Nov 2009 02:01:59 +0000 (02:01 +0000)
committereric@webkit.org <eric@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Nov 2009 02:01:59 +0000 (02:01 +0000)
        Reviewed by Darin Adler.

        workqueue.py results in totally broken commit-queue UI
        https://bugs.webkit.org/show_bug.cgi?id=31645

        * Scripts/bugzilla-tool:
         - Remove unneeded use of PatchCollection.
         - Grab a new copy of the cq'd patches every run of the queue.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@51160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/bugzilla-tool

index b036ba86709bbc5846395e7057a06fcc7b0f0dc3..56726c42797356ebd7bd4d1234215c5918d2d58d 100644 (file)
@@ -1,3 +1,14 @@
+2009-11-18  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        workqueue.py results in totally broken commit-queue UI
+        https://bugs.webkit.org/show_bug.cgi?id=31645
+
+        * Scripts/bugzilla-tool:
+         - Remove unneeded use of PatchCollection.
+         - Grab a new copy of the cq'd patches every run of the queue.
+
 2009-11-18  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Anders Carlsson.
index c90c93148072c854a23ecb8d3b6349f94496b772..269b9b8193f261e3e44a81accf16877fc32455b7 100755 (executable)
@@ -785,14 +785,11 @@ class CommitQueue(AbstractQueue):
 
     def begin_work_queue(self):
         AbstractQueue.begin_work_queue(self)
-        self._patches = PatchCollection(self.tool.bugs)
 
     def next_work_item(self):
-        if not len(self._patches):
-            # Fetch patches instead of just bug ids to that we validate reviewer/committer flags on every patch.
-            self._patches.add_patches(self.tool.bugs.fetch_patches_from_commit_queue(reject_invalid_patches=True))
-        self.log_progress(self._patches.patch_ids())
-        return self._patches.next()
+        patches = self.tool.bugs.fetch_patches_from_commit_queue(reject_invalid_patches=True)
+        self.log_progress([patch['id'] for patch in patches])
+        return patches[0] if patches else None
 
     def should_proceed_with_work_item(self, patch):
         red_builders_names = self.tool.buildbot.red_core_builders_names()