[Patch v8 3/6] cli: make --entire-thread=false work for format=json.

diff --git a/59/5469c0b6dca0807865ce9d3a3e7efac9e13d49 b/59/5469c0b6dca0807865ce9d3a3e7efac9e13d49
new file mode 100644 (file)
index 0000000..1857cf9
--- /dev/null
+++ b/59/5469c0b6dca0807865ce9d3a3e7efac9e13d49
@@ -0,0 +1,143 @@
+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 00D10431FAE\r
+       for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:13 -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 86kOd9JPlbYQ for <notmuch@notmuchmail.org>;\r
+       Sat, 16 Jun 2012 03:22:11 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 47A8A431FCF\r
+       for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:08 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hr14so238325wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:07 -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=s+K/A5VU6DPsCLRem49ri3nT4RSNbfhwZZZ56f1a5/I=;\r
+       b=urI2tUpUojtib/OqtlYfh0SrEjAJ+5+iVFNabHN2UmGKqHVjzQbIV6HnyJI+XK5fih\r
+       /rvzFhmRj88Ny1yND6kIgQw6NPbRIAHFor1wQa9vGY3CCnAkRassJA4fM4oIjarjx3Cl\r
+       9dUxXLt3H0mneSiKlPMmOLuyWm/be0hCP2z7EkrLbDRuUx3XGM4mdophFtWugIIYVCWc\r
+       fWsl2bejb5IDfhSHd06ed7r2yem/XvIpTzC1a/oY3F7Go0XPbirnpS+2hQp3mdxa9u2n\r
+       A+xsv/Hjltqk4JbYebHeHWU9dO62ozdQEKe80u4IGBu24q4HD2ww6GblhMDw+LRoi0BX\r
+       0rrw==\r
+Received: by 10.216.141.31 with SMTP id f31mr4721990wej.53.1339842127833;\r
+       Sat, 16 Jun 2012 03:22:07 -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
+ f7sm16608244wiv.2.2012.06.16.03.22.06 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 16 Jun 2012 03:22:06 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v8 3/6] cli: make --entire-thread=false work for format=json.\r
+Date: Sat, 16 Jun 2012 11:21:44 +0100\r
+Message-Id: <1339842107-10632-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1339842107-10632-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1339842107-10632-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, 16 Jun 2012 10:22:13 -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 to keep working.\r
+---\r
+ notmuch-show.c |   27 +++++++++++++++++++++++++--\r
+ 1 files changed, 25 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index b004468..e6eb625 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -980,6 +980,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
+@@ -1005,6 +1011,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\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
+@@ -1017,8 +1024,12 @@ 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
++                                { "", ENTIRE_THREAD_TRUE },\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.crypto.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.crypto.verify, "verify", 'v', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+@@ -1045,7 +1056,6 @@ 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
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1068,6 +1078,19 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       break;\r
+     }\r
+ \r
++    /* Default is entire-thread = FALSE except for format=json. */\r
++    if (entire_thread == ENTIRE_THREAD_DEFAULT) {\r
++      if (format == &format_json)\r
++          entire_thread = ENTIRE_THREAD_TRUE;\r
++      else\r
++          entire_thread = ENTIRE_THREAD_FALSE;\r
++    }\r
++\r
++    if (entire_thread == ENTIRE_THREAD_TRUE)\r
++      params.entire_thread = TRUE;\r
++    else\r
++      params.entire_thread = FALSE;\r
++\r
+     config = notmuch_config_open (ctx, NULL, NULL);\r
+     if (config == NULL)\r
+       return 1;\r
+-- \r
+1.7.9.1\r
+\r