[PATCH v5 3/5] cli: make --entire-thread=false work for format=json.

diff --git a/d6/07599f0636ec2c7442a9ce0beaa909762a3ede b/d6/07599f0636ec2c7442a9ce0beaa909762a3ede
new file mode 100644 (file)
index 0000000..10a0a86
--- /dev/null
+++ b/d6/07599f0636ec2c7442a9ce0beaa909762a3ede
@@ -0,0 +1,141 @@
+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 BD355431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:19 -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 iTMNuBYELESP for <notmuch@notmuchmail.org>;\r
+       Sat, 26 May 2012 08:55:18 -0700 (PDT)\r
+Received: from mail-wi0-f169.google.com (mail-wi0-f169.google.com\r
+       [209.85.212.169]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 52FFD429E48\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:14 -0700 (PDT)\r
+Received: by wibhn14 with SMTP id hn14so419591wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 26 May 2012 08:55:13 -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:in-reply-to:references;\r
+       bh=uW9UzMUuW4RvL6HwveBZfKownUyZ/BrTGlBS2m1565g=;\r
+       b=qVR5/jTnaNnbA6NU8D/QdE81MZMWWQDsA3YKJCiKY+cok4xwRZVqHOjulq2kpUgQKx\r
+       gNvZ6GXXP8/2Skrm+tBRR0XlAHsMXi8cjzmG2s0QGlH7V2DbXqDi+uP2Dgjfl5OfFcYv\r
+       qMN24jPSw7PwOcxfqfqhFcbd6e1bn08oMCHibxGl54yY4ZwPog8jz0jlXa46mJ3r2X10\r
+       cv1ip7hLG1gh1uXmHwIjYlfgBf5egZiwqms6C2ihrUezW6m5XGEAB2bgxBpqDqHziqXE\r
+       88F3MdtvOQPqV8SgW2mPHDIX6iyDB52vB+NiQAzfFIribX8AkyJrv2RvC0nYJj2TGznV\r
+       MrRg==\r
+Received: by 10.216.202.160 with SMTP id d32mr1393338weo.147.1338047709926;\r
+       Sat, 26 May 2012 08:55:09 -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
+ e20sm5907028wiv.7.2012.05.26.08.55.08 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 26 May 2012 08:55:09 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v5 3/5] cli: make --entire-thread=false work for format=json.\r
+Date: Sat, 26 May 2012 16:54:52 +0100\r
+Message-Id: <1338047694-32548-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338047694-32548-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338047694-32548-1-git-send-email-markwalters1009@gmail.com>\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, 26 May 2012 15:55:20 -0000\r
+\r
+The --entire-thread option in notmuch-show.c defaults to true when\r
+format=json. Previously there was no way to turn this off. This patch\r
+makes it respect --entire-thread=false.\r
+\r
+To do this the patch moves the --entire-thread option to be a keyword\r
+option using the new command line parsing to allow the existing\r
+--entire-thread syntax to keep working.\r
+---\r
+ notmuch-show.c |   25 +++++++++++++++++++++++--\r
+ 1 files changed, 23 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 97da5cc..207093a 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -981,6 +981,12 @@ enum {\r
+     NOTMUCH_FORMAT_RAW\r
+ };\r
+ \r
++enum {\r
++    ENTIRE_THREAD_DEFAULT,\r
++    ENTIRE_THREAD_TRUE,\r
++    ENTIRE_THREAD_FALSE,\r
++};\r
++\r
+ /* The following is to allow future options to be added more easily */\r
+ enum {\r
+     EXCLUDE_TRUE,\r
+@@ -1000,6 +1006,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
+     int exclude = EXCLUDE_TRUE;\r
++    int entire_thread = ENTIRE_THREAD_DEFAULT;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+@@ -1012,8 +1019,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+           (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+                                   { "false", EXCLUDE_FALSE },\r
+                                   { 0, 0 } } },\r
++        { NOTMUCH_OPT_KEYWORD, &entire_thread, "entire-thread", 't',\r
++          (notmuch_keyword_t []){ { "true", ENTIRE_THREAD_TRUE },\r
++                                  { "false", ENTIRE_THREAD_FALSE },\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_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+@@ -1036,7 +1046,9 @@ 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
++      /* JSON defaults to entire-thread TRUE */\r
++      if (entire_thread == ENTIRE_THREAD_DEFAULT)\r
++          entire_thread = ENTIRE_THREAD_TRUE;\r
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1058,6 +1070,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       params.raw = TRUE;\r
+       break;\r
+     }\r
++    /* Default is entire-thread = FALSE except for format=json which\r
++     * is dealt with above. */\r
++    if (entire_thread == ENTIRE_THREAD_DEFAULT)\r
++      entire_thread = ENTIRE_THREAD_FALSE;\r
++\r
++    if (entire_thread == ENTIRE_THREAD_TRUE)\r
++      params.entire_thread = TRUE;\r
++    else\r
++      params.entire_thread = FALSE;\r
+ \r
+     if (params.decrypt || verify) {\r
+ #ifdef GMIME_ATLEAST_26\r
+-- \r
+1.7.9.1\r
+\r