[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 18f72554f073b007ec9377d5bcb065d938dd2628
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 16 00:05:46 2010 +0000

    2010-09-15  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            CQ status shows items out of order
            https://bugs.webkit.org/show_bug.cgi?id=45846
    
            Only group consecutive status items with the same patch ID into the same
            group, so that overall item ordering is preserved.
    
            Also don't indent status items that only have a single item in their
            group.
    
            * QueueStatusServer/handlers/queuestatus.py:
            * QueueStatusServer/templates/includes/singlequeuestatus.html: Added.
            * QueueStatusServer/templates/queuestatus.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67584 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3c1d4eb..ec1b06e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,20 @@
+2010-09-15  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        CQ status shows items out of order
+        https://bugs.webkit.org/show_bug.cgi?id=45846
+        
+        Only group consecutive status items with the same patch ID into the same
+        group, so that overall item ordering is preserved.
+        
+        Also don't indent status items that only have a single item in their
+        group.
+
+        * QueueStatusServer/handlers/queuestatus.py:
+        * QueueStatusServer/templates/includes/singlequeuestatus.html: Added.
+        * QueueStatusServer/templates/queuestatus.html:
+
 2010-09-15  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/QueueStatusServer/handlers/queuestatus.py b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
index 86b2f26..f76157d 100644
--- a/WebKitTools/QueueStatusServer/handlers/queuestatus.py
+++ b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
@@ -51,22 +51,19 @@ class QueueStatus(webapp.RequestHandler):
         work_items = WorkItems.all().filter("queue_name =", queue_name).get()
         statuses = queuestatus.QueueStatus.all().filter("queue_name =", queue_name).order("-date").fetch(15)
 
-        status_groups_by_patch_id = {}
         status_groups = []
+        last_patch_id = None
         synthetic_patch_id_counter = 0
 
         for status in statuses:
-            if status.active_patch_id:
-                patch_id = status.active_patch_id
+            patch_id = status.active_patch_id
+            if not patch_id or last_patch_id != patch_id:
+                status_group = []
+                status_groups.append(status_group)
             else:
-                patch_id = 'synthetic-%d' % synthetic_patch_id_counter
-                synthetic_patch_id_counter += 1
-
-            if patch_id not in status_groups_by_patch_id:
-                new_status_group = []
-                status_groups_by_patch_id[patch_id] = new_status_group
-                status_groups.append(new_status_group)
-            status_groups_by_patch_id[patch_id].append(status)
+                status_group = status_groups[-1]
+            status_group.append(status)
+            last_patch_id = patch_id
 
         template_values = {
             "display_queue_name": display_name_for_queue(queue_name),
diff --git a/WebKitTools/QueueStatusServer/templates/includes/singlequeuestatus.html b/WebKitTools/QueueStatusServer/templates/includes/singlequeuestatus.html
new file mode 100644
index 0000000..075cd39
--- /dev/null
+++ b/WebKitTools/QueueStatusServer/templates/includes/singlequeuestatus.html
@@ -0,0 +1,5 @@
+<span class="status-date">{{ status.date|timesince }} ago</span>
+<span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>
+{% if status.results_file %}
+    <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>
+{% endif %}
diff --git a/WebKitTools/QueueStatusServer/templates/queuestatus.html b/WebKitTools/QueueStatusServer/templates/queuestatus.html
index 3a4f1a7..d2d72c7 100644
--- a/WebKitTools/QueueStatusServer/templates/queuestatus.html
+++ b/WebKitTools/QueueStatusServer/templates/queuestatus.html
@@ -20,18 +20,20 @@
                         {{ title_status.active_bug_id|force_escape|webkit_bug_id|safe }}:
                     </span>
                 {% endif %}
-              
-                <ul>
-                    {% for status in status_group %}
-                        <li class="status">
-                            <span class="status-date">{{ status.date|timesince }} ago</span>
-                            <span class="status-message">{{ status.message|force_escape|urlize|webkit_linkify|safe }}</span>
-                            {% if status.results_file %}
-                                <span class="status-results">[{{ status.key.id|results_link|safe }}]</span>
-                            {% endif %}
-                        </li>
-                    {% endfor %}
-                </ul>
+                
+                {% ifequal status_group|length 1 %}
+                    {% with title_status as status %}
+                        {% include 'includes/singlequeuestatus.html' %}
+                    {% endwith %}
+                {% else %}
+                    <ul>
+                        {% for status in status_group %}
+                            <li class="status">
+                                {% include 'includes/singlequeuestatus.html' %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                {% endifequal %}
             </li>
         {% endwith %}
     {% endfor %}

-- 
WebKit Debian packaging