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

diff --git a/00/6bf11bf008634b1fed64189ae79e80bf94d2ed b/00/6bf11bf008634b1fed64189ae79e80bf94d2ed
new file mode 100644 (file)
index 0000000..6a42312
--- /dev/null
+++ b/00/6bf11bf008634b1fed64189ae79e80bf94d2ed
@@ -0,0 +1,109 @@
+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 619AC431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:07 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.7\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.7 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
+       FREEMAIL_REPLY=2.499, 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 LXFm+dHGeuE0 for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Apr 2012 02:11:06 -0700 (PDT)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id DFD01431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:05 -0700 (PDT)\r
+Received: by werm13 with SMTP id m13so629233wer.26\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:03 -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=HTKZKgT3rpjVawqpRyuMp0lzxbyl9WfrtLQBLpZFhwU=;\r
+       b=Yyg85B2yoENe8kq9wYfPpQz37D/pf0b01pFm1kP4kA0rZkKrYRw/OUI2z0m5289MOX\r
+       zaYh7GcFJGim9Dud2ncIOxdjc3vgVhiu/rS8lGJN4I/jMTJN5RgSRusnQpguiTslFKJG\r
+       YBEVjv98VdadHLD65Z4FvLSLPfcbC77wCl+cU/txZ/mQpSbZMhWc6yhnM5B2dNzpsfk1\r
+       dZgOCJzvdv/Z13BFBgTT+003059qAgvKsUeVwqO7H9hEAmFq8WQ/B1g58rlSczJMLQk+\r
+       zcS0Tromj4m45L2HZQWE47Nx5Lc3qb/7JTF/dOPGQ4lB470MH7n0I+4xEFvdLZQzxVZm\r
+       i9/w==\r
+Received: by 10.216.132.6 with SMTP id n6mr12496205wei.26.1335258663138;\r
+       Tue, 24 Apr 2012 02:11:03 -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
+ gg2sm44880967wib.7.2012.04.24.02.11.01        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 24 Apr 2012 02:11:01 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 0/4] Allow JSON to use non-entire thread, and use for elide\r
+Date: Tue, 24 Apr 2012 10:11:11 +0100\r
+Message-Id: <1335258675-29439-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, 24 Apr 2012 09:11:07 -0000\r
+\r
+This is version 4 of this patch set (previous version at [1]) which\r
+removes the --entire-thread constraint from json output in\r
+notmuch-show, and then uses to implement the emacs elide\r
+functionality.\r
+\r
+Changes from the previous version: \r
+\r
+       split the cli patch \r
+\r
+       update devel/schemata \r
+\r
+       output "null" rather than "{}" for a null message and do so\r
+       using a format string remove this feature\r
+\r
+       from devel/TODO\r
+\r
+The first three patches implement the client side changes: one to\r
+allow null messages to be output in Json (without upsetting the\r
+parsing/structure), one to do the command line parsing for\r
+--entire-thread=false and one to update the schemata.\r
+\r
+The final emacs patch is independent (and the first three make sense\r
+without it) and uses this new functionality to implement the elide\r
+option.\r
+\r
+I think this addresses all review comments\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+[1] id:"1334999750-21811-1-git-send-email-markwalters1009@gmail.com"\r
+\r
+Mark Walters (4):\r
+  cli: Let json output "null" messages for non --entire-thread\r
+  cli: make --entire-thread=false work for format=json.\r
+  Update devel/schemata for --entire-thread=false\r
+  emacs: make elide messages use notmuch-show for omitting messages.\r
+\r
+ devel/TODO            |    2 --\r
+ devel/schemata        |    2 +-\r
+ emacs/notmuch-show.el |   18 ++++++++++--------\r
+ notmuch-client.h      |    1 +\r
+ notmuch-show.c        |   36 ++++++++++++++++++++++++++++++------\r
+ 5 files changed, 42 insertions(+), 17 deletions(-)\r
+\r
+-- \r
+1.7.9.1\r
+\r