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

diff --git a/b1/fa5e8a43268aa71887afec1165c63c4c09d12d b/b1/fa5e8a43268aa71887afec1165c63c4c09d12d
new file mode 100644 (file)
index 0000000..70d70d7
--- /dev/null
+++ b/b1/fa5e8a43268aa71887afec1165c63c4c09d12d
@@ -0,0 +1,122 @@
+Return-Path: <m.walters@qmul.ac.uk>\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 468C3431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 28 May 2012 12:06:40 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+       tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+       NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 MfDP6x8JqjrI for <notmuch@notmuchmail.org>;\r
+       Mon, 28 May 2012 12:06:38 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 69024431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 28 May 2012 12:06:38 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+       by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SZ5H2-0005A5-VV; Mon, 28 May 2012 20:06:37 +0100\r
+Received: from 94-192-233-223.zone6.bethere.co.uk ([94.192.233.223]\r
+       helo=localhost)\r
+       by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1SZ5H2-00050D-Lx; Mon, 28 May 2012 20:06:36 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 3/6] cli: make --entire-thread=false work for\r
+       format=json.\r
+In-Reply-To: <20120528233415.GE2331@hili.localdomain>\r
+References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>\r
+       <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>\r
+       <20120528233415.GE2331@hili.localdomain>\r
+User-Agent: Notmuch/0.13+55~g992aa73 (http://notmuchmail.org) Emacs/23.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 28 May 2012 20:06:38 +0100\r
+Message-ID: <87txz0m8g1.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 94.192.233.223\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: e2753ef8ca3839045240680d0416928c (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+       determine if it is\r
+       spam. We require at least 5.0 points to mark a message as spam.\r
+       This message scored -1.8 points.\r
+       Summary of the scoring: \r
+       * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+       *      medium trust\r
+       *      [138.37.6.40 listed in list.dnswl.org]\r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       * -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay\r
+       *      domain\r
+       *  0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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 19:06:40 -0000\r
+\r
+On Mon, 28 May 2012, Peter Wang <novalazy@gmail.com> wrote:\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
+Yes I agree that this is cleaner. I will put it in the next version.\r
+\r
+Many thanks for the reviews!\r
+\r
+Mark\r