[Patch v7 08/13] cli: Make notmuch-show respect excludes.

diff --git a/ba/4fc2eb84251b3c1cefcd7ce5cf49e8ae60a7de b/ba/4fc2eb84251b3c1cefcd7ce5cf49e8ae60a7de
new file mode 100644 (file)
index 0000000..443c5f7
--- /dev/null
+++ b/ba/4fc2eb84251b3c1cefcd7ce5cf49e8ae60a7de
@@ -0,0 +1,155 @@
+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 67917431FB6\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Mar 2012 14:29:49 -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 3M05NCoJKB2C for <notmuch@notmuchmail.org>;\r
+       Thu,  1 Mar 2012 14:29:47 -0800 (PST)\r
+Received: from mail-we0-f181.google.com (mail-we0-f181.google.com\r
+       [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 00F66431E84\r
+       for <notmuch@notmuchmail.org>; Thu,  1 Mar 2012 14:29:37 -0800 (PST)\r
+Received: by werm13 with SMTP id m13so775491wer.26\r
+       for <notmuch@notmuchmail.org>; Thu, 01 Mar 2012 14:29:36 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.92.34 as permitted sender) client-ip=10.180.92.34; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.92.34 as permitted\r
+       sender) smtp.mail=markwalters1009@gmail.com;\r
+       dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.92.34])\r
+       by 10.180.92.34 with SMTP id cj2mr14729645wib.20.1330640976929\r
+       (num_hops = 1); Thu, 01 Mar 2012 14:29:36 -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=/OoCuaAIfo+tvXBIvnzH51XDY+Q5JnFOC2VH9QyfpDk=;\r
+       b=IkfWDiLJ53dWT0zkOle/tTAuhbFWgrrumLwAeqbhgp6+RdodvXiOzJdzhdPzoJf2W2\r
+       gSTPsAurg2cbhj6IqmWjAusVvxQ8bD366vJi/8gs9kpTgSfeLg6hTFiy45cN6/2Ox072\r
+       opnIjOF5QQOlVmhaNNzArmjBCCuEwjbNhyuTGq/AAHt1dfPb+skLuZqeDGogfVHacyyK\r
+       rpFgDuaGRiPVlUk5Ljzvk/G+3ifVVq7Qu104QG5Wd5bJic47gvZi0maa9hq9pxpStQ/t\r
+       2ni851vklkVABGSpOC8BFlHIKcSpbZQQfW0pvYR+TAbzASnVGjTnlLwu+7d9AA3PDd1g\r
+       S63w==\r
+Received: by 10.180.92.34 with SMTP id cj2mr11832353wib.20.1330640976865;\r
+       Thu, 01 Mar 2012 14:29:36 -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
+ fl2sm16591301wib.4.2012.03.01.14.29.35        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 01 Mar 2012 14:29:35 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v7 08/13] cli: Make notmuch-show respect excludes.\r
+Date: Thu,  1 Mar 2012 22:30:40 +0000\r
+Message-Id: <1330641045-27416-9-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330641045-27416-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: Thu, 01 Mar 2012 22:29:49 -0000\r
+\r
+This adds the excludes to notmuch-show.c. We do not exclude when only\r
+a single message (or part) is requested. notmuch-show will output the\r
+exclude information when either text or json format is requested. As\r
+this changes the output from notmuch-show it breaks many tests (in a\r
+trivial and expected fashion).\r
+---\r
+ notmuch-show.c |   25 +++++++++++++++++++++----\r
+ 1 files changed, 21 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 6a171a4..8c0b925 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -143,9 +143,10 @@ format_message_json (const void *ctx, notmuch_message_t *message)\r
+     date = notmuch_message_get_date (message);\r
+     relative_date = notmuch_time_relative_date (ctx, date);\r
+ \r
+-    printf ("\"id\": %s, \"match\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",\r
++    printf ("\"id\": %s, \"match\": %s, \"excluded\": %s, \"filename\": %s, \"timestamp\": %ld, \"date_relative\": \"%s\", \"tags\": [",\r
+           json_quote_str (ctx_quote, notmuch_message_get_message_id (message)),\r
+           notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? "true" : "false",\r
++          notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? "true" : "false",\r
+           json_quote_str (ctx_quote, notmuch_message_get_filename (message)),\r
+           date, relative_date);\r
+ \r
+@@ -579,11 +580,12 @@ format_part_text (const void *ctx, mime_node_t *node,\r
+       notmuch_message_t *message = node->envelope_file;\r
+ \r
+       part_type = "message";\r
+-      printf ("\f%s{ id:%s depth:%d match:%d filename:%s\n",\r
++      printf ("\f%s{ id:%s depth:%d match:%d excluded:%d filename:%s\n",\r
+               part_type,\r
+               notmuch_message_get_message_id (message),\r
+               indent,\r
+-              notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH),\r
++              notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH) ? 1 : 0,\r
++              notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED) ? 1 : 0,\r
+               notmuch_message_get_filename (message));\r
+     } else {\r
+       GMimeContentDisposition *disposition = g_mime_object_get_content_disposition (meta);\r
+@@ -984,6 +986,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     notmuch_show_params_t params = { .part = -1 };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
++    notmuch_bool_t no_exclude = FALSE;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+@@ -996,6 +999,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
++      { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'n', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -1083,10 +1087,23 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    /* If a single message is requested we do not use search_excludes. */\r
+     if (params.part >= 0)\r
+       ret = do_show_single (ctx, query, format, &params);\r
+-    else\r
++    else {\r
++      if (!no_exclude) {\r
++          const char **search_exclude_tags;\r
++          size_t search_exclude_tags_length;\r
++          unsigned int i;\r
++\r
++          search_exclude_tags = notmuch_config_get_search_exclude_tags\r
++              (config, &search_exclude_tags_length);\r
++          for (i = 0; i < search_exclude_tags_length; i++)\r
++              notmuch_query_add_tag_exclude (query, search_exclude_tags[i]);\r
++      }\r
+       ret = do_show (ctx, query, format, &params);\r
++    }\r
++\r
+ \r
+     notmuch_query_destroy (query);\r
+     notmuch_database_close (notmuch);\r
+-- \r
+1.7.2.3\r
+\r