[PATCH 1/5] config: disable addition of exclude tags for 0.12

diff --git a/1c/0b5433469a06e2a484345fbfdf32c381728927 b/1c/0b5433469a06e2a484345fbfdf32c381728927
new file mode 100644 (file)
index 0000000..5df155b
--- /dev/null
+++ b/1c/0b5433469a06e2a484345fbfdf32c381728927
@@ -0,0 +1,129 @@
+Return-Path: <markwalters1009@gmail.com>\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 7D328429E36\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:40 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 XGL4co1JSzsg for <notmuch@notmuchmail.org>;\r
+       Wed, 29 Feb 2012 10:11:39 -0800 (PST)\r
+Received: from mail-wi0-f181.google.com (mail-wi0-f181.google.com\r
+       [209.85.212.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id C309A429E38\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:35 -0800 (PST)\r
+Received: by wibhi8 with SMTP id hi8so5092473wib.26\r
+       for <notmuch@notmuchmail.org>; Wed, 29 Feb 2012 10:11:34 -0800 (PST)\r
+Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates\r
+       10.180.24.4 as permitted sender) client-ip=10.180.24.4; \r
+Authentication-Results: mr.google.com; spf=pass (google.com: domain of\r
+       markwalters1009@gmail.com designates 10.180.24.4 as permitted\r
+       sender) smtp.mail=markwalters1009@gmail.com;\r
+       dkim=pass header.i=markwalters1009@gmail.com\r
+Received: from mr.google.com ([10.180.24.4])\r
+       by 10.180.24.4 with SMTP id q4mr19745280wif.7.1330539094628 (num_hops =\r
+       1); Wed, 29 Feb 2012 10:11:34 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=cs8MWJJZy1T551FVMtQqMyYELOjVW6zOCYEVCAVNI24=;\r
+       b=knf9pbTHYzJW5XiV6dAP+9HQdjBFNMM9SiFQVVUtNok2Us8dSVx2CryGurJVBpxunt\r
+       3MfQmYM9QdowYXEJ04KpKOLgW+n1Sb0cSZatVtoN1xpilXMpZpAJMqwpLH7I76wvU4sx\r
+       Gw1qzUf2URRKLsxRDwyoLQ0h37r6NWQKtS+sA=\r
+Received: by 10.180.24.4 with SMTP id q4mr15747463wif.7.1330539094585;\r
+       Wed, 29 Feb 2012 10:11:34 -0800 (PST)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ s4sm83121717wiy.5.2012.02.29.10.11.33 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Wed, 29 Feb 2012 10:11:33 -0800 (PST)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/5] config: disable addition of exclude tags for 0.12\r
+Date: Wed, 29 Feb 2012 18:13:05 +0000\r
+Message-Id: <1330539189-16593-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.2.3\r
+In-Reply-To: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com>\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: Wed, 29 Feb 2012 18:11:41 -0000\r
+\r
+This disables the addition of search_exclude_tags in notmuch-setup and\r
+notmuch-config.\r
+---\r
+ notmuch-config.c |    3 +--\r
+ notmuch-setup.c  |   19 +------------------\r
+ 2 files changed, 2 insertions(+), 20 deletions(-)\r
+\r
+diff --git a/notmuch-config.c b/notmuch-config.c\r
+index e9b2750..61fda3e 100644\r
+--- a/notmuch-config.c\r
++++ b/notmuch-config.c\r
+@@ -377,8 +377,7 @@ notmuch_config_open (void *ctx,\r
+ \r
+     if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) {\r
+       if (is_new) {\r
+-          const char *tags[] = { "deleted", "spam" };\r
+-          notmuch_config_set_search_exclude_tags (config, tags, 2);\r
++          /* We do not set default search_exclude_tags for 0.12 */\r
+       } else {\r
+           notmuch_config_set_search_exclude_tags (config, NULL, 0);\r
+       }\r
+diff --git a/notmuch-setup.c b/notmuch-setup.c\r
+index 94d0aa7..307231d 100644\r
+--- a/notmuch-setup.c\r
++++ b/notmuch-setup.c\r
+@@ -133,8 +133,6 @@ notmuch_setup_command (unused (void *ctx),\r
+     int is_new;\r
+     const char **new_tags;\r
+     size_t new_tags_len;\r
+-    const char **search_exclude_tags;\r
+-    size_t search_exclude_tags_len;\r
+ \r
+ #define prompt(format, ...)                                   \\r
+     do {                                                      \\r
+@@ -211,22 +209,7 @@ notmuch_setup_command (unused (void *ctx),\r
+     }\r
+ \r
+ \r
+-    search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len);\r
+-\r
+-    printf ("Tags to exclude when searching messages (separated by spaces) [");\r
+-    print_tag_list (search_exclude_tags, search_exclude_tags_len);\r
+-    prompt ("]: ");\r
+-\r
+-    if (strlen (response)) {\r
+-      GPtrArray *tags = parse_tag_list (ctx, response);\r
+-\r
+-      notmuch_config_set_search_exclude_tags (config,\r
+-                                              (const char **) tags->pdata,\r
+-                                              tags->len);\r
+-\r
+-      g_ptr_array_free (tags, TRUE);\r
+-    }\r
+-\r
++    /* Temporarily remove exclude tag support for 0.12 */\r
+ \r
+     if (! notmuch_config_save (config)) {\r
+       if (is_new)\r
+-- \r
+1.7.2.3\r
+\r