[RFC PATCH v3 03/11] cli: add --thread= option to notmuch-show

diff --git a/32/007b55ca8482fdc26272c6b3f80a066b5b48e3 b/32/007b55ca8482fdc26272c6b3f80a066b5b48e3
new file mode 100644 (file)
index 0000000..298c6a2
--- /dev/null
+++ b/32/007b55ca8482fdc26272c6b3f80a066b5b48e3
@@ -0,0 +1,216 @@
+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 D78EA421174\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:22 -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 nYMRwCAY+fSo for <notmuch@notmuchmail.org>;\r
+       Sun, 12 Feb 2012 17:19:20 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 8AFF442117B\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:17 -0800 (PST)\r
+Received: by mail-wi0-f181.google.com with SMTP id hi8so3615406wib.26\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 17:19:17 -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=HqIfNrUBY9HvmgZu0a+lYX/9AKyAG6MVNdwQdgCOG2w=;\r
+       b=ZVdS31dPC/rZxihLvBXHKoO2r2KL0RDlE0pwZzBll6K+OAPllKR7qQGWxT5QnE3zMZ\r
+       PThzjO1R5SoP2upRgvD2Ww7WNs7jJqh5e0fjwj0plI+zrc4Z27W+pz3iAsipazhqzlnX\r
+       EZoNX9d3QT5h+UUeEf5Qg8/iM2arkfkHBsIPA=\r
+Received: by 10.216.132.94 with SMTP id n72mr5485613wei.4.1329095957266;\r
+       Sun, 12 Feb 2012 17:19:17 -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
+ dr5sm41857437wib.0.2012.02.12.17.19.15        (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 12 Feb 2012 17:19:16 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC PATCH v3 03/11] cli: add --thread= option to notmuch-show\r
+Date: Mon, 13 Feb 2012 01:20:07 +0000\r
+Message-Id: <1329096015-8078-4-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1329072579-27340-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: Mon, 13 Feb 2012 01:19:23 -0000\r
+\r
+The possible values are --thread=none|entire|match.\r
+\r
+`entire' is exactly the existing option --entire-thread.\r
+\r
+`match' is exactly the existing case when --entire-thread is not specified.\r
+\r
+`none' is a new option to return just the matching messages with no\r
+threading information at all.\r
+\r
+The `none' option is used by notmuch-pick.el to display an unthreaded\r
+message view (e.g., for an inbox). It is also useful for displaying a\r
+single message in the notmuch-pick view as show/emacs is much faster at\r
+showing a single message than the whole thread.\r
+\r
+The default remains as before: `match' in all cases except when\r
+--format=json is specified when `entire' is used.\r
+---\r
+ notmuch-client.h |    8 ++++++-\r
+ notmuch-show.c   |   60 +++++++++++++++++++++++++++++++++++++++++++++++++++--\r
+ 2 files changed, 64 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index 0da2d8d..b4dc7bf 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -97,8 +97,14 @@ typedef struct notmuch_show_format {\r
+     const char *message_set_end;\r
+ } notmuch_show_format_t;\r
+ \r
++enum {\r
++    NOTMUCH_SHOW_THREAD_MATCH,\r
++    NOTMUCH_SHOW_THREAD_ENTIRE,\r
++    NOTMUCH_SHOW_THREAD_NONE\r
++};\r
++\r
+ typedef struct notmuch_show_params {\r
+-    notmuch_bool_t entire_thread;\r
++    int entire_thread;\r
+     notmuch_bool_t raw;\r
+     int part;\r
+     int headers_only;\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 8f6e520..3f8618b 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -893,13 +893,56 @@ show_messages (void *ctx,\r
+                      notmuch_message_get_replies (message),\r
+                      next_indent,\r
+                      params);\r
++      notmuch_message_destroy (message);\r
++\r
++      fputs (format->message_set_end, stdout);\r
++    }\r
++\r
++    fputs (format->message_set_end, stdout);\r
++}\r
++\r
++static int\r
++do_show_messages (void *ctx,\r
++                notmuch_query_t *query,\r
++                const notmuch_show_format_t *format,\r
++                notmuch_show_params_t *params)\r
++{\r
++    notmuch_messages_t *messages;\r
++    notmuch_message_t *message;\r
++    int first_set = 1;\r
++\r
++    fputs (format->message_set_start, stdout);\r
++    messages = notmuch_query_search_messages (query);\r
++\r
++    for (;\r
++       notmuch_messages_valid (messages);\r
++       notmuch_messages_move_to_next (messages))\r
++    {\r
++      if (!first_set)\r
++          fputs (format->message_set_sep, stdout);\r
++      first_set = 0;\r
++\r
++      fputs (format->message_set_start, stdout);\r
++      fputs (format->message_set_start, stdout);\r
++\r
++      message = notmuch_messages_get (messages);\r
++      notmuch_message_set_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH, 1);\r
++      show_message (ctx, format, message, 0, params);\r
++\r
++      fputs (format->message_set_sep, stdout);\r
++\r
++      fputs (format->message_set_start, stdout);\r
++      fputs (format->message_set_end, stdout);\r
++\r
+ \r
+       notmuch_message_destroy (message);\r
+ \r
+       fputs (format->message_set_end, stdout);\r
++      fputs (format->message_set_end, stdout);\r
+     }\r
+ \r
+     fputs (format->message_set_end, stdout);\r
++    return 0;\r
+ }\r
+ \r
+ /* Formatted output of single message */\r
+@@ -1030,6 +1073,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     notmuch_query_t *query;\r
+     char *query_string;\r
+     int opt_index, ret;\r
++    int entire_thread = NOTMUCH_SHOW_THREAD_MATCH;\r
+     notmuch_sort_t sort = NOTMUCH_SORT_NEWEST_FIRST;\r
+     const notmuch_show_format_t *format = &format_text;\r
+     notmuch_show_params_t params = { .part = -1 };\r
+@@ -1049,7 +1093,11 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+                                 { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },\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_KEYWORD, &entire_thread, "thread", 't',\r
++        (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },\r
++                                { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },\r
++                                { "none", NOTMUCH_SHOW_THREAD_NONE },\r
++                                { 0, 0 } } },\r
+       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
+       { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },\r
+@@ -1062,6 +1110,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+       return 1;\r
+     }\r
+ \r
++    params.entire_thread = entire_thread;\r
+     params.headers_only = headers_only;\r
+ \r
+     if (format_sel == NOTMUCH_FORMAT_NOT_SPECIFIED) {\r
+@@ -1075,7 +1124,9 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     switch (format_sel) {\r
+     case NOTMUCH_FORMAT_JSON:\r
+       format = &format_json;\r
+-      params.entire_thread = TRUE;\r
++      /* This may not still be wanted */\r
++      if (params.entire_thread == NOTMUCH_SHOW_THREAD_MATCH)\r
++          params.entire_thread = NOTMUCH_SHOW_THREAD_ENTIRE;\r
+       break;\r
+     case NOTMUCH_FORMAT_TEXT:\r
+       format = &format_text;\r
+@@ -1147,7 +1198,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+     if (params.part >= 0)\r
+       ret = do_show_single (ctx, query, format, &params);\r
+     else\r
+-      ret = do_show (ctx, query, format, &params);\r
++      if (params.entire_thread == NOTMUCH_SHOW_THREAD_NONE)\r
++          ret = do_show_messages (ctx, query, format, &params);\r
++      else\r
++          ret = do_show (ctx, query, format, &params);\r
+ \r
+     notmuch_query_destroy (query);\r
+     notmuch_database_close (notmuch);\r
+-- \r
+1.7.2.3\r
+\r