diff options
| -rw-r--r-- | notmuch-show.c | 48 | ||||
| -rw-r--r-- | notmuch.c | 8 |
2 files changed, 45 insertions, 11 deletions
diff --git a/notmuch-show.c b/notmuch-show.c index 13c91e4..60339d0 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -212,6 +212,24 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) notmuch_thread_t *thread; notmuch_messages_t *messages; char *query_string; + int entire_thread = 0; + int i; + + for (i = 0; i < argc && argv[i][0] == '-'; i++) { + if (strcmp (argv[i], "--") == 0) { + i++; + break; + } + if (strcmp(argv[i], "--entire-thread") == 0) { + entire_thread = 1; + } else { + fprintf (stderr, "Unrecognized option: %s\n", argv[i]); + return 1; + } + } + + argc -= i; + argv += i; config = notmuch_config_open (ctx, NULL, NULL); if (config == NULL) @@ -239,21 +257,29 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } - for (threads = notmuch_query_search_threads (query); - notmuch_threads_has_more (threads); - notmuch_threads_advance (threads)) - { - thread = notmuch_threads_get (threads); + if (!entire_thread) { + messages = notmuch_query_search_messages (query); + if (messages == NULL) + INTERNAL_ERROR ("No messages.\n"); + show_messages (ctx, messages, 0); - messages = notmuch_thread_get_toplevel_messages (thread); + } else { + for (threads = notmuch_query_search_threads (query); + notmuch_threads_has_more (threads); + notmuch_threads_advance (threads)) + { + thread = notmuch_threads_get (threads); - if (messages == NULL) - INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", - notmuch_thread_get_thread_id (thread)); + messages = notmuch_thread_get_toplevel_messages (thread); - show_messages (ctx, messages, 0); + if (messages == NULL) + INTERNAL_ERROR ("Thread %s has no toplevel messages.\n", + notmuch_thread_get_thread_id (thread)); + + show_messages (ctx, messages, 0); - notmuch_thread_destroy (thread); + notmuch_thread_destroy (thread); + } } notmuch_query_destroy (query); @@ -177,6 +177,14 @@ command_t commands[] = { "\t\t(all replies to a particular message appear immediately\n" "\t\tafter that message in date order).\n" "\n" + "\t\tSupported options for show include:\n" + "\n" + "\t\t--entire-thread\n" + "\n" + "\t\t\tBy default only messages strictly matching the\n" + "\t\t\tsearch expression will be displayed. With this\n" + "\t\t\toption all messages in matching threads are shown.\n" + "\n" "\t\tThe output format is plain-text, with all text-content\n" "\t\tMIME parts decoded. Various components in the output,\n" "\t\t('message', 'header', 'body', 'attachment', and MIME 'part')\n" |