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

diff --git a/21/b89e73427b522cb3646737ae4ef5fd4233891b b/21/b89e73427b522cb3646737ae4ef5fd4233891b
new file mode 100644 (file)
index 0000000..995bcee
--- /dev/null
+++ b/21/b89e73427b522cb3646737ae4ef5fd4233891b
@@ -0,0 +1,142 @@
+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 EBCCF431FBD\r
+       for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:41 -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 SBXDOUV1Z7cR for <notmuch@notmuchmail.org>;\r
+       Sun, 27 May 2012 01:22:41 -0700 (PDT)\r
+Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com\r
+ [74.125.82.41])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ EB7BF431FD8   for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:39 -0700\r
+ (PDT)\r
+Received: by wgbds1 with SMTP id ds1so777392wgb.2\r
+       for <notmuch@notmuchmail.org>; Sun, 27 May 2012 01:22:38 -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=ZJsjAc9yyHPU9+FFZMriEpFc4xZN3E26HSc81htAKhM=;\r
+       b=TyPz0nzFRw123iRdpf83HTOXXUEaLTbvkZF7zMhpfejDqgO8PLGTeDcyK7KhYT8fb6\r
+       nBmBb0TtwJV8Zo+gjceWUD1ahwS3gdY8B70zGOwdcMOIsBNc+l4bVmSm0iWTkGYccXyq\r
+       gHWy0muB1VlX8/pMW7Fmx9L0SmsauoTB5ci9UqRGw90guAVOI5/H+bJOEDGikMFUvsWX\r
+       XBZVHZt/o3B0kpTTeoQc17qiawZY6u1dZcFGfAwwi7HPONP3EkU1+K7OWPii45S7JqTs\r
+       wThhO6/v+fzgLgBXEKK6dNIVw9DX7X6JPiu8GfyI717f6CEodflD/6fvIypmBZbgEHpP\r
+       COSw==\r
+Received: by 10.180.102.9 with SMTP id fk9mr8951895wib.1.1338106958702;\r
+       Sun, 27 May 2012 01:22:38 -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
+ bn9sm11454404wib.5.2012.05.27.01.22.36        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 27 May 2012 01:22:36 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v6 3/6] cli: make --entire-thread=false work for format=json.\r
+Date: Sun, 27 May 2012 09:22:23 +0100\r
+Message-Id: <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1338106946-7611-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: Sun, 27 May 2012 08:22:42 -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 |   26 ++++++++++++++++++++++++--\r
+ 1 files changed, 24 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 97da5cc..4e2965e 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,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.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+@@ -1036,7 +1047,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 +1071,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