From adb96e939aaf24f38e2b19fffc83bf86c4973776 Mon Sep 17 00:00:00 2001 From: Daniel Schoepe Date: Tue, 11 Aug 2015 09:46:37 +0200 Subject: [PATCH] [PATCH 1/2] cli: Allow combining --remove-all and --batch --- b9/c8d5665075ceac43f8abfa51f048d650fac3c0 | 97 +++++++++++++++++++++++ 1 file changed, 97 insertions(+) create mode 100644 b9/c8d5665075ceac43f8abfa51f048d650fac3c0 diff --git a/b9/c8d5665075ceac43f8abfa51f048d650fac3c0 b/b9/c8d5665075ceac43f8abfa51f048d650fac3c0 new file mode 100644 index 000000000..75a2e5a07 --- /dev/null +++ b/b9/c8d5665075ceac43f8abfa51f048d650fac3c0 @@ -0,0 +1,97 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id D47BD6DE1532 + for ; Tue, 11 Aug 2015 00:47:18 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: -0.11 +X-Spam-Level: +X-Spam-Status: No, score=-0.11 tagged_above=-999 required=5 tests=[AWL=0.097, + DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, + RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SORBS_WEB=0.614, SPF_PASS=-0.001] + autolearn=disabled +Received: from arlo.cworth.org ([127.0.0.1]) + by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id ZLRaRCWwV2x6 for ; + Tue, 11 Aug 2015 00:47:17 -0700 (PDT) +Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com + [209.85.212.171]) + by arlo.cworth.org (Postfix) with ESMTPS id E53906DE099D + for ; Tue, 11 Aug 2015 00:47:16 -0700 (PDT) +Received: by wicja10 with SMTP id ja10so57046861wic.1 + for ; Tue, 11 Aug 2015 00:47:15 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=schoepe.org; s=google; + h=from:to:cc:subject:date:message-id:in-reply-to:references; + bh=5hFWSeWKuVV4UReuueFD0cc1VUuDYQL/TTIaJR/NfDw=; + b=Iw/aeTE2VuNzF3kuuBFK/v5F/+cNaYiuqiZ3eDhvXjUZ3I8Xxiq869N7JyOY0Acq/+ + NcevUsORGexLEkPQ4JpPDp5+hxM6/MwO/N8Xlpx5jPy56OVE/oFsQL9YyP7d44LHElmm + GcGtcxG0ObBBjaXFtyEygyFtr6RWDDD7K8czs= +X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; + d=1e100.net; s=20130820; + h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to + :references; + bh=5hFWSeWKuVV4UReuueFD0cc1VUuDYQL/TTIaJR/NfDw=; + b=WICAWgxpYlyIzgCf0XfkbhH/j1YBxiiqH7/W5+LWbIP1CMgRxwWKyXGsN2iqwgx4P3 + 5ub9/hEzjlyWsELduptda7A0VDJySVlLs503YNj9TfhKH9JI57hDzd8JwVPdtfrTQ9gR + qXqY+BlE8kUMQHwmrlnRCSkLvLFkWFNp2BtaKG+Du6HX3slq+0WYeIw93W3/nWrf1wHl + 8yKrJFsF2JXvIbdcLFAeaZqs3ODQYwXXi5ggVcjYJGynBuyNQinbdjdDtpZR2IvToTCr + IAgRQLfwrGnkygHM3RIhSlyznx7NoCqZBSE6Nbf7bJ0P0gSv60p99Q4QgG43dx4hur6e + 1DxA== +X-Gm-Message-State: + ALoCoQmXGdd/9BjxBvlaqfDoCT75n7eiG4Zw2A5Kng5KHIiTcZC59VuSXpUpuIM81Dik2B6eWujI +X-Received: by 10.180.76.232 with SMTP id n8mr34396821wiw.72.1439279234951; + Tue, 11 Aug 2015 00:47:14 -0700 (PDT) +Received: from localhost (ip-80-226-24-7.vodafone-net.de. [80.226.24.7]) + by smtp.gmail.com with ESMTPSA id d17sm1667889wjs.32.2015.08.11.00.47.13 + (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); + Tue, 11 Aug 2015 00:47:13 -0700 (PDT) +From: Daniel Schoepe +To: notmuch@notmuchmail.org +Subject: [PATCH 1/2] cli: Allow combining --remove-all and --batch +Date: Tue, 11 Aug 2015 09:46:37 +0200 +Message-Id: <1439279198-21330-2-git-send-email-daniel@schoepe.org> +X-Mailer: git-send-email 2.5.0 +In-Reply-To: <1439279198-21330-1-git-send-email-daniel@schoepe.org> +References: <1439279198-21330-1-git-send-email-daniel@schoepe.org> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.18 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Tue, 11 Aug 2015 07:47:18 -0000 + +This patch removes the restriction on notmuch-tag that disallows using +both --remove-all and --batch. Combining the two options removes tags +on all messages affected by each query before applying the new tags. +--- + notmuch-tag.c | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/notmuch-tag.c b/notmuch-tag.c +index 38d99aa..f1df986 100644 +--- a/notmuch-tag.c ++++ b/notmuch-tag.c +@@ -231,10 +231,6 @@ notmuch_tag_command (notmuch_config_t *config, int argc, char *argv[]) + fprintf (stderr, "Can't specify both cmdline and stdin!\n"); + return EXIT_FAILURE; + } +- if (remove_all) { +- fprintf (stderr, "Can't specify both --remove-all and --batch\n"); +- return EXIT_FAILURE; +- } + } else { + tag_ops = tag_op_list_create (config); + if (tag_ops == NULL) { +-- +2.5.0 + -- 2.26.2