From: Mark Walters Date: Sat, 21 Apr 2012 09:15:48 +0000 (+0100) Subject: [PATCH v3 0/2] Allow JSON to use non-entire thread, and use for elide X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=61a035442eb0073c5c6cbe9a6cdeb4539325180f;p=notmuch-archives.git [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 index 000000000..8b97fdc90 --- /dev/null +++ b/92/f53ec7d10dfd1f9b1963b1c4ec4478011cc69c @@ -0,0 +1,105 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 7614D431FCB + for ; Sat, 21 Apr 2012 02:15:55 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id tRpgbI0Kck+h for ; + Sat, 21 Apr 2012 02:15:50 -0700 (PDT) +Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 33A0A431FAE for ; Sat, 21 Apr 2012 02:15:50 -0700 + (PDT) +Received: by wgbdt14 with SMTP id dt14so8556341wgb.2 + for ; Sat, 21 Apr 2012 02:15:47 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=PcW4fnMJfcN4Pb5jI/e/rS7Sph0AMQgbR18IAEyeBl4=; + b=gFej06eKX6MtYtCFrfWVB/AOiwu2scSy58wlSLdvcsNOdLS8ygoTXcSooyn/dDEpc9 + V4UVay45VfezHdpFQ+5cHTq0o/rCaeW0s0ifcle04FTnlTHrmjAyc1Y09C9aGiDvFG4S + aGqcTFLlgTREHJYxN2SrMG2rq4cm0xkyb0mYPOWYgTroVbemGtrGnMlTDaTaRcB6Tu0U + PcNNg3FdDysO379ToTBXeKBb+INpNh8cSwGMBNyC9bQ3vlh1MNRQu3i6eeXOjoBTatLo + ACZUCzEIq41fPj+BpmX9HnJFp/nYHsHR0ssiPdLcJc7aLCjB8NZmN8dUmFtMGsJegv35 + f9IQ== +Received: by 10.216.139.194 with SMTP id c44mr5730654wej.112.1334999747444; + Sat, 21 Apr 2012 02:15:47 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fl2sm6716052wib.2.2012.04.21.02.15.45 (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 21 Apr 2012 02:15:46 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH v3 0/2] Allow JSON to use non-entire thread, and use for elide +Date: Sat, 21 Apr 2012 10:15:48 +0100 +Message-Id: <1334999750-21811-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 21 Apr 2012 09:15:55 -0000 + +This is a rebased version of [1] with the bugfix [2] rolled in and the +style change suggested by Adam in [3]. + +I haven't added any tests yet: there do not seem to be any tests of +threading in JSON currently. I intend to rebase my show-tests [4] (and +can include/add tests for this). Alternatively there are Pieter's +tests [5] of the elide functionality which would test both patches. +Any suggestions on the preferred approach are gratefuly received! + + +Description of these patches from the previous version: + +The first patch allows --entire-thread=false for notmuch-show.c when +the output format is JSON. In the previous version [2] Austin +suggested that we should output an empty message (i.e., {}) for +non-matching messages rather than just omitting them. This version +does that. + +Note the first patch is entirely functional without the second. + +The second patch uses the first to implement the "elide" functionality +in the emacs interface on the cli-side rather than on the emacs +side. This is substantially faster in some cases. In current emacs +show view it is a relatively small speed-up which is only noticable +with large threads. However, it will be used by notmuch-pick [3] and +there the speed up will be important. (I have a current version of +notmuch-pick which I will submit in the near future.) + +[1] id:"1334077496-9172-1-git-send-email-markwalters1009@gmail.com" +[2] id:"1334090884-13001-1-git-send-email-markwalters1009@gmail.com" +[3] id:"CAMoJFUuXmLQR+awJnPKg8ZJAKbHbPAmSrEUVoFj_=dZ76WiKzw@mail.gmail.com" +[4] id:"1332171061-27983-1-git-send-email-markwalters1009@gmail.com" +[5] id:"1329684990-12504-3-git-send-email-pieter@praet.org" + +Mark Walters (2): + cli: make --entire-thread=false work for format=json. + emacs: make elide messages use notmuch-show for omitting messages. + + emacs/notmuch-show.el | 18 ++++++++++-------- + notmuch-show.c | 34 +++++++++++++++++++++++++++++----- + 2 files changed, 39 insertions(+), 13 deletions(-) + +-- +1.7.9.1 +