Merge WebKit at r68651 : Initial merge by git.

Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12

4 files changed, 62 insertions, 17 deletions

diff --git a/WebKitTools/QueueStatusServer/handlers/queuestatus.py b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
index f76157d..0259c37 100644
--- a/WebKitTools/QueueStatusServer/handlers/queuestatus.py
+++ b/WebKitTools/QueueStatusServer/handlers/queuestatus.py
@@ -31,24 +31,27 @@ from google.appengine.ext.webapp import template
 
 from model.queues import queues, display_name_for_queue
 from model.workitems import WorkItems
+from model.activeworkitems import ActiveWorkItems
 
 from model import queuestatus
 
 
 class QueueStatus(webapp.RequestHandler):
-    def _rows_for_work_items(self, work_items):
-        if not work_items:
+    def _rows_for_work_items(self, queued_items, active_items):
+        if not queued_items:
             return []
         rows = []
-        for item_id in work_items.item_ids:
+        for item_id in queued_items.item_ids:
             rows.append({
                 "attachment_id": item_id,
                 "bug_id": 1,
+                "lock_time": active_items and active_items.time_for_item(item_id),
             })
         return rows
 
     def get(self, queue_name):
-        work_items = WorkItems.all().filter("queue_name =", queue_name).get()
+        queued_items = WorkItems.all().filter("queue_name =", queue_name).get()
+        active_items = ActiveWorkItems.all().filter("queue_name =", queue_name).get()
         statuses = queuestatus.QueueStatus.all().filter("queue_name =", queue_name).order("-date").fetch(15)
 
         status_groups = []
@@ -67,7 +70,7 @@ class QueueStatus(webapp.RequestHandler):
 
         template_values = {
             "display_queue_name": display_name_for_queue(queue_name),
-            "work_item_rows": self._rows_for_work_items(work_items),
+            "work_item_rows": self._rows_for_work_items(queued_items, active_items),
             "status_groups": status_groups,
         }
         self.response.out.write(template.render("templates/queuestatus.html", template_values))
diff --git a/WebKitTools/QueueStatusServer/handlers/updatestatus.py b/WebKitTools/QueueStatusServer/handlers/updatestatus.py
index 5a93dbd..89858b6 100644
--- a/WebKitTools/QueueStatusServer/handlers/updatestatus.py
+++ b/WebKitTools/QueueStatusServer/handlers/updatestatus.py
@@ -31,6 +31,7 @@ from google.appengine.ext import webapp, db
 from google.appengine.ext.webapp import template
 
 from handlers.updatebase import UpdateBase
+from model.activeworkitems import ActiveWorkItems
 from model.attachment import Attachment
 from model.queuestatus import QueueStatus
 
@@ -56,8 +57,24 @@ class UpdateStatus(UpdateBase):
         queue_status.results_file = db.Blob(str(results_file))
         return queue_status
 
+    @staticmethod
+    def _expire_item(key, item_id):
+        active_work_items = db.get(key)
+        active_work_items.expire_item(item_id)
+        active_work_items.put()
+
+    # FIXME: An explicit lock_release request would be cleaner than this magical "Retry" status.
+    def _update_active_work_items(self, queue_status):
+        if queue_status.message != "Retry":  # From AbstractQueue._retry_status
+            return
+        active_items = ActiveWorkItems.all().filter("queue_name =", queue_status.queue_name).get()
+        if not active_items:
+            return
+        return db.run_in_transaction(self._expire_item, active_items.key(), queue_status.active_patch_id)
+
     def post(self):
         queue_status = self._queue_status_from_request()
         queue_status.put()
+        self._update_active_work_items(queue_status)
         Attachment.dirty(queue_status.active_patch_id)
         self.response.out.write(queue_status.key().id())
diff --git a/WebKitTools/QueueStatusServer/model/activeworkitems.py b/WebKitTools/QueueStatusServer/model/activeworkitems.py
index e24e6ca..a244c7d 100644
--- a/WebKitTools/QueueStatusServer/model/activeworkitems.py
+++ b/WebKitTools/QueueStatusServer/model/activeworkitems.py
@@ -28,7 +28,7 @@
 
 from google.appengine.ext import db
 
-from datetime import timedelta
+from datetime import timedelta, datetime
 import time
 
 
@@ -38,21 +38,41 @@ class ActiveWorkItems(db.Model):
     item_dates = db.ListProperty(float)
     date = db.DateTimeProperty(auto_now_add=True)
 
+    # The id/date pairs should probably just be their own class.
+    def _item_time_pairs(self):
+        return zip(self.item_ids, self.item_dates)
+
+    def _set_item_time_pairs(self, pairs):
+        if pairs:
+            # The * operator raises on an empty list.
+            # db.Model does not tuples, we have to make lists.
+            self.item_ids, self.item_dates = map(list, zip(*pairs))
+        else:
+            self.item_ids = []
+            self.item_dates = []
+
+    def _append_item_time_pair(self, pair):
+        self.item_ids.append(pair[0])
+        self.item_dates.append(pair[1])
+
+    def expire_item(self, item_id):
+        nonexpired_pairs = [pair for pair in self._item_time_pairs() if pair[0] != item_id]
+        self._set_item_time_pairs(nonexpired_pairs)
+
     def deactivate_expired(self, now):
         one_hour_ago = time.mktime((now - timedelta(minutes=60)).timetuple())
-        nonexpired_item_ids = []
-        nonexpired_item_dates = []
-        for i in range(len(self.item_ids)):
-            if self.item_dates[i] > one_hour_ago:
-                nonexpired_item_ids.append(self.item_ids[i])
-                nonexpired_item_dates.append(self.item_dates[i])
-        self.item_ids = nonexpired_item_ids
-        self.item_dates = nonexpired_item_dates
+        nonexpired_pairs = [pair for pair in self._item_time_pairs() if pair[1] > one_hour_ago]
+        self._set_item_time_pairs(nonexpired_pairs)
 
     def next_item(self, work_item_ids, now):
         for item_id in work_item_ids:
             if item_id not in self.item_ids:
-                self.item_ids.append(item_id)
-                self.item_dates.append(time.mktime(now.timetuple()))
+                self._append_item_time_pair([item_id, time.mktime(now.timetuple())])
                 return item_id
         return None
+
+    def time_for_item(self, item_id):
+        for active_item_id, time in self._item_time_pairs():
+            if active_item_id == item_id:
+                return datetime.fromtimestamp(time)
+        return None
diff --git a/WebKitTools/QueueStatusServer/templates/queuestatus.html b/WebKitTools/QueueStatusServer/templates/queuestatus.html
index d2d72c7..1b98952 100644
--- a/WebKitTools/QueueStatusServer/templates/queuestatus.html
+++ b/WebKitTools/QueueStatusServer/templates/queuestatus.html
@@ -42,13 +42,18 @@
 
 <h3>Patches in queue</h3>
 <table>
-    <tr><th>Position</th><th>Patch</th></tr>
+    <tr><th>Position</th><th>Patch</th><th>Lock Acquired</th></tr>
     {% for row in work_item_rows %}
     <tr>
         <td>#{{ forloop.counter }}</td>
         <td>
           {{ row.attachment_id|force_escape|webkit_attachment_id|safe }}
         </td>
+        <td>
+            {% if row.lock_time %}
+                {{ row.lock_time|timesince }} ago
+            {% endif %}
+        </td>
     </tr>
     {% endfor %}
 </table>