[PATCH 4/5] cli: move show to the new --exclude= option naming scheme.

diff --git a/7a/54307c314ffc3860a9ac63b9329b05ef4fa93d b/7a/54307c314ffc3860a9ac63b9329b05ef4fa93d
new file mode 100644 (file)
index 0000000..0e0c2d0
--- /dev/null
+++ b/7a/54307c314ffc3860a9ac63b9329b05ef4fa93d
@@ -0,0 +1,229 @@
+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 A3E8A429E34\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Mar 2012 11:42:26 -0700 (PDT)\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 E1FjWsKDpaKS for <notmuch@notmuchmail.org>;\r
+       Thu, 15 Mar 2012 11:42:24 -0700 (PDT)\r
+Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com\r
+       [209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1A108431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Mar 2012 11:42:23 -0700 (PDT)\r
+Received: by mail-wi0-f179.google.com with SMTP id hn6so3844513wib.2\r
+       for <notmuch@notmuchmail.org>; Thu, 15 Mar 2012 11:42:23 -0700 (PDT)\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=X7tkFsQY8U9jLo4+S2QF/rBwSLaAQ6WxxiIl/BwhV8Q=;\r
+       b=VvrGEM7WP4kqop5FZAUbKTHzPGlqLG475xTD/D1Ct7STONPQ4ZVTzXMPI9bJ6Hua9C\r
+       6PWFjpiwTLC52cc5Wz7tcgCwNnN8117D+KwGWyh+sYz7nW2tImimwl7HHWtMvW+41U7X\r
+       AtEGgDVoeb3hBdcBj92FVRKcx5nssMR/Cgb6dVuxGiaEAx9SawIPXoafT8Pxh1HqANJN\r
+       tKK+7fDdmNw0ag8d1w+HT7U7LCU8ahMApql99zkSuKdQrwtK/VS3Sc116F6AtZLlrNM1\r
+       NaR0icdEqdMk2kQ08vWeptvv5OCmxN4aSXWXNO9Mi5blIY2JG8jIIBBGItdi79dsoDJE\r
+       IObw==\r
+Received: by 10.180.95.129 with SMTP id dk1mr1649820wib.3.1331836943775;\r
+       Thu, 15 Mar 2012 11:42:23 -0700 (PDT)\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
+ df3sm7082139wib.1.2012.03.15.11.42.22 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 15 Mar 2012 11:42:23 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/5] cli: move show to the new --exclude= option naming\r
+ scheme.\r
+Date: Thu, 15 Mar 2012 18:42:04 +0000\r
+Message-Id: <1331836925-31437-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1331836925-31437-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, 15 Mar 2012 18:42:27 -0000\r
+\r
+This moves show to the --exclude=(true|false|flag) naming\r
+scheme. When `exclude' is false or flag show returns all threads\r
+that match including those that only match in an excluded message, the\r
+difference being whether excluded messages are flagged excluded.\r
+\r
+When exclude=true the behaviour depends on whether --entire-threads\r
+is set. If it is not set then show only returns the messages which\r
+match and are not excluded. If it is set then show returns all\r
+messages in these threads flagging the excluded messages. The\r
+rationale is that it is awkward to use a thread with some missing\r
+messages.\r
+---\r
+ man/man1/notmuch-show.1 |   16 ++++++++++++++--\r
+ notmuch-client.h        |    1 +\r
+ notmuch-show.c          |   39 +++++++++++++++++++++++++++++----------\r
+ 3 files changed, 44 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+index d75d971..801b7f1 100644\r
+--- a/man/man1/notmuch-show.1\r
++++ b/man/man1/notmuch-show.1\r
+@@ -130,9 +130,21 @@ content.\r
+ \r
+ .RS 4\r
+ .TP 4\r
+-.B \-\-no-exclude\r
++.BR \-\-exclude=(true|false|flag)\r
++\r
++Specify whether to omit threads only matching search.tag_exclude from\r
++the search results (the default) or not. The extra option\r
++.B flag\r
++includes these messages but marks them with the excluded flag.\r
++\r
++If --entire-thread is specified then complete threads are returned\r
++regardless (with the excluded flag being set when appropriate) but\r
++threads that only match in an excluded message are not returned when\r
++.B --exclude=true.\r
++\r
++The default is\r
++.B --exclude=true.\r
+ \r
+-Do not exclude the messages matching search.exclude_tags in the config file.\r
+ .RE\r
+ \r
+ A common use of\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index f4a62cc..e36148b 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 omit_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..20d6635 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->omit_excluded)) || params->entire_thread) {\r
+           show_message (ctx, format, message, indent, params);\r
+           next_indent = indent + 1;\r
+ \r
+@@ -974,6 +976,12 @@ enum {\r
+     NOTMUCH_FORMAT_RAW\r
+ };\r
+ \r
++enum {\r
++    EXCLUDE_TRUE,\r
++    EXCLUDE_FALSE,\r
++    EXCLUDE_FLAG,\r
++};\r
++\r
+ int\r
+ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ {\r
+@@ -983,10 +991,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     char *query_string;\r
+     int opt_index, ret;\r
+     const notmuch_show_format_t *format = &format_text;\r
+-    notmuch_show_params_t params = { .part = -1 };\r
++    notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE };\r
+     int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+     notmuch_bool_t verify = FALSE;\r
+-    notmuch_bool_t no_exclude = FALSE;\r
++    int exclude = EXCLUDE_TRUE;\r
+ \r
+     notmuch_opt_desc_t options[] = {\r
+       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+@@ -995,11 +1003,15 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+                                 { "mbox", NOTMUCH_FORMAT_MBOX },\r
+                                 { "raw", NOTMUCH_FORMAT_RAW },\r
+                                 { 0, 0 } } },\r
++        { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',\r
++          (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
++                                  { "false", EXCLUDE_FALSE },\r
++                                  { "flag", EXCLUDE_FLAG },\r
++                                  { 0, 0 } } },\r
+       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\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
+@@ -1088,16 +1100,18 @@ 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
++      if (format == &format_mbox && exclude == EXCLUDE_FLAG) {\r
++          /* there is no where to mark flagged messages so fall back on\r
++           * including the excluded messages */\r
++          fprintf (stderr, "Cannot flag excluded messages with format=mbox: fall back on just including them\n");\r
++          exclude = EXCLUDE_FALSE;\r
++      }\r
++\r
++      if (exclude != EXCLUDE_FALSE) {\r
+           const char **search_exclude_tags;\r
+           size_t search_exclude_tags_length;\r
+           unsigned int i;\r
+@@ -1106,7 +1120,12 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\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 (exclude == EXCLUDE_FLAG) {\r
++              notmuch_query_set_omit_excluded_messages(query, FALSE);\r
++              params.omit_excluded = FALSE;\r
++          }\r
+       }\r
++\r
+       ret = do_show (ctx, query, format, &params);\r
+     }\r
+ \r
+-- \r
+1.7.9.1\r
+\r