[PATCH 3/3] cli: allow switching off entire thread mode in notmuch show json format

diff --git a/6d/8667d6db501fea8c2f9967731a5cf12190b3b4 b/6d/8667d6db501fea8c2f9967731a5cf12190b3b4
new file mode 100644 (file)
index 0000000..1445965
--- /dev/null
+++ b/6d/8667d6db501fea8c2f9967731a5cf12190b3b4
@@ -0,0 +1,125 @@
+Return-Path: <jani@nikula.org>\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 9F155431FC4\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:48 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 4XSyrHvBP9-Q for <notmuch@notmuchmail.org>;\r
+       Fri,  9 Mar 2012 14:33:47 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id D3723431FC3\r
+       for <notmuch@notmuchmail.org>; Fri,  9 Mar 2012 14:33:46 -0800 (PST)\r
+Received: by lbok6 with SMTP id k6so623371lbo.26\r
+       for <notmuch@notmuchmail.org>; Fri, 09 Mar 2012 14:33:45 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=n+9p7/IQeUvZcGm2SxpHWk1zC39BMGEi/8BlNeN/LLM=;\r
+       b=gD4RY3fhGhNJbkC++MU+iOYjGR4ZOvC1S3Htd7/HbGLQHtZ14wveIWpuoOCxcHAr+k\r
+       RWR/AGzGiOVfoSIez00f2SrVJKCYe6LCZMGyiNzugixIHF0fNhJdSa0rWeyqpjDIY0XN\r
+       vEwOIk1js7iJj4gWbAeIbkN3qzKtwJO/+8D3vLH8BR9UWkMxP3tJ/cki5Ok151ljMk6v\r
+       +2WM/ju3FX5IBHjlRguV++Mc04Y06wGhBDXzS1S4dyQ9E1e4k4tTHSUTNzzxxzZ8ErdU\r
+       c1kJA8LMWERGueyp5AIjErHIHLEw+SZDVAqR+6axyhjqAnfmU3EnIubPIKky6guIS+7l\r
+       Y99g==\r
+Received: by 10.112.8.201 with SMTP id t9mr1484163lba.51.1331332425225;\r
+       Fri, 09 Mar 2012 14:33:45 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.\r
+       [84.248.80.253])\r
+       by mx.google.com with ESMTPS id a8sm7964141lba.15.2012.03.09.14.33.43\r
+       (version=SSLv3 cipher=OTHER); Fri, 09 Mar 2012 14:33:44 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org,\r
+       markwalters1009@gmail.com\r
+Subject: [PATCH 3/3] cli: allow switching off entire thread mode in notmuch\r
+       show json format\r
+Date: Sat, 10 Mar 2012 00:33:30 +0200\r
+Message-Id:\r
+ <7000ede2763163976d19072c9b73a253e01c6ca5.1331329406.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.5.4\r
+In-Reply-To: <cover.1331329406.git.jani@nikula.org>\r
+References: <87399iicit.fsf@qmul.ac.uk> <cover.1331329406.git.jani@nikula.org>\r
+In-Reply-To: <cover.1331329406.git.jani@nikula.org>\r
+References: <cover.1331329406.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQmuFEh0aMJ3jwOJiLK0Fze/MhMEUtAFVn2bWH7xNOsMuFvMmiXNHZCiZagOHN4CMcmqXB6X\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: Fri, 09 Mar 2012 22:33:48 -0000\r
+\r
+Previously --format=json implied --entire-thread with no way to switch\r
+it off. Add support for --entire-thread=false usable with json format.\r
+\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ notmuch-show.c |   12 ++++++++++--\r
+ 1 files changed, 10 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 05d51b2..19e0119 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -985,6 +985,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     const notmuch_show_format_t *format = &format_text;\r
+     notmuch_show_params_t params = { .part = -1 };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
++    int entire_thread = -1;\r
+     notmuch_bool_t verify = FALSE;\r
+     notmuch_bool_t no_exclude = FALSE;\r
+ \r
+@@ -996,7 +997,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+                                 { "raw", NOTMUCH_FORMAT_RAW },\r
+                                 { 0, 0 } } },\r
+       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
+-      { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
++      { NOTMUCH_OPT_KEYWORD_DEFAULT, &entire_thread, "entire-thread", 't',\r
++        (notmuch_keyword_t []){ { "true", TRUE },\r
++                                { "false", FALSE },\r
++                                { 0, 0 } } },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'n', 0 },\r
+@@ -1020,7 +1024,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     switch (format_sel) {\r
+     case NOTMUCH_FORMAT_JSON:\r
+       format = &format_json;\r
+-      params.entire_thread = TRUE;\r
++      if (entire_thread == -1)\r
++          params.entire_thread = TRUE;\r
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1043,6 +1048,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       break;\r
+     }\r
+ \r
++    if (entire_thread != -1)\r
++      params.entire_thread = entire_thread;\r
++\r
+     if (params.decrypt || verify) {\r
+ #ifdef GMIME_ATLEAST_26\r
+       /* TODO: GMimePasswordRequestFunc */\r
+-- \r
+1.7.5.4\r
+\r