[PATCH 0/2] Allow JSON to use non-entire thread, and use for elide

diff --git a/9d/89985bbe0e6715a63e148305045ba6f53abd8a b/9d/89985bbe0e6715a63e148305045ba6f53abd8a
new file mode 100644 (file)
index 0000000..2f3223d
--- /dev/null
+++ b/9d/89985bbe0e6715a63e148305045ba6f53abd8a
@@ -0,0 +1,99 @@
+Return-Path: <markwalters1009@gmail.com>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 135A9431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:04:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 1p6RtZ2kikj2 for <notmuch@notmuchmail.org>;\r
+       Tue, 10 Apr 2012 10:04:55 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7AACA431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:04:55 -0700 (PDT)\r
+Received: by wibhm17 with SMTP id hm17so3400444wib.2\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:04:54 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer;\r
+       bh=r9o7B+ofWq3gqbml7d+60U1a3k7h4dZb8YxKn2E8huM=;\r
+       b=JtxD7dy18c6OjJb5E6fh0rCk/qUtuCpVopaWXL99sfQgG6+pAikgRsoy6/zKcugZ9S\r
+       CR0pIv7JiGqPRrmXnQXSW9nQjZrsks2XCdbapWm6M+9q0/N+4yk6vT6utTot/U00ts7K\r
+       PjzV+BcTvbZT5GBy+S5JYSrvGaTRuGOh7oYlHyNXuDCbY5ohiiT3oP6c2EEh9o0BFuXI\r
+       +wbc+POmafA6+3d0xAhrnmkuRwzdKgkyRE5P8+A7Z04+6btlPYohSTDwUCo0O31C5q29\r
+       GcvijSySQOFCbqTvNfW0CBejN1c/DixwK2vqSC4iOUjaplKHSSKH9kDkkP0Z/nKrrX5n\r
+       2J+Q==\r
+Received: by 10.180.92.130 with SMTP id cm2mr8846326wib.4.1334077494114;\r
+       Tue, 10 Apr 2012 10:04:54 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ ea6sm38820791wib.5.2012.04.10.10.04.51        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 10 Apr 2012 10:04:52 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/2] Allow JSON to use non-entire thread, and use for elide\r
+Date: Tue, 10 Apr 2012 18:04:54 +0100\r
+Message-Id: <1334077496-9172-1-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Tue, 10 Apr 2012 17:04:57 -0000\r
+\r
+These two patches supersede the series [1] and the first patch\r
+replaces [2].\r
+\r
+The first patch allows --entire-thread=false for notmuch-show.c when\r
+the output format is JSON. In the previous version [2] Austin\r
+suggested that we should output an empty message (i.e., {}) for\r
+non-matching messages rather than just omitting them. This version\r
+does that.\r
+\r
+Note the first patch is entirely functional without the second.\r
+\r
+The second patch uses the first to implement the "elide" functionality\r
+in the emacs interface on the cli-side rather than on the emacs\r
+side. This is substantially faster in some cases. In current emacs\r
+show view it is a relatively small speed-up which is only noticable\r
+with large threads. However, it will be used by notmuch-pick [3] and\r
+there the speed up will be important. (I have a current version of\r
+notmuch-pick which I will submit in the near future.)\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+[1] id:"1330033294-21980-1-git-send-email-markwalters1009@gmail.com"\r
+[2] id:"1331377533-30262-3-git-send-email-markwalters1009@gmail.com"\r
+[3] id:"1329072579-27340-1-git-send-email-markwalters1009@gmail.com"\r
+\r
+Mark Walters (2):\r
+  cli: make --entire-thread=false work for format=json.\r
+  emacs: make elide messages use notmuch-show for omitting messages.\r
+\r
+ emacs/notmuch-show.el |   17 +++++++++--------\r
+ notmuch-show.c        |   33 ++++++++++++++++++++++++++++-----\r
+ 2 files changed, 37 insertions(+), 13 deletions(-)\r
+\r
+-- \r
+1.7.9.1\r
+\r