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

diff --git a/24/2d1ba79f9bfe4ef78ca6b1843c13802e8b6e02 b/24/2d1ba79f9bfe4ef78ca6b1843c13802e8b6e02
new file mode 100644 (file)
index 0000000..1c28273
--- /dev/null
+++ b/24/2d1ba79f9bfe4ef78ca6b1843c13802e8b6e02
@@ -0,0 +1,117 @@
+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 1D8DB431FD7\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 03:05:46 -0800 (PST)\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 u0wU1xfo7pZ4 for <notmuch@notmuchmail.org>;\r
+       Sat, 10 Mar 2012 03:05:44 -0800 (PST)\r
+Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com\r
+       [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 81BBA431FC3\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 03:05:44 -0800 (PST)\r
+Received: by mail-wi0-f173.google.com with SMTP id hq7so1254475wib.2\r
+       for <notmuch@notmuchmail.org>; Sat, 10 Mar 2012 03:05:44 -0800 (PST)\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=FhgNL4/V/BFx/Md6F0MTKs47nXWsS7Cqog/jtk6bWEE=;\r
+       b=ZY+ueJXLc5wnRjWp0od3f/b4iM1CyiO1MkLX6oqcWys+g1JqkUDhJIOd9bFQuIZ536\r
+       eK2D3pr8aKrMe8lCtj+qmC6w2t+kAxY3v24tXRK4y+l/ehNF7JT5svYhsi3e3c4o470q\r
+       jzF4qeNxe7mdUh2k8xZRdSj+YjSYb0Y0DmrgY1GA5yK6Z7L9+ACKcxdga5+SoHJkny3h\r
+       WbMjQTI1iFoyAUGY0fVhuPTLwsb+tKBaVaicA9SvozGfrGbWrQDn7b/rpMnlYmeLP6G/\r
+       xyj5Pj9STsbMWzyPm1ZcB8sJpG82Ln7JlrfDZJq1wKeBh3dhjJWzYskFHZtGR3NphgbR\r
+       GH9w==\r
+Received: by 10.216.136.202 with SMTP id w52mr3372097wei.109.1331377544116;\r
+       Sat, 10 Mar 2012 03:05:44 -0800 (PST)\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
+ ep17sm13375140wid.2.2012.03.10.03.05.42       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 10 Mar 2012 03:05:43 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] cli: make --entire-thread=false work for format=json.\r
+Date: Sat, 10 Mar 2012 11:05:33 +0000\r
+Message-Id: <1331377533-30262-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1331377533-30262-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1331377533-30262-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, 10 Mar 2012 11:05:46 -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 |   15 +++++++++++++--\r
+ 1 files changed, 13 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 05d51b2..8da1845 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -983,7 +983,12 @@ 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 };\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
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
+     notmuch_bool_t no_exclude = FALSE;\r
+@@ -1020,7 +1025,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
+@@ -1042,6 +1049,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