1 Return-Path: <jani@nikula.org>
\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 6C123431FBD
\r
6 for <notmuch@notmuchmail.org>; Thu, 2 Feb 2012 14:08:39 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id LVqKEdajuHt5 for <notmuch@notmuchmail.org>;
\r
16 Thu, 2 Feb 2012 14:08:38 -0800 (PST)
\r
17 Received: from mail-lpp01m020-f181.google.com (mail-lpp01m020-f181.google.com
\r
18 [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
\r
19 (No client certificate requested)
\r
20 by olra.theworths.org (Postfix) with ESMTPS id 9E041431FAF
\r
21 for <notmuch@notmuchmail.org>; Thu, 2 Feb 2012 14:08:38 -0800 (PST)
\r
22 Received: by lbbgn5 with SMTP id gn5so654150lbb.26
\r
23 for <notmuch@notmuchmail.org>; Thu, 02 Feb 2012 14:08:37 -0800 (PST)
\r
24 Received: by 10.112.29.193 with SMTP id m1mr1305422lbh.12.1328220517141;
\r
25 Thu, 02 Feb 2012 14:08:37 -0800 (PST)
\r
26 Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.
\r
28 by mx.google.com with ESMTPS id a8sm3044553lba.15.2012.02.02.14.08.34
\r
29 (version=SSLv3 cipher=OTHER); Thu, 02 Feb 2012 14:08:35 -0800 (PST)
\r
30 From: Jani Nikula <jani@nikula.org>
\r
31 To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org,
\r
33 Subject: Re: [PATCH v4 08/11] cli: Make notmuch-show respect excludes.
\r
34 In-Reply-To: <1328204619-25046-8-git-send-email-markwalters1009@gmail.com>
\r
35 References: <874nv9rv79.fsf@qmul.ac.uk>
\r
36 <1328204619-25046-8-git-send-email-markwalters1009@gmail.com>
\r
37 User-Agent: Notmuch/0.11+139~g4340989 (http://notmuchmail.org) Emacs/23.3.1
\r
39 Date: Fri, 03 Feb 2012 00:08:32 +0200
\r
40 Message-ID: <87haz8yjkv.fsf@nikula.org>
\r
42 Content-Type: text/plain; charset=us-ascii
\r
43 X-BeenThere: notmuch@notmuchmail.org
\r
44 X-Mailman-Version: 2.1.13
\r
46 List-Id: "Use and development of the notmuch mail system."
\r
47 <notmuch.notmuchmail.org>
\r
48 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
49 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
50 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
51 List-Post: <mailto:notmuch@notmuchmail.org>
\r
52 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
53 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
54 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
55 X-List-Received-Date: Thu, 02 Feb 2012 22:08:39 -0000
\r
57 On Thu, 2 Feb 2012 17:43:36 +0000, Mark Walters <markwalters1009@gmail.com> wrote:
\r
58 > This adds the excludes to notmuch-show.c. We do not exclude when only
\r
59 > a single message (or part) is requested. notmuch-show will output the
\r
60 > exclude information when either text or json format is requested. As
\r
61 > this changes the output from notmuch-show it breaks many tests (in a
\r
62 > trivial and expected fashion).
\r
64 > notmuch-show.c | 24 ++++++++++++++++++++----
\r
65 > 1 files changed, 20 insertions(+), 4 deletions(-)
\r
67 > diff --git a/notmuch-show.c b/notmuch-show.c
\r
68 > index dec799c..108f13b 100644
\r
69 > --- a/notmuch-show.c
\r
70 > +++ b/notmuch-show.c
\r
71 > @@ -193,10 +193,11 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)
\r
73 > format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent)
\r
75 > - printf ("id:%s depth:%d match:%d filename:%s\n",
\r
76 > + printf ("id:%s depth:%d match:%d excluded:%d filename:%s\n",
\r
77 > notmuch_message_get_message_id (message),
\r
79 > - notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),
\r
80 > + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0,
\r
81 > + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0,
\r
82 > notmuch_message_get_filename (message));
\r
85 > @@ -212,9 +213,10 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in
\r
86 > date = notmuch_message_get_date (message);
\r
87 > relative_date = notmuch_time_relative_date (ctx, date);
\r
89 > - printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",
\r
90 > + printf ("\"id\": %s, \"match\": %s, \"excluded\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",
\r
91 > json_quote_str (ctx_quote, notmuch_message_get_message_id (message)),
\r
92 > notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false",
\r
93 > + notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? "true" : "false",
\r
94 > json_quote_str (ctx_quote, notmuch_message_get_filename (message)),
\r
95 > date, relative_date);
\r
97 > @@ -1059,9 +1061,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
99 > const notmuch_show_format_t *format = &format_text;
\r
100 > notmuch_show_params_t params;
\r
101 > + const char **search_exclude_tags;
\r
102 > + size_t search_exclude_tags_length;
\r
104 Please move these within the if (!no_exclude) block.
\r
107 > int format_specified = 0;
\r
109 > + notmuch_bool_t no_exclude = FALSE;
\r
110 > + unsigned int j;
\r
112 Same. Or better yet, reuse i.
\r
115 > params.entire_thread = 0;
\r
117 > @@ -1098,6 +1104,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
118 > params.part = atoi(argv[i] + sizeof ("--part=") - 1);
\r
119 > } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {
\r
120 > params.entire_thread = 1;
\r
121 > + } else if (STRNCMP_LITERAL (argv[i], "--no-exclude") == 0) {
\r
122 > + no_exclude = TRUE;
\r
123 > } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||
\r
124 > (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {
\r
125 > if (params.cryptoctx == NULL) {
\r
126 > @@ -1167,10 +1175,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
\r
127 > if (params.raw && params.part < 0)
\r
130 > + /* If a single message is requested we do not use search_excludes. */
\r
131 > if (params.part >= 0)
\r
132 > return do_show_single (ctx, query, format, ¶ms);
\r
136 Nitpick: There's no rule about this, but I do like the style of using
\r
137 braces for both branches if either branch needs them.
\r
139 > + if (!no_exclude) {
\r
140 > + search_exclude_tags = notmuch_config_get_search_exclude_tags
\r
141 > + (config, &search_exclude_tags_length);
\r
142 > + for (j = 0; j < search_exclude_tags_length; j++)
\r
143 > + notmuch_query_add_tag_exclude (query, search_exclude_tags[j]);
\r
145 > return do_show (ctx, query, format, ¶ms);
\r
148 Hmm, unreachable code below. Why doesn't the compiler complain?
\r
151 > notmuch_query_destroy (query);
\r
152 > notmuch_database_close (notmuch);
\r
156 > _______________________________________________
\r
157 > notmuch mailing list
\r
158 > notmuch@notmuchmail.org
\r
159 > http://notmuchmail.org/mailman/listinfo/notmuch
\r