From patchwork Sat Nov  8 19:08:58 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Damien Lespiau <damien.lespiau@intel.com>
X-Patchwork-Id: 408459
Return-Path: 
 <patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>
X-Original-To: incoming@patchwork.ozlabs.org
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by ozlabs.org (Postfix) with ESMTPS id 1F7AA140082
	for <incoming@patchwork.ozlabs.org>;
	Sun,  9 Nov 2014 06:12:33 +1100 (AEDT)
Received: from ozlabs.org (ozlabs.org [103.22.144.67])
	by lists.ozlabs.org (Postfix) with ESMTP id F1F021A2804
	for <incoming@patchwork.ozlabs.org>;
	Sun,  9 Nov 2014 06:12:32 +1100 (AEDT)
X-Original-To: patchwork@lists.ozlabs.org
Delivered-To: patchwork@lists.ozlabs.org
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
	by lists.ozlabs.org (Postfix) with ESMTP id 85E891A17A6
	for <patchwork@lists.ozlabs.org>;
	Sun,  9 Nov 2014 06:09:53 +1100 (AEDT)
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
	by fmsmga101.fm.intel.com with ESMTP; 08 Nov 2014 11:09:53 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.07,341,1413270000"; d="scan'208";a="628923924"
Received: from plane-mobl1.ger.corp.intel.com (HELO
	strange.ger.corp.intel.com) ([10.252.3.12])
	by fmsmga002.fm.intel.com with ESMTP; 08 Nov 2014 11:09:51 -0800
From: Damien Lespiau <damien.lespiau@intel.com>
To: patchwork@lists.ozlabs.org
Subject: [PATCH 40/46] patch: Single out the commit message
Date: Sat,  8 Nov 2014 19:08:58 +0000
Message-Id: <1415473744-31531-41-git-send-email-damien.lespiau@intel.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1415473744-31531-1-git-send-email-damien.lespiau@intel.com>
References: <1415473744-31531-1-git-send-email-damien.lespiau@intel.com>
X-BeenThere: patchwork@lists.ozlabs.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: Patchwork development <patchwork.lists.ozlabs.org>
List-Unsubscribe: <https://lists.ozlabs.org/options/patchwork>,
	<mailto:patchwork-request@lists.ozlabs.org?subject=unsubscribe>
List-Archive: <http://lists.ozlabs.org/pipermail/patchwork/>
List-Post: <mailto:patchwork@lists.ozlabs.org>
List-Help: <mailto:patchwork-request@lists.ozlabs.org?subject=help>
List-Subscribe: <https://lists.ozlabs.org/listinfo/patchwork>,
	<mailto:patchwork-request@lists.ozlabs.org?subject=subscribe>
MIME-Version: 1.0
Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org
Sender: "Patchwork"
	<patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org>

All 'Comments' are stored the same way in the db, but I believe it's
worth making the distinction between introducing what the patch does and
eventual review comments.

Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
---
 apps/patchwork/models.py       | 11 ++++++++++-
 templates/patchwork/patch.html | 18 +++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/apps/patchwork/models.py b/apps/patchwork/models.py
index 4bed9b8..b9c7794 100644
--- a/apps/patchwork/models.py
+++ b/apps/patchwork/models.py
@@ -188,7 +188,16 @@ class Patch(models.Model):
         return self.name
 
     def comments(self):
-        return Comment.objects.filter(patch = self)
+        comments = Comment.objects.filter(patch = self)
+        # len() will trigger a queryset evaluation. That's what we want as
+        # we need the full list of comments. That the list is then sliced into
+        # (commit message, list of followup comments) won't hit the db twice.
+        n_comments = len(comments)
+        if n_comments > 2:
+            return (comments[0], comments[1:])
+        if n_comments == 1:
+            return (comments[0], ())
+        return (None, ())
 
     def save(self):
         try:
diff --git a/templates/patchwork/patch.html b/templates/patchwork/patch.html
index 6540060..618f08e 100644
--- a/templates/patchwork/patch.html
+++ b/templates/patchwork/patch.html
@@ -177,8 +177,22 @@ function toggle_headers(link_id, headers_id)
  >{{ patch.pull_url }}</a>
 {% endif %}
 
+{% for item in patch.comments %}
+
+{% if forloop.first %}
+{% if item %}
+<h2>Commit Message</h2>
+<div class="comment">
+<div class="meta">{{ item.submitter|personify }} - {{item.date}}</div>
+<pre class="content">
+{{ item|commentsyntax }}
+</pre>
+</div>
+{% endif %}
+{% elif item %}
 <h2>Comments</h2>
-{% for comment in patch.comments %}
+
+{% for comment in item %}
 <div class="comment">
 <div class="meta">{{ comment.submitter|personify }} - {{comment.date}}</div>
 <pre class="content">
@@ -186,6 +200,8 @@ function toggle_headers(link_id, headers_id)
 </pre>
 </div>
 {% endfor %}
+{% endif %}
+{% endfor %}
 
 {% if patch.content %}
 <h2>Patch</h2>