From: Mark Walters Date: Wed, 29 Feb 2012 18:13:08 +0000 (+0000) Subject: [PATCH 4/5] cli: temporarily remove exclude tag support for 0.12 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=c39d614fb9badeb363ab0166c90458a60fb791a7;p=notmuch-archives.git [PATCH 4/5] cli: temporarily remove exclude tag support for 0.12 --- diff --git a/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1 b/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1 new file mode 100644 index 000000000..174c51f87 --- /dev/null +++ b/3b/6e02ca8ecad18f8bfdd11dda6be7ef5b62a3d1 @@ -0,0 +1,128 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0A4EA429E4F + for ; Wed, 29 Feb 2012 10:11:44 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0.201 +X-Spam-Level: +X-Spam-Status: No, score=0.201 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id HngYUhcPH4i1 for ; + Wed, 29 Feb 2012 10:11:43 -0800 (PST) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 244EF429E38 + for ; Wed, 29 Feb 2012 10:11:43 -0800 (PST) +Received: by werm13 with SMTP id m13so2259352wer.26 + for ; Wed, 29 Feb 2012 10:11:41 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.83.97 as permitted sender) client-ip=10.180.83.97; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.83.97 as permitted + sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.83.97]) + by 10.180.83.97 with SMTP id p1mr3064624wiy.19.1330539101996 (num_hops + = 1); Wed, 29 Feb 2012 10:11:41 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; + bh=gXvvTQoOszPgLEG5Ws2kbqJ7A9hg6wpzZej+xW6lea8=; + b=GiklfzzpcWQsupQpxzTxntqwBcfO478r7EFt3gnptu3/TYVZcX612IS1TBP+mqz3yK + NZIc27fVLP6ltahBYw2e75UONR7KtCPGp2q1SSAx8Yep6bdHjn953289xf6TPI+4qWxb + u2avDrVRJYqgEIQqbYt+1eWottOuvKfEqP2WQ= +Received: by 10.180.83.97 with SMTP id p1mr2462073wiy.19.1330539101954; + Wed, 29 Feb 2012 10:11:41 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + k6sm21812649wiy.7.2012.02.29.10.11.40 (version=TLSv1/SSLv3 cipher=OTHER); + Wed, 29 Feb 2012 10:11:41 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 4/5] cli: temporarily remove exclude tag support for 0.12 +Date: Wed, 29 Feb 2012 18:13:08 +0000 +Message-Id: <1330539189-16593-5-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com> +References: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +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: Wed, 29 Feb 2012 18:11:44 -0000 + +--- + notmuch-count.c | 8 +------- + notmuch-search.c | 8 +------- + 2 files changed, 2 insertions(+), 14 deletions(-) + +diff --git a/notmuch-count.c b/notmuch-count.c +index 63459fb..f86cb40 100644 +--- a/notmuch-count.c ++++ b/notmuch-count.c +@@ -35,9 +35,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + char *query_str; + int opt_index; + int output = OUTPUT_MESSAGES; +- const char **search_exclude_tags; +- size_t search_exclude_tags_length; +- unsigned int i; + + notmuch_opt_desc_t options[] = { + { NOTMUCH_OPT_KEYWORD, &output, "output", 'o', +@@ -78,10 +75,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) + return 1; + } + +- search_exclude_tags = notmuch_config_get_search_exclude_tags +- (config, &search_exclude_tags_length); +- for (i = 0; i < search_exclude_tags_length; i++) +- notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); ++ /* Temporarily remove exclude tag support for 0.12 */ + + switch (output) { + case OUTPUT_MESSAGES: +diff --git a/notmuch-search.c b/notmuch-search.c +index 92ce38a..96892b3 100644 +--- a/notmuch-search.c ++++ b/notmuch-search.c +@@ -426,9 +426,6 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + output_t output = OUTPUT_SUMMARY; + int offset = 0; + int limit = -1; /* unlimited */ +- const char **search_exclude_tags; +- size_t search_exclude_tags_length; +- unsigned int i; + + enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } + format_sel = NOTMUCH_FORMAT_TEXT; +@@ -496,10 +493,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) + + notmuch_query_set_sort (query, sort); + +- search_exclude_tags = notmuch_config_get_search_exclude_tags +- (config, &search_exclude_tags_length); +- for (i = 0; i < search_exclude_tags_length; i++) +- notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); ++ /* Temporarily remove exclude tag support for 0.12 */ + + switch (output) { + default: +-- +1.7.2.3 +