Add --remove-all option to "notmuch tag" to remove all tags from the
messages matching query before applying the tag changes. This allows
removal of all tags and unconditional setting of the tags of a
message:
$ notmuch tag --remove-all id:foo@example.com
$ notmuch tag --remove-all +foo +bar id:foo@example.com
without having to resort to the complicated (and still quoting
broken):
$ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') \
id:foo@example.com
$ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') \
+foo +bar id:foo@example.com
notmuch_message_t *message;
int ret = NOTMUCH_STATUS_SUCCESS;
notmuch_message_t *message;
int ret = NOTMUCH_STATUS_SUCCESS;
- /* Optimize the query so it excludes messages that already have
- * the specified set of tags. */
- query_string = _optimize_tag_query (ctx, query_string, tag_ops);
- if (query_string == NULL) {
- fprintf (stderr, "Out of memory.\n");
- return 1;
+ if (! (flags & TAG_FLAG_REMOVE_ALL)) {
+ /* Optimize the query so it excludes messages that already
+ * have the specified set of tags. */
+ query_string = _optimize_tag_query (ctx, query_string, tag_ops);
+ if (query_string == NULL) {
+ fprintf (stderr, "Out of memory.\n");
+ return 1;
+ }
+ flags |= TAG_FLAG_PRE_OPTIMIZED;
}
query = notmuch_query_create (notmuch, query_string);
}
query = notmuch_query_create (notmuch, query_string);
notmuch_messages_valid (messages) && ! interrupted;
notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages);
notmuch_messages_valid (messages) && ! interrupted;
notmuch_messages_move_to_next (messages)) {
message = notmuch_messages_get (messages);
- ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);
+ ret = tag_op_list_apply (message, tag_ops, flags);
notmuch_message_destroy (message);
if (ret != NOTMUCH_STATUS_SUCCESS)
break;
notmuch_message_destroy (message);
if (ret != NOTMUCH_STATUS_SUCCESS)
break;
struct sigaction action;
tag_op_flag_t tag_flags = TAG_FLAG_NONE;
notmuch_bool_t batch = FALSE;
struct sigaction action;
tag_op_flag_t tag_flags = TAG_FLAG_NONE;
notmuch_bool_t batch = FALSE;
+ notmuch_bool_t remove_all = FALSE;
FILE *input = stdin;
char *input_file_name = NULL;
int opt_index;
FILE *input = stdin;
char *input_file_name = NULL;
int opt_index;
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
{ NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },
{ NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },
+ { NOTMUCH_OPT_BOOLEAN, &remove_all, "remove-all", 0, 0 },
fprintf (stderr, "Can't specify both cmdline and stdin!\n");
return 1;
}
fprintf (stderr, "Can't specify both cmdline and stdin!\n");
return 1;
}
+ if (remove_all) {
+ fprintf (stderr, "Can't specify both --remove-all and --batch\n");
+ return 1;
+ }
} else {
tag_ops = tag_op_list_create (config);
if (tag_ops == NULL) {
} else {
tag_ops = tag_op_list_create (config);
if (tag_ops == NULL) {
&query_string, tag_ops))
return 1;
&query_string, tag_ops))
return 1;
- if (tag_op_list_size (tag_ops) == 0) {
+ if (tag_op_list_size (tag_ops) == 0 && ! remove_all) {
fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
return 1;
}
fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");
return 1;
}
if (notmuch_config_get_maildir_synchronize_flags (config))
tag_flags |= TAG_FLAG_MAILDIR_SYNC;
if (notmuch_config_get_maildir_synchronize_flags (config))
tag_flags |= TAG_FLAG_MAILDIR_SYNC;
+ if (remove_all)
+ tag_flags |= TAG_FLAG_REMOVE_ALL;
+
if (batch)
ret = tag_file (config, notmuch, tag_flags, input);
else
if (batch)
ret = tag_file (config, notmuch, tag_flags, input);
else