[PATCH] notmuch-new: Option to disable tags from the configuration file.

[Jan Janak <jan@ryngle.com>]

This patch slightly changes behavior of the command line option --tag.
Any tags specified by the user on the command line will be added
*in addition* to tags configured in the configuration file.

This behavior can be changed with the new command line option
--no-config-tags. The user can use this option to ignore any tags from
the configuration file (i.e. only tags specified on the command line
will be applied).

With this new option the user can configure 'notmuch new' not to apply
any tags (and that was not possible before):

  notmuch new --no-config-tags

Suggested by Karl Wiberg.

Signed-off-by: Jan Janak <jan@ryngle.com>
---
 notmuch-new.c |   19 +++++++++++--------
 notmuch.c     |   11 ++++++++++-
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index 94036da..e988bf1 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -28,6 +28,7 @@ static notmuch_config_t *config = NULL;
 
 static char **cmdline_tags = NULL;
 static unsigned int cmdline_tags_count = 0;
+static int add_config_tags = 1;
 
 static void
 handle_sigalrm (unused (int signal))
@@ -79,19 +80,19 @@ apply_tags (notmuch_message_t *message)
     char** tags;
     unsigned int count, i;
 
+    if (add_config_tags) {
+	tags = notmuch_config_get_new_tags (config, &count);
+	for (i = 0; tags && (i < count); i++) {
+	    if (tags[i])
+		notmuch_message_add_tag (message, tags[i]);
+	}
+    }
+
     if (cmdline_tags_count) {
 	for (i = 0; i < cmdline_tags_count; i++) {
 	    if (cmdline_tags[i])
 		notmuch_message_add_tag (message, cmdline_tags[i]);
 	}
-    } else {
-	if ((tags = notmuch_config_get_new_tags (config, &count)) == NULL)
-	    return;
-
-	for (i = 0; i < count; i++) {
-	    if (tags[i])
-		notmuch_message_add_tag (message, tags[i]);
-	}
     }
 }
 
@@ -451,6 +452,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	    }
 	    tmp[cmdline_tags_count++] = opt;
 	    cmdline_tags = tmp;
+	} else if (STRNCMP_LITERAL (argv[i], "--no-config-tags") == 0) {
+	    add_config_tags = 0;
 	} else {
 	    fprintf (stderr, "Unrecognized option: %s\n", argv[i]);
 	    return 1;
diff --git a/notmuch.c b/notmuch.c
index 1bd3265..ff8d5bb 100644
--- a/notmuch.c
+++ b/notmuch.c
@@ -149,7 +149,16 @@ command_t commands[] = {
       "\n"
       "\t\t\tAdd the tag <name> to all messages newly added to the\n"
       "\t\t\tdatabase. You may repeat this option several times if\n"
-      "\t\t\tyou want to add more tags.\n"
+      "\t\t\tyou want to add more tags. Any tags configured in the\n"
+      "\t\t\tconfiguration file will still be added, unless you also\n"
+      "\t\t\tuse the option --no-config-tags.\n"
+      "\n"
+      "\t\t--no-config-tags\n"
+      "\n"
+      "\t\t\tDo not add tags configured in the configuration file.\n"
+      "\t\t\tUse this option if you only want to add tags specified\n"
+      "\t\t\ton the command line with --tag or if do not want to add\n"
+      "\t\t\tany tags at all.\n"
       "\n"
       "\t\tNote: \"notmuch new\" runs (other than the first run) will\n"
       "\t\tskip any read-only directories, so you can use that to mark\n"
-- 
1.6.3.3