[PATCH v4 2/4] cli: make --entire-thread=false work for format=json.

diff --git a/69/00e89d04c756d7fd7a65824a91ade1f997cba3 b/69/00e89d04c756d7fd7a65824a91ade1f997cba3
new file mode 100644 (file)
index 0000000..b9cdbec
--- /dev/null
+++ b/69/00e89d04c756d7fd7a65824a91ade1f997cba3
@@ -0,0 +1,118 @@
+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 0FBEF431FC7\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:22 -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 FTkrTM2E1fqG for <notmuch@notmuchmail.org>;\r
+       Tue, 24 Apr 2012 02:11:20 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ E1CD5431FBC   for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:11 -0700\r
+ (PDT)\r
+Received: by wgbdt14 with SMTP id dt14so309405wgb.2\r
+       for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:09 -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=rTkrpXSzkWXjIeKq8SHqmWPWRwmnow/mW8LKZrpVgrM=;\r
+       b=uPukufzSBzC5m4spiVitlcFx3aTIGJokvE3bwzVHp7+LqaOOqyWt/Is/34r3QmIXJB\r
+       SRDTmHutkEw1loYkPf2PMjgxizRXFVogfzNHfHGMUyHCFuxH/cuKDl/Tc1o5KWijyYE0\r
+       6CPo+PzIjl2Nh7iUjf/Qi7nxLJf5jZ0cVcwsPQnXG6FzRLXKJv8+r0LfLCsm+12+g/Oj\r
+       g4y+wIKgh8ZHQQPwnpH4Ksk/53a5oxuKlVnyaFTQsXqMAn5UINBRO9vFEo/1B27ISL6v\r
+       FGH6XTOLQHQRdMnTS1HDqSlNAH7xWXakGwmQpOeAzvxiDPO3g8E3UudqdumTOViTtN0Q\r
+       P/8Q==\r
+Received: by 10.180.107.101 with SMTP id hb5mr23305931wib.7.1335258669305;\r
+       Tue, 24 Apr 2012 02:11: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
+ ff2sm44875484wib.9.2012.04.24.02.11.07        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Tue, 24 Apr 2012 02:11:07 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v4 2/4] cli: make --entire-thread=false work for format=json.\r
+Date: Tue, 24 Apr 2012 10:11:13 +0100\r
+Message-Id: <1335258675-29439-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1335258675-29439-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1335258675-29439-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: Tue, 24 Apr 2012 09:11:22 -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
+The one subtlety is that we initialise a notmuch_bool_t to -1 to\r
+indicate that the option parsing has not set it. This allows the code\r
+to distinguish between the option being omitted from the command line,\r
+and the option being set to false on the command line.\r
+---\r
+ notmuch-show.c |   16 ++++++++++++++--\r
+ 1 files changed, 14 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 0d21f1a..48551bb 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -996,7 +996,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     char *query_string;\r
+     int opt_index, ret;\r
+     const notmuch_show_format_t *format = &format_text;\r
+-    notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };\r
++\r
++    /* We abuse the notmuch_bool_t variable params.entire-thread by\r
++     * setting it to -1 to denote that the command line parsing has\r
++     * not set it. We ensure it is set to TRUE or FALSE before passing\r
++     * it to any other function.*/\r
++    notmuch_show_params_t params = { .part = -1, .entire_thread = -1 };\r
++\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
+     int exclude = EXCLUDE_TRUE;\r
+@@ -1036,7 +1042,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 (params.entire_thread == -1)\r
++          params.entire_thread = TRUE;\r
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1058,6 +1066,10 @@ 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 (params.entire_thread == -1)\r
++      params.entire_thread = FALSE;\r
+ \r
+     if (params.decrypt || verify) {\r
+ #ifdef GMIME_ATLEAST_26\r
+-- \r
+1.7.9.1\r
+\r