Changeset 51160 in webkit

Timestamp:

Nov 18, 2009 6:01:59 PM (14 years ago)

Author:

eric@webkit.org

Message:

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.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/bugzilla-tool (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+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>
 

trunk/WebKitTools/Scripts/bugzilla-tool

@@ -786 +786 @@
     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):