From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by olra.theworths.org (Postfix) with ESMTP id F002D431E64 for ; Wed, 29 Feb 2012 10:11:33 -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 DQcyOeTQbvyk for ; Wed, 29 Feb 2012 10:11:33 -0800 (PST) Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id 50578431FD6 for ; Wed, 29 Feb 2012 10:11:33 -0800 (PST) Received: by wgbdt14 with SMTP id dt14so2810749wgb.2 for ; Wed, 29 Feb 2012 10:11:32 -0800 (PST) Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates 10.180.80.40 as permitted sender) client-ip=10.180.80.40; Authentication-Results: mr.google.com; spf=pass (google.com: domain of markwalters1009@gmail.com designates 10.180.80.40 as permitted sender) smtp.mail=markwalters1009@gmail.com; dkim=pass header.i=markwalters1009@gmail.com Received: from mr.google.com ([10.180.80.40]) by 10.180.80.40 with SMTP id o8mr3149390wix.10.1330539092203 (num_hops = 1); Wed, 29 Feb 2012 10:11:32 -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; bh=w+zgK/+VlrzOnfSXHwtR9P9iF+owmMb9bGmKPl8Ekzk=; b=iNhKY8qaEPuYrwCkZASA/t9vhkL6xGn2mVbUE23rLHYGJEuwexdkHIj9MQBHTKDRof ndp8+QgvFK3pf7OUhGYJgHUdX78vIPplBQhbE0+NOfx21hz5Eyx4mcgz34cf0kJwcP73 wK4cyBL2rVa00guiI3wCWPshdYhZurFehDGBE= Received: by 10.180.80.40 with SMTP id o8mr2525790wix.10.1330539092165; Wed, 29 Feb 2012 10:11:32 -0800 (PST) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id fq10sm12015031wib.11.2012.02.29.10.11.30 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 29 Feb 2012 10:11:31 -0800 (PST) From: Mark Walters To: notmuch@notmuchmail.org Subject: =?UTF-8?B?W1BBVENIIDAvNV0gRGlzYWJsZSBzZWFyY2guZXhjbHVkZV90YWdz?= =?UTF-8?B?IGZvciAwLjEyIA==?= Date: Wed, 29 Feb 2012 18:13:04 +0000 Message-Id: <1330539189-16593-1-git-send-email-markwalters1009@gmail.com> X-Mailer: git-send-email 1.7.2.3 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:34 -0000 As requested by David (Bremner) on irc here is a patch series disabling the search.exclude_tags feature as a temporary measure for the 0.12 release. There are two options: The first is to disable the addition of the new search.exclude_tags item to the config file and stop setup from asking for it. The second is to do the above and also disable the functionality in notmuch-search.c and notmuch-count.c. The idea is that this these are minimal (and thus relatively safe) changes to make. With the first option users who have configured the functionality for themselves (while using git) will still get the feature: it just won't be pushed on users. With the second option the festure will be completely disabled. Essentially patch 1 implements the first option and patch 4 the second option. The other patches in the series update the NEWS file, the man page and the tests. If going for the first option then I would suggest applying (in addition to patch 1) patch 2 (NEWS) and probably patch 3 (man) although as the functionality remains the latter is not strictly necessary. The test patch (patch 5) is not necessary as the tests set search.exclude_tags directly. If going for the second option then all the patches are needed. Finally, please could someone familiar with the config/setup code check patch 1 carefully. I have never looked at that code before and could easily have done something stupid. Best wishes Mark Mark Walters (5): config: disable addition of exclude tags for 0.12 NEWS: revert NEWS item for exclude tags for 0.12 man: remove search.exclude_tags from notmuch-config.1 for 0.12 cli: temporarily remove exclude tag support for 0.12 test: mark exclude tests broken for 0.12 NEWS | 18 ------------------ man/man1/notmuch-config.1 | 8 -------- notmuch-config.c | 3 +-- notmuch-count.c | 8 +------- notmuch-search.c | 8 +------- notmuch-setup.c | 19 +------------------ test/search | 2 ++ 7 files changed, 6 insertions(+), 60 deletions(-) -- 1.7.2.3