[PATCH 4/5] cli: move show to the new --with-excluded naming scheme.

diff --git a/4e/d000729258c176613aa12c4f8f8148c8309f44 b/4e/d000729258c176613aa12c4f8f8148c8309f44
new file mode 100644 (file)
index 0000000..c2e667d
--- /dev/null
+++ b/4e/d000729258c176613aa12c4f8f8148c8309f44
@@ -0,0 +1,202 @@
+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 D62B1431FCB\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:21 -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 t8ok-2zr01Md for <notmuch@notmuchmail.org>;\r
+       Sat,  3 Mar 2012 05:04:21 -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 E6A0A431FAF\r
+       for <notmuch@notmuchmail.org>; Sat,  3 Mar 2012 05:04:20 -0800 (PST)\r
+Received: by werm13 with SMTP id m13so1818868wer.26\r
+       for <notmuch@notmuchmail.org>; Sat, 03 Mar 2012 05:04:18 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.80.8 as permitted sender) client-ip=10.180.80.8; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.80.8 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.80.8])\r
+       by 10.180.80.8 with SMTP id n8mr3874977wix.14.1330779858467 (num_hops =\r
+       1); Sat, 03 Mar 2012 05:04:18 -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=pBanLPgoew9T56Rshbn7yisqEeJD6pl1qy4lY3OT1J8=;\r
+       b=G2ES9SS9QrMauUekNr/afrQCSziKXCWyRg/WqW5pAG4JEzaUa7I//cEiRq3KGyZrpr\r
+       D0L6TbxwptZ1C3YWnVQ6qUUNJYsL6Z56S3NrPiv6UMeZaCQO+JOsTQpWrkrpTZvH0iEM\r
+       Cdb863g67lQkzPJJXUjx1irvWCLvue+SpkqonmCsfzaDlhBDbJBtPhUYywul0LNCW5Jo\r
+       qBkpChAEADX7d9QUrmkyNo5r0ASWp86D8Bl8+2T0TNSN99LMX6Rqth1b+gqxH5yrwvEi\r
+       BPju1U3vT71GgKgGgMaHHS60z4Sllb+nLYTLOF9u4IZGSerXrmX3Rk/iDGHPMsRwGBJJ\r
+       2Ucg==\r
+Received: by 10.180.80.8 with SMTP id n8mr3071358wix.14.1330779858430;\r
+       Sat, 03 Mar 2012 05:04:18 -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
+ er8sm27136271wib.1.2012.03.03.05.04.17        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 03 Mar 2012 05:04:17 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] cli: move show to the new --with-excluded naming scheme.\r
+Date: Sat,  3 Mar 2012 13:05:17 +0000\r
+Message-Id: <1330779918-28024-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330779918-28024-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330779918-28024-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: Sat, 03 Mar 2012 13:04:22 -0000\r
+\r
+This moves show to the --with-excluded naming scheme. When this is set\r
+show returns all threads that match including those that only match in\r
+an excluded message.\r
+\r
+When this flag is not set the behaviour depends on whether\r
+--entire-threads is set. If it is not set then show only returns the\r
+messages which match and are not excluded. If it is set then show\r
+returns all messages in these threads.\r
+---\r
+ man/man1/notmuch-show.1 |    5 +++--\r
+ notmuch-client.h        |    1 +\r
+ notmuch-show.c          |   38 +++++++++++++++++++++-----------------\r
+ 3 files changed, 25 insertions(+), 19 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+index d75d971..0047298 100644\r
+--- a/man/man1/notmuch-show.1\r
++++ b/man/man1/notmuch-show.1\r
+@@ -130,9 +130,10 @@ content.\r
+ \r
+ .RS 4\r
+ .TP 4\r
+-.B \-\-no-exclude\r
++.B \-\-with-excluded\r
+ \r
+-Do not exclude the messages matching search.exclude_tags in the config file.\r
++Include threads that only match in excluded messages (from\r
++search.exclude_tags in the config file) in the output.\r
+ .RE\r
+ \r
+ A common use of\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index f4a62cc..4d9464c 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -99,6 +99,7 @@ typedef struct notmuch_show_format {\r
+ \r
+ typedef struct notmuch_show_params {\r
+     notmuch_bool_t entire_thread;\r
++    notmuch_bool_t with_excluded;\r
+     notmuch_bool_t raw;\r
+     int part;\r
+ #ifdef GMIME_ATLEAST_26\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 05d51b2..f3440ae 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -812,6 +812,7 @@ show_messages (void *ctx,\r
+ {\r
+     notmuch_message_t *message;\r
+     notmuch_bool_t match;\r
++    notmuch_bool_t excluded;\r
+     int first_set = 1;\r
+     int next_indent;\r
+ \r
+@@ -830,10 +831,11 @@ show_messages (void *ctx,\r
+       message = notmuch_messages_get (messages);\r
+ \r
+       match = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH);\r
++      excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED);\r
+ \r
+       next_indent = indent;\r
+ \r
+-      if (match || params->entire_thread) {\r
++      if ((match && (!excluded || params->with_excluded)) || params->entire_thread) {\r
+           show_message (ctx, format, message, indent, params);\r
+           next_indent = indent + 1;\r
+ \r
+@@ -986,7 +988,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
++    notmuch_bool_t with_excluded = FALSE;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+@@ -999,7 +1001,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
++      { NOTMUCH_OPT_BOOLEAN, &with_excluded, "with-excluded", 'n', 0 },\r
+       { 0, 0, 0, 0, 0 }\r
+     };\r
+ \r
+@@ -1088,25 +1090,27 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
+-    /* if format=mbox then we can not output excluded messages as\r
+-     * there is no way to make the exclude flag available */\r
+-    if (format_sel == NOTMUCH_FORMAT_MBOX)\r
+-      notmuch_query_set_omit_excluded_messages (query, TRUE);\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
+-      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
++      /* We always set the exclude tags: in the case --with-excluded\r
++       * we apply notmuch_query_set_with_excluded to the query to\r
++       * get all the results (but they will still be marked\r
++       * excluded */\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
++      if (with_excluded) {\r
++          notmuch_query_set_with_excluded_messages(query, TRUE);\r
++          params.with_excluded = TRUE;\r
+       }\r
++\r
+       ret = do_show (ctx, query, format, &params);\r
+     }\r
+ \r
+-- \r
+1.7.2.3\r
+\r