[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

Tue Jan 5 23:51:25 UTC 2010

The following commit has been merged in the webkit-1.1 branch:
commit cfe666f9894bd21e88b9037d2ca663365aea803a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 16 22:19:54 2009 +0000

    2009-12-16  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            Generalize commit-queue recent status page for all queues
            https://bugs.webkit.org/show_bug.cgi?id=32633
    
            * QueueStatusServer/index.html:
             - Generalize to support other queues.
            * QueueStatusServer/queue_status.py:
             - Generalize MainPage to support other queues.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52221 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index c4ab8e7..adb1b96 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-16  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        Generalize commit-queue recent status page for all queues
+        https://bugs.webkit.org/show_bug.cgi?id=32633
+
+        * QueueStatusServer/index.html:
+         - Generalize to support other queues.
+        * QueueStatusServer/queue_status.py:
+         - Generalize MainPage to support other queues.
+
 2009-12-16  Evan Martin  <evan at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/QueueStatusServer/index.html b/WebKitTools/QueueStatusServer/index.html
index 00d0653..3e4d832 100644
--- a/WebKitTools/QueueStatusServer/index.html
+++ b/WebKitTools/QueueStatusServer/index.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title>WebKit Commit Queue Status</title>
+    <title>WebKit {{ pretty_queue_name }} Status</title>
     <link type="text/css" rel="stylesheet" href="/stylesheets/main.css" />
 </head>
 <body>
@@ -28,7 +28,12 @@
         {% endfor %}
     </table>
 
-    <div id="footer"><a href="https://bugs.webkit.org/buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=commit-queue%2B">queued bugs</a> | <a href="http://trac.webkit.org/wiki/CommitQueue">documentation</a> | <a href="http://webkit.org/">webkit.org</a></div>
+    <div id="footer">
+        {% if show_commit_queue_footer %}
+        <a href="https://bugs.webkit.org/buglist.cgi?query_format=advanced&bug_status=UNCONFIRMED&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&field0-0-0=flagtypes.name&type0-0-0=equals&value0-0-0=commit-queue%2B">queued bugs</a> | <a href="http://trac.webkit.org/wiki/CommitQueue">documentation</a> |
+        {% endif %}
+        <a href="http://webkit.org/">webkit.org</a>
+    </div>
     </center>
 </body>
 </html>
diff --git a/WebKitTools/QueueStatusServer/queue_status.py b/WebKitTools/QueueStatusServer/queue_status.py
index d0f8e47..69e7e89 100644
--- a/WebKitTools/QueueStatusServer/queue_status.py
+++ b/WebKitTools/QueueStatusServer/queue_status.py
@@ -51,17 +51,29 @@ class QueueStatus(db.Model):
     results_file = db.BlobProperty()
 
 
-class MainPage(webapp.RequestHandler):
-    def get(self):
-        statuses_query = QueueStatus.all().filter('queue_name =', 'commit-queue').order('-date')
+class RecentStatus(webapp.RequestHandler):
+    def _title_case(self, string):
+        words = string.split(" ")
+        words = map(lambda word: word.capitalize(), words)
+        return " ".join(words)
+
+    def _pretty_queue_name(self, queue_name):
+        return self._title_case(queue_name.replace("-", " "))
+
+    # We could change "/" to just redirect to /queue-status/commit-queue in the future
+    # at which point we would not need a default value for queue_name here.
+    def get(self, queue_name="commit-queue"):
+        statuses_query = QueueStatus.all().filter("queue_name =", queue_name).order("-date")
         statuses = statuses_query.fetch(6)
         if not statuses:
             return self.response.out.write("No status to report.")
         template_values = {
-            'last_status' : statuses[0],
-            'recent_statuses' : statuses[1:],
+            "last_status" : statuses[0],
+            "recent_statuses" : statuses[1:],
+            "pretty_queue_name" : self._pretty_queue_name(queue_name),
+            "show_commit_queue_footer" : queue_name == "commit-queue"
         }
-        self.response.out.write(template.render('index.html', template_values))
+        self.response.out.write(template.render("index.html", template_values))
 
 
 class PatchStatus(webapp.RequestHandler):
@@ -161,7 +173,8 @@ class ShowResults(webapp.RequestHandler):
 
 
 routes = [
-    ('/', MainPage),
+    ('/', RecentStatus),
+    ('/queue-status/(.*)', RecentStatus),
     ('/update-status', UpdateStatus),
     (r'/patch-status/(.*)/(.*)', PatchStatus),
     (r'/status-bubble/(.*)', StatusBubble),

-- 
WebKit Debian packaging

