--- /dev/null
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id B9F32431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 9 Mar 2013 06:57:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id k7YA-ZpecUEQ for <notmuch@notmuchmail.org>;\r
+ Sat, 9 Mar 2013 06:57:07 -0800 (PST)\r
+Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com\r
+ [209.85.217.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id B9E4F431FC3\r
+ for <notmuch@notmuchmail.org>; Sat, 9 Mar 2013 06:57:00 -0800 (PST)\r
+Received: by mail-lb0-f179.google.com with SMTP id j14so2082029lbo.38\r
+ for <notmuch@notmuchmail.org>; Sat, 09 Mar 2013 06:56:59 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+ :references:in-reply-to:references:x-gm-message-state;\r
+ bh=uNxZjcHFstTaa1S/Bche4AauVzm5p+WGaNwXt9pBcug=;\r
+ b=BeJDkl7BxTFCAzaUyPLOdby65ywprK5Qa0LPi30svDrjF/FSdvczYzHOszoPfKTnrj\r
+ HJVlFmkU622G+mfNR/vykV3Qf2p4zhAuL1LBbDZHKYEWIUPi2OH16hYNGqIOJIujXOJe\r
+ y4y/zL8YeFkjX6qw1xIRjIVlB+R88xEZwxVfSGQoxqy2HLb7g0hvAQPisdWZ08+a78Dc\r
+ FVE+7kplmpZEHKT2Kl7AjmZpJTsyYzkVCrMDw4mRquysFFp14y2ZtyYUgiP4lkTkMEM7\r
+ +x5cJIs/X3QnRMTUZq4EAkp9WAVP7vdTTAX5UWu6GiFDSmbxUh6EZ+mE6b0OkxOjdmfv\r
+ TO4g==\r
+X-Received: by 10.152.132.170 with SMTP id ov10mr5172922lab.21.1362841019268; \r
+ Sat, 09 Mar 2013 06:56:59 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-50df51-27.dhcp.inet.fi.\r
+ [80.223.81.27])\r
+ by mx.google.com with ESMTPS id v7sm2679351lbg.13.2013.03.09.06.56.57\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Sat, 09 Mar 2013 06:56:58 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/4] cli: add --remove-all option to "notmuch tag"\r
+Date: Sat, 9 Mar 2013 16:56:49 +0200\r
+Message-Id:\r
+ <ec4de1468e11b95d3627dd44ba4998333a76e3e6.1362840893.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <cover.1362840893.git.jani@nikula.org>\r
+References: <cover.1362840893.git.jani@nikula.org>\r
+In-Reply-To: <cover.1362840893.git.jani@nikula.org>\r
+References: <cover.1362840893.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQk/EzLPwkyOR5vgPlO393IR8hbqfrqasp+sxsRsZkeq6aoVRoQnqfM2akNKAD2Xd0TcDRWI\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 09 Mar 2013 14:57:11 -0000\r
+\r
+Add --remove-all option to "notmuch tag" to remove all tags from the\r
+messages matching query before applying the tag changes. This allows\r
+removal of all tags and unconditional setting of the tags of a\r
+message:\r
+\r
+$ notmuch tag --remove-all id:foo@example.com\r
+$ notmuch tag --remove-all +foo +bar id:foo@example.com\r
+\r
+without having to resort to the complicated (and still quoting\r
+broken):\r
+\r
+$ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') \\r
+ id:foo@example.com\r
+$ notmuch tag $(notmuch search --output=tags '*' | sed 's/^/-/') \\r
+ +foo +bar id:foo@example.com\r
+---\r
+ notmuch-tag.c | 28 ++++++++++++++++++++--------\r
+ 1 file changed, 20 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/notmuch-tag.c b/notmuch-tag.c\r
+index bc61aab..9a5d3e7 100644\r
+--- a/notmuch-tag.c\r
++++ b/notmuch-tag.c\r
+@@ -99,12 +99,15 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+ notmuch_message_t *message;\r
+ int ret = NOTMUCH_STATUS_SUCCESS;\r
+ \r
+- /* Optimize the query so it excludes messages that already have\r
+- * the specified set of tags. */\r
+- query_string = _optimize_tag_query (ctx, query_string, tag_ops);\r
+- if (query_string == NULL) {\r
+- fprintf (stderr, "Out of memory.\n");\r
+- return 1;\r
++ if (! (flags & TAG_FLAG_REMOVE_ALL)) {\r
++ /* Optimize the query so it excludes messages that already\r
++ * have the specified set of tags. */\r
++ query_string = _optimize_tag_query (ctx, query_string, tag_ops);\r
++ if (query_string == NULL) {\r
++ fprintf (stderr, "Out of memory.\n");\r
++ return 1;\r
++ }\r
++ flags |= TAG_FLAG_PRE_OPTIMIZED;\r
+ }\r
+ \r
+ query = notmuch_query_create (notmuch, query_string);\r
+@@ -120,7 +123,7 @@ tag_query (void *ctx, notmuch_database_t *notmuch, const char *query_string,\r
+ notmuch_messages_valid (messages) && ! interrupted;\r
+ notmuch_messages_move_to_next (messages)) {\r
+ message = notmuch_messages_get (messages);\r
+- ret = tag_op_list_apply (message, tag_ops, flags | TAG_FLAG_PRE_OPTIMIZED);\r
++ ret = tag_op_list_apply (message, tag_ops, flags);\r
+ notmuch_message_destroy (message);\r
+ if (ret != NOTMUCH_STATUS_SUCCESS)\r
+ break;\r
+@@ -186,6 +189,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ struct sigaction action;\r
+ tag_op_flag_t tag_flags = TAG_FLAG_NONE;\r
+ notmuch_bool_t batch = FALSE;\r
++ notmuch_bool_t remove_all = FALSE;\r
+ FILE *input = stdin;\r
+ char *input_file_name = NULL;\r
+ int opt_index;\r
+@@ -201,6 +205,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ notmuch_opt_desc_t options[] = {\r
+ { NOTMUCH_OPT_BOOLEAN, &batch, "batch", 0, 0 },\r
+ { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 },\r
++ { NOTMUCH_OPT_BOOLEAN, &remove_all, "remove-all", 0, 0 },\r
+ { 0, 0, 0, 0, 0 }\r
+ };\r
+ \r
+@@ -223,6 +228,10 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ fprintf (stderr, "Can't specify both cmdline and stdin!\n");\r
+ return 1;\r
+ }\r
++ if (remove_all) {\r
++ fprintf (stderr, "Can't specify both --remove-all and --batch\n");\r
++ return 1;\r
++ }\r
+ } else {\r
+ tag_ops = tag_op_list_create (config);\r
+ if (tag_ops == NULL) {\r
+@@ -234,7 +243,7 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ &query_string, tag_ops))\r
+ return 1;\r
+ \r
+- if (tag_op_list_size (tag_ops) == 0) {\r
++ if (tag_op_list_size (tag_ops) == 0 && ! remove_all) {\r
+ fprintf (stderr, "Error: 'notmuch tag' requires at least one tag to add or remove.\n");\r
+ return 1;\r
+ }\r
+@@ -247,6 +256,9 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[])\r
+ if (notmuch_config_get_maildir_synchronize_flags (config))\r
+ tag_flags |= TAG_FLAG_MAILDIR_SYNC;\r
+ \r
++ if (remove_all)\r
++ tag_flags |= TAG_FLAG_REMOVE_ALL;\r
++\r
+ if (batch)\r
+ ret = tag_file (config, notmuch, tag_flags, input);\r
+ else\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff