1 Return-Path: <novalazy@gmail.com>
\r
2 X-Original-To: notmuch@notmuchmail.org
\r
3 Delivered-To: notmuch@notmuchmail.org
\r
4 Received: from localhost (localhost [127.0.0.1])
\r
5 by olra.theworths.org (Postfix) with ESMTP id 3BB00431FAF
\r
6 for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:23 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5
\r
12 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
\r
13 FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
14 Received: from olra.theworths.org ([127.0.0.1])
\r
15 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
16 with ESMTP id 3EsQqmdlqiWK for <notmuch@notmuchmail.org>;
\r
17 Mon, 28 May 2012 06:34:22 -0700 (PDT)
\r
18 Received: from mail-pz0-f53.google.com (mail-pz0-f53.google.com
\r
19 [209.85.210.53]) (using TLSv1 with cipher RC4-MD5 (128/128 bits))
\r
20 (No client certificate requested)
\r
21 by olra.theworths.org (Postfix) with ESMTPS id BBCF9431FAE
\r
22 for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:22 -0700 (PDT)
\r
23 Received: by dadg9 with SMTP id g9so5244481dad.26
\r
24 for <notmuch@notmuchmail.org>; Mon, 28 May 2012 06:34:22 -0700 (PDT)
\r
25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
\r
26 h=date:message-id:from:to:subject:in-reply-to:references:mime-version
\r
27 :content-type:content-disposition:content-transfer-encoding;
\r
28 bh=tWYS108PeGbYv17E7oyn2F1/gCzCjh4vNMuAw4T0Nvk=;
\r
29 b=WIGVe9JZtqRY0Oyyk7Fd/q+QJcFCIesWTtAmQ+paf5TCL9X0RCOuhHJkFpRVr/cQVT
\r
30 8NufsEUO1zDEdD+0S1CE0BYfJy8Tvq2TsSGgKvo4avweB/GNydO0sgeIVmapI5y6JQxb
\r
31 YGBUAXpPGkkAHz1ZFdv6fNraeBCLw8jJkT3NMMXDkAAv/HUHbkPkaGawATqrxdAgYGDS
\r
32 O8smNJx01t+mM/gw+WGAaKgJxFNeBhp05I92k1cITymknwAPAbGvEqYiCJrLLj6NQFH2
\r
33 Iyzvl65V7X5gmb7F6wbsN4nXLixGT1+mTaXO/wyOkd6IPbtd+WF/rOnXK1LUnsHEgAS7
\r
35 Received: by 10.68.231.164 with SMTP id th4mr27399887pbc.97.1338212061952;
\r
36 Mon, 28 May 2012 06:34:21 -0700 (PDT)
\r
37 Received: from localhost (215.42.233.220.static.exetel.com.au.
\r
39 by mx.google.com with ESMTPS id ve6sm19291964pbc.75.2012.05.28.06.34.18
\r
40 (version=TLSv1/SSLv3 cipher=OTHER);
\r
41 Mon, 28 May 2012 06:34:20 -0700 (PDT)
\r
42 Date: Mon, 28 May 2012 23:34:15 +1000
\r
43 Message-ID: <20120528233415.GE2331@hili.localdomain>
\r
44 From: Peter Wang <novalazy@gmail.com>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: Re: [PATCH v6 3/6] cli: make --entire-thread=false work for
\r
48 In-Reply-To: <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>
\r
49 References: <1338106946-7611-1-git-send-email-markwalters1009@gmail.com>
\r
50 <1338106946-7611-4-git-send-email-markwalters1009@gmail.com>
\r
52 Content-Type: text/plain; charset=utf-8
\r
53 Content-Disposition: inline
\r
54 Content-Transfer-Encoding: 8bit
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Mon, 28 May 2012 13:34:23 -0000
\r
69 On Sun, 27 May 2012 09:22:23 +0100, Mark Walters <markwalters1009@gmail.com> wrote:
\r
70 > @@ -1036,7 +1047,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
71 > switch (format_sel) {
\r
72 > case NOTMUCH_FORMAT_JSON:
\r
73 > format = &format_json;
\r
74 > - params.entire_thread = TRUE;
\r
75 > + /* JSON defaults to entire-thread TRUE */
\r
76 > + if (entire_thread == ENTIRE_THREAD_DEFAULT)
\r
77 > + entire_thread = ENTIRE_THREAD_TRUE;
\r
80 Minor point, but you can defer this until later and keep the logic in
\r
83 > case NOTMUCH_FORMAT_TEXT:
\r
84 > format = &format_text;
\r
85 > @@ -1058,6 +1071,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
86 > params.raw = TRUE;
\r
89 > + /* Default is entire-thread = FALSE except for format=json which
\r
90 > + * is dealt with above. */
\r
91 > + if (entire_thread == ENTIRE_THREAD_DEFAULT)
\r
92 > + entire_thread = ENTIRE_THREAD_FALSE;
\r
94 > + if (entire_thread == ENTIRE_THREAD_TRUE)
\r
95 > + params.entire_thread = TRUE;
\r
97 > + params.entire_thread = FALSE;
\r
99 /* Default is entire-thread = FALSE except for format=json. */
\r
100 if (entire_thread == ENTIRE_THREAD_DEFAULT) {
\r
101 if (format == &format_json)
\r
102 entire_thread = ENTIRE_THREAD_TRUE;
\r
104 entire_thread = ENTIRE_THREAD_FALSE;
\r