[PATCH v4 08/11] cli: Make notmuch-show respect excludes.

diff --git a/75/c8fceefc7ab14e787d6ad0c087cec357f73582 b/75/c8fceefc7ab14e787d6ad0c087cec357f73582
new file mode 100644 (file)
index 0000000..ec65a0f
--- /dev/null
+++ b/75/c8fceefc7ab14e787d6ad0c087cec357f73582
@@ -0,0 +1,145 @@
+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 0DE1F431FDB\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Feb 2012 09:43:37 -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 vPndkAPI61yO for <notmuch@notmuchmail.org>;\r
+       Thu,  2 Feb 2012 09:43:34 -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 450AC429E26\r
+       for <notmuch@notmuchmail.org>; Thu,  2 Feb 2012 09:43:13 -0800 (PST)\r
+Received: by mail-we0-f181.google.com with SMTP id b10so2324200wer.26\r
+       for <notmuch@notmuchmail.org>; Thu, 02 Feb 2012 09:43:12 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=sw+JxQaFNuQXW0Jf7pM157lQjP54/aRZ6ne3aqKuvZQ=;\r
+       b=JutaeZubeDzqgO3Rp+BqO3Tyz+XiaLbxeM3P3i20xmYSdY+ujeYR8XVtxJQnEaw+vu\r
+       QE+/H/opxhmpP++OE5ndXoDovBOe3gWeO95lWNTkFoN2YzeAHF2nGqslYNDpZVWeGeyf\r
+       LtAcJN41DoBTydCz0/Enl5tf4eAdHM7/5u7Gk=\r
+Received: by 10.216.134.39 with SMTP id r39mr4871806wei.50.1328204592914;\r
+       Thu, 02 Feb 2012 09:43:12 -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
+ l8sm9146585wiy.5.2012.02.02.09.43.11  (version=TLSv1/SSLv3 cipher=OTHER);     Thu,\r
+ 02 Feb 2012 09:43:11 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@MIT.EDU\r
+Subject: [PATCH v4 08/11] cli: Make notmuch-show respect excludes.\r
+Date: Thu,  2 Feb 2012 17:43:36 +0000\r
+Message-Id: <1328204619-25046-8-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <874nv9rv79.fsf@qmul.ac.uk>\r
+References: <874nv9rv79.fsf@qmul.ac.uk>\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, 02 Feb 2012 17:43:37 -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 |   24 ++++++++++++++++++++----\r
+ 1 files changed, 20 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index dec799c..108f13b 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -193,10 +193,11 @@ _get_one_line_summary (const void *ctx, notmuch_message_t *message)\r
+ static void\r
+ format_message_text (unused (const void *ctx), notmuch_message_t *message, int indent)\r
+ {\r
+-    printf ("id:%s depth:%d match:%d filename:%s\n",\r
++    printf ("id:%s depth:%d match:%d excluded:%d filename:%s\n",\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
+ }\r
+ \r
+@@ -212,9 +213,10 @@ format_message_json (const void *ctx, notmuch_message_t *message, unused (int in\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
+@@ -1059,9 +1061,13 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     char *opt;\r
+     const notmuch_show_format_t *format = &format_text;\r
+     notmuch_show_params_t params;\r
++    const char **search_exclude_tags;\r
++    size_t search_exclude_tags_length;\r
+     int mbox = 0;\r
+     int format_specified = 0;\r
+     int i;\r
++    notmuch_bool_t no_exclude = FALSE;\r
++    unsigned int j;\r
+ \r
+     params.entire_thread = 0;\r
+     params.raw = 0;\r
+@@ -1098,6 +1104,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+           params.part = atoi(argv[i] + sizeof ("--part=") - 1);\r
+       } else if (STRNCMP_LITERAL (argv[i], "--entire-thread") == 0) {\r
+           params.entire_thread = 1;\r
++      } else if (STRNCMP_LITERAL (argv[i], "--no-exclude") == 0) {\r
++          no_exclude = TRUE;\r
+       } else if ((STRNCMP_LITERAL (argv[i], "--verify") == 0) ||\r
+                  (STRNCMP_LITERAL (argv[i], "--decrypt") == 0)) {\r
+           if (params.cryptoctx == NULL) {\r
+@@ -1167,10 +1175,18 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     if (params.raw && params.part < 0)\r
+       params.part = 0;\r
+ \r
++    /* If a single message is requested we do not use search_excludes. */\r
+     if (params.part >= 0)\r
+       return do_show_single (ctx, query, format, &params);\r
+-    else\r
++    else {\r
++      if (!no_exclude) {\r
++          search_exclude_tags = notmuch_config_get_search_exclude_tags\r
++              (config, &search_exclude_tags_length);\r
++          for (j = 0; j < search_exclude_tags_length; j++)\r
++              notmuch_query_add_tag_exclude (query, search_exclude_tags[j]);\r
++      }\r
+       return do_show (ctx, query, format, &params);\r
++    }\r
+ \r
+     notmuch_query_destroy (query);\r
+     notmuch_database_close (notmuch);\r
+-- \r
+1.7.2.3\r
+\r