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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit bb9493a27a297c8d1ee8ee36306d51d0a6bb076d
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Nov 29 01:53:38 2009 +0000

    2009-11-28  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] style-queue sends ~100 requests to QueueStatusServer every 5 minutes
            https://bugs.webkit.org/show_bug.cgi?id=31950
    
            Now we cache the last status that we get back from QueueStatusServer.
            Eventually we'll have to do something more fancy if we want to support
            a "try again" button on QueueStatusServer, but we can cross that bridge
            when we come to it.
    
            * Scripts/modules/patchcollection.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51465 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a88e17f..dea140f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,20 @@
 
         Reviewed by Eric Seidel.
 
+        [bzt] style-queue sends ~100 requests to QueueStatusServer every 5 minutes
+        https://bugs.webkit.org/show_bug.cgi?id=31950
+
+        Now we cache the last status that we get back from QueueStatusServer.
+        Eventually we'll have to do something more fancy if we want to support
+        a "try again" button on QueueStatusServer, but we can cross that bridge
+        when we come to it.
+
+        * Scripts/modules/patchcollection.py:
+
+2009-11-28  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
         StyleQueue scans ~100 bug pages every 5 minutes
         https://bugs.webkit.org/show_bug.cgi?id=31947
 
diff --git a/WebKitTools/Scripts/modules/patchcollection.py b/WebKitTools/Scripts/modules/patchcollection.py
index d8ca0db..1a774ba 100644
--- a/WebKitTools/Scripts/modules/patchcollection.py
+++ b/WebKitTools/Scripts/modules/patchcollection.py
@@ -77,12 +77,22 @@ class PersistentPatchCollection:
         self._delegate = delegate
         self._name = self._delegate.collection_name()
         self._status = self._delegate.status_server()
+        self._status_cache = {}
+
+    def _cached_status(self, patch_id):
+        cached = self._status_cache.get(patch_id)
+        if cached:
+            return cached
+        status = self._status.patch_status(self._name, patch_id)
+        if status:
+            self._status_cache[patch_id] = status
+        return status
 
     def next(self):
         patch_ids = self._delegate.fetch_potential_patch_ids()
         for patch_id in patch_ids:
-            last_status = self._status.patch_status(self._name, patch_id)
-            if not last_status: # FIXME: Add support for "Try again"
+            status = self._cached_status(patch_id)
+            if not status:
                 return patch_id
 
     def done(self, patch):

-- 
WebKit Debian packaging