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

diff --git a/5a/ba45075e4fbfa911cd245bc04c966216e4c2ad b/5a/ba45075e4fbfa911cd245bc04c966216e4c2ad
new file mode 100644 (file)
index 0000000..98f2528
--- /dev/null
+++ b/5a/ba45075e4fbfa911cd245bc04c966216e4c2ad
@@ -0,0 +1,107 @@
+Return-Path: <novalazy@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 3BB00431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:23 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 3EsQqmdlqiWK for <notmuch@notmuchmail.org>;\r
+       Mon, 28 May 2012 06:34:22 -0700 (PDT)\r
+Received: from mail-pz0-f53.google.com (mail-pz0-f53.google.com\r
+       [209.85.210.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id BBCF9431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:22 -0700 (PDT)\r
+Received: by dadg9 with SMTP id g9so5244481dad.26\r
+       for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:22 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=date:message-id:from:to:subject:in-reply-to:references:mime-version\r
+       :content-type:content-disposition:content-transfer-encoding;\r
+       bh=tWYS108PeGbYv17E7oyn2F1/gCzCjh4vNMuAw4T0Nvk=;\r
+       b=WIGVe9JZtqRY0Oyyk7Fd/q+QJcFCIesWTtAmQ+paf5TCL9X0RCOuhHJkFpRVr/cQVT\r
+       8NufsEUO1zDEdD+0S1CE0BYfJy8Tvq2TsSGgKvo4avweB/GNydO0sgeIVmapI5y6JQxb\r
+       YGBUAXpPGkkAHz1ZFdv6fNraeBCLw8jJkT3NMMXDkAAv/HUHbkPkaGawATqrxdAgYGDS\r
+       O8smNJx01t+mM/gw+WGAaKgJxFNeBhp05I92k1cITymknwAPAbGvEqYiCJrLLj6NQFH2\r
+       Iyzvl65V7X5gmb7F6wbsN4nXLixGT1+mTaXO/wyOkd6IPbtd+WF/rOnXK1LUnsHEgAS7\r
+       keUQ==\r
+Received: by 10.68.231.164 with SMTP id th4mr27399887pbc.97.1338212061952;\r
+       Mon, 28 May 2012 06:34:21 -0700 (PDT)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id ve6sm19291964pbc.75.2012.05.28.06.34.18\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Mon, 28 May 2012 06:34:20 -0700 (PDT)\r
+Date: Mon, 28 May 2012 23:34:15 +1000\r
+Message-ID: <20120528233415.GE2331@hili.localdomain>\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 3/6] cli: make --entire-thread=false work for\r
+       format=json.\r
+In-Reply-To: <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>\r
+References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>\r
+       <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: 8bit\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: Mon, 28 May 2012 13:34:23 -0000\r
+\r
+On Sun, 27 May 2012 09:22:23 +0100, Mark Walters <markwalters1009@gmail.com> wrote:\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
+\r
+Minor point, but you can defer this until later and keep the logic in\r
+one place.\r
+\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
+    /* 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
+Peter\r