The only non-trivial part is switching the talloc context for query_string_from args from 'config' to 'notmuch'. --- notmuch-reindex.c | 9 ++------- notmuch.c | 2 +- test/T700-reindex.sh | 10 ++++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/notmuch-reindex.c b/notmuch-reindex.c index 9d337c48..fa84d4fc 100644 --- a/notmuch-reindex.c +++ b/notmuch-reindex.c @@ -83,10 +83,9 @@ reindex_query (notmuch_database_t *notmuch, const char *query_string, } int -notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *notmuch), int argc, char *argv[]) +notmuch_reindex_command (unused(notmuch_config_t *config), notmuch_database_t *notmuch, int argc, char *argv[]) { char *query_string = NULL; - notmuch_database_t *notmuch; struct sigaction action; int opt_index; int ret; @@ -111,10 +110,6 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no notmuch_process_shared_options (argv[0]); - if (notmuch_database_open (notmuch_config_get_database_path (config), - NOTMUCH_DATABASE_MODE_READ_WRITE, ¬much)) - return EXIT_FAILURE; - notmuch_exit_if_unmatched_db_uuid (notmuch); status = notmuch_process_shared_indexing_options (notmuch); @@ -124,7 +119,7 @@ notmuch_reindex_command (notmuch_config_t *config, unused(notmuch_database_t *no return EXIT_FAILURE; } - query_string = query_string_from_args (config, argc - opt_index, argv + opt_index); + query_string = query_string_from_args (notmuch, argc - opt_index, argv + opt_index); if (query_string == NULL) { fprintf (stderr, "Out of memory\n"); return EXIT_FAILURE; diff --git a/notmuch.c b/notmuch.c index 8e697396..82d68681 100644 --- a/notmuch.c +++ b/notmuch.c @@ -165,7 +165,7 @@ static command_t commands[] = { "Restore the tags from the given dump file (see 'dump')." }, { "compact", notmuch_compact_command, NOTMUCH_COMMAND_CONFIG_OPEN, "Compact the notmuch database." }, - { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_CONFIG_OPEN, + { "reindex", notmuch_reindex_command, NOTMUCH_COMMAND_DATABASE_EARLY | NOTMUCH_COMMAND_DATABASE_WRITE, "Re-index all messages matching the search terms." }, { "config", notmuch_config_command, NOTMUCH_COMMAND_CONFIG_OPEN, "Get or set settings in the notmuch configuration file." }, diff --git a/test/T700-reindex.sh b/test/T700-reindex.sh index 3d7c930d..67ee8452 100755 --- a/test/T700-reindex.sh +++ b/test/T700-reindex.sh @@ -75,6 +75,16 @@ notmuch reindex '*' notmuch dump | grep '^#=' | sort > OUTPUT test_expect_equal_file prop-dump OUTPUT +test_begin_subtest "reindex with saved query from config file" +query_name="test${RANDOM}" +count1=$(notmuch count --lastmod '*' | cut -f3) +cp notmuch-config old-config +printf "\n[query]\n${query_name} = tag:inbox\n" >> notmuch-config +notmuch reindex query:$query_name +count2=$(notmuch count --lastmod '*' | cut -f3) +cp old-config notmuch-config +test_expect_success "test '$count2 -gt $count1'" + add_email_corpus lkml test_begin_subtest "reindex of lkml corpus preserves threads" -- 2.29.2 _______________________________________________ notmuch mailing list -- notmuch@notmuchmail.org To unsubscribe send an email to notmuch-leave@notmuchmail.org