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

diff --git a/92/f53ec7d10dfd1f9b1963b1c4ec4478011cc69c b/92/f53ec7d10dfd1f9b1963b1c4ec4478011cc69c
new file mode 100644 (file)
index 0000000..8b97fdc
--- /dev/null
+++ b/92/f53ec7d10dfd1f9b1963b1c4ec4478011cc69c
@@ -0,0 +1,105 @@
+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 7614D431FCB\r
+       for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:55 -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 tRpgbI0Kck+h for <notmuch@notmuchmail.org>;\r
+       Sat, 21 Apr 2012 02:15:50 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 33A0A431FAE   for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:50 -0700\r
+ (PDT)\r
+Received: by wgbdt14 with SMTP id dt14so8556341wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 21 Apr 2012 02:15:47 -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=PcW4fnMJfcN4Pb5jI/e/rS7Sph0AMQgbR18IAEyeBl4=;\r
+       b=gFej06eKX6MtYtCFrfWVB/AOiwu2scSy58wlSLdvcsNOdLS8ygoTXcSooyn/dDEpc9\r
+       V4UVay45VfezHdpFQ+5cHTq0o/rCaeW0s0ifcle04FTnlTHrmjAyc1Y09C9aGiDvFG4S\r
+       aGqcTFLlgTREHJYxN2SrMG2rq4cm0xkyb0mYPOWYgTroVbemGtrGnMlTDaTaRcB6Tu0U\r
+       PcNNg3FdDysO379ToTBXeKBb+INpNh8cSwGMBNyC9bQ3vlh1MNRQu3i6eeXOjoBTatLo\r
+       ACZUCzEIq41fPj+BpmX9HnJFp/nYHsHR0ssiPdLcJc7aLCjB8NZmN8dUmFtMGsJegv35\r
+       f9IQ==\r
+Received: by 10.216.139.194 with SMTP id c44mr5730654wej.112.1334999747444;\r
+       Sat, 21 Apr 2012 02:15:47 -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
+ fl2sm6716052wib.2.2012.04.21.02.15.45 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 21 Apr 2012 02:15:46 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 0/2] Allow JSON to use non-entire thread, and use for elide\r
+Date: Sat, 21 Apr 2012 10:15:48 +0100\r
+Message-Id: <1334999750-21811-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: Sat, 21 Apr 2012 09:15:55 -0000\r
+\r
+This is a rebased version of [1] with the bugfix [2] rolled in and the\r
+style change suggested by Adam in [3].\r
+\r
+I haven't added any tests yet: there do not seem to be any tests of\r
+threading in JSON currently. I intend to rebase my show-tests [4] (and\r
+can include/add tests for this). Alternatively there are Pieter's\r
+tests [5] of the elide functionality which would test both patches.\r
+Any suggestions on the preferred approach are gratefuly received!\r
+\r
+\r
+Description of these patches from the previous version:\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
+[1] id:"1334077496-9172-1-git-send-email-markwalters1009@gmail.com"\r
+[2] id:"1334090884-13001-1-git-send-email-markwalters1009@gmail.com"\r
+[3] id:"CAMoJFUuXmLQR+awJnPKg8ZJAKbHbPAmSrEUVoFj_=dZ76WiKzw@mail.gmail.com"\r
+[4] id:"1332171061-27983-1-git-send-email-markwalters1009@gmail.com"\r
+[5] id:"1329684990-12504-3-git-send-email-pieter@praet.org"\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 |   18 ++++++++++--------\r
+ notmuch-show.c        |   34 +++++++++++++++++++++++++++++-----\r
+ 2 files changed, 39 insertions(+), 13 deletions(-)\r
+\r
+-- \r
+1.7.9.1\r
+\r