[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 7dc2330e029094978652591816409e53011dcc7c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 31 12:49:29 2009 +0000

    2009-12-31  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Show mac-ews status on QueueStatusServer
            https://bugs.webkit.org/show_bug.cgi?id=33076
    
            Also make error status purple.
    
            * QueueStatusServer/model/attachment.py:
            * QueueStatusServer/model/queues.py:
            * QueueStatusServer/templates/dashboard.html:
            * QueueStatusServer/templates/statusbubble.html:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52680 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 8742432..e16ac74 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2009-12-31  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        Show mac-ews status on QueueStatusServer
+        https://bugs.webkit.org/show_bug.cgi?id=33076
+
+        Also make error status purple.
+
+        * QueueStatusServer/model/attachment.py:
+        * QueueStatusServer/model/queues.py:
+        * QueueStatusServer/templates/dashboard.html:
+        * QueueStatusServer/templates/statusbubble.html:
+
+2009-12-31  Adam Barth  <abarth at webkit.org>
+
         Unreviewed.
 
         [bzt] REGRESSION: Bugzila is a typo
diff --git a/WebKitTools/QueueStatusServer/model/attachment.py b/WebKitTools/QueueStatusServer/model/attachment.py
index 712deaa..751f78e 100644
--- a/WebKitTools/QueueStatusServer/model/attachment.py
+++ b/WebKitTools/QueueStatusServer/model/attachment.py
@@ -79,11 +79,12 @@ class Attachment(object):
         table = {
             "Pass" : "pass",
             "Fail" : "fail",
-            "Error" : "error",
         }
         state = table.get(status.message)
         if state:
             return state
+        if status.message.startswith("Error:"):
+            return "error"
         if status:
             return "pending"
         return None
diff --git a/WebKitTools/QueueStatusServer/model/queues.py b/WebKitTools/QueueStatusServer/model/queues.py
index 0af830b..8d48aff 100644
--- a/WebKitTools/QueueStatusServer/model/queues.py
+++ b/WebKitTools/QueueStatusServer/model/queues.py
@@ -30,6 +30,7 @@ queues = [
     "style-queue",
     "chromium-ews",
     "qt-ews",
+    "mac-ews",
     "gtk-ews",
     "commit-queue",
 ]
diff --git a/WebKitTools/QueueStatusServer/templates/dashboard.html b/WebKitTools/QueueStatusServer/templates/dashboard.html
index 56dbb9a..84ecabb 100644
--- a/WebKitTools/QueueStatusServer/templates/dashboard.html
+++ b/WebKitTools/QueueStatusServer/templates/dashboard.html
@@ -20,6 +20,7 @@ function statusDetail(patch_id) {
       <th>Style</th>
       <th>Chromium</th>
       <th>Qt</th>
+      <th>Mac</th>
       <th>Gtk</th>
       <th>Commit</th>
     </tr>
@@ -45,6 +46,10 @@ function statusDetail(patch_id) {
           onclick="statusDetail({{ summary.attachment_id }})"
           title="{{ summary.qt_ews.status.date|timesince }} ago"{% endif %}>
       </td>
+      <td class="status {{ summary.mac_ews.state }}"{% if summary.mac_ews.status %}
+          onclick="statusDetail({{ summary.attachment_id }})"
+          title="{{ summary.mac_ews.status.date|timesince }} ago"{% endif %}>
+      </td>
       <td class="status {{ summary.gtk_ews.state }}"{% if summary.gtk_ews.status %}
           onclick="statusDetail({{ summary.attachment_id }})"
           title="{{ summary.gtk_ews.status.date|timesince }} ago"{% endif %}>
diff --git a/WebKitTools/QueueStatusServer/templates/statusbubble.html b/WebKitTools/QueueStatusServer/templates/statusbubble.html
index 6e5d13e..fb6e07b 100644
--- a/WebKitTools/QueueStatusServer/templates/statusbubble.html
+++ b/WebKitTools/QueueStatusServer/templates/statusbubble.html
@@ -61,6 +61,11 @@ function statusDetail(patch_id) {
     title="{{ summary.qt_ews.status.date|timesince }} ago"{% endif %}>
   qt
 </div>
+<div class="status {{ summary.mac_ews.state }}"{% if summary.mac_ews.status %}
+    onclick="statusDetail({{ summary.attachment_id }})"
+    title="{{ summary.mac_ews.status.date|timesince }} ago"{% endif %}>
+  mac
+</div>
 <div class="status {{ summary.gtk_ews.state }}"{% if summary.gtk_ews.status %}
     onclick="statusDetail({{ summary.attachment_id }})"
     title="{{ summary.gtk_ews.status.date|timesince }} ago"{% endif %}>

-- 
WebKit Debian packaging