cli: use the negating boolean support for new and insert --no-hooks

This lets us use the positive hooks variable in code, increasing
clarity.

diff --git a/notmuch-insert.c b/notmuch-insert.c
index bb835ba97517eef910406cabf0421e2a394ff574..48490b51deb26c315bae42b9a7591c828d7c45a7 100644 (file)
--- a/notmuch-insert.c
+++ b/notmuch-insert.c
@@ -456,7 +456,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
     const char *folder = "";
     bool create_folder = false;
     bool keep = false;
-    bool no_hooks = false;
+    bool hooks = true;
     bool synchronize_flags;
     char *maildir;
     char *newpath;
@@ -467,7 +467,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
        { .opt_string = &folder, .name = "folder", .allow_empty = true },
        { .opt_bool = &create_folder, .name = "create-folder" },
        { .opt_bool = &keep, .name = "keep" },
-       { .opt_bool =  &no_hooks, .name = "no-hooks" },
+       { .opt_bool =  &hooks, .name = "hooks" },
        { .opt_inherit = notmuch_shared_indexing_options },
        { .opt_inherit = notmuch_shared_options },
        { }
@@ -581,7 +581,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])
        }
     }
 
-    if (! no_hooks && status == NOTMUCH_STATUS_SUCCESS) {
+    if (hooks && status == NOTMUCH_STATUS_SUCCESS) {
        /* Ignore hook failures. */
        notmuch_run_hook (db_path, "post-insert");
     }

diff --git a/notmuch-new.c b/notmuch-new.c
index fb021b18c4a29cea7a75e9256c5bda4999f80403..b0a91b0e73157cc89a360662fcf26038fa2958e5 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -954,7 +954,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
     int opt_index;
     unsigned int i;
     bool timer_is_active = false;
-    bool no_hooks = false;
+    bool hooks = true;
     bool quiet = false, verbose = false;
     notmuch_status_t status;
 
@@ -962,7 +962,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
        { .opt_bool = &quiet, .name = "quiet" },
        { .opt_bool = &verbose, .name = "verbose" },
        { .opt_bool = &add_files_state.debug, .name = "debug" },
-       { .opt_bool = &no_hooks, .name = "no-hooks" },
+       { .opt_bool = &hooks, .name = "hooks" },
        { .opt_inherit = notmuch_shared_indexing_options },
        { .opt_inherit = notmuch_shared_options },
        { }
@@ -996,7 +996,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
        }
     }
 
-    if (!no_hooks) {
+    if (hooks) {
        ret = notmuch_run_hook (db_path, "pre-new");
        if (ret)
            return EXIT_FAILURE;
@@ -1168,7 +1168,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[])
 
     notmuch_database_destroy (notmuch);
 
-    if (!no_hooks && !ret && !interrupted)
+    if (hooks && !ret && !interrupted)
        ret = notmuch_run_hook (db_path, "post-new");
 
     if (ret || interrupted)