[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 99b610f9ca6849fa4833c8f3159e6637c67f49dc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 19 02:01:59 2009 +0000

    2009-11-18  Eric Seidel  <eric at 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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51160 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b036ba8..56726c4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2009-11-18  Eric Seidel  <eric at 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 at webkit.org>
 
         Reviewed by Anders Carlsson.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index c90c931..269b9b8 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -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()

-- 
WebKit Debian packaging