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