From: Peter Wang Date: Sun, 21 Oct 2012 02:04:27 +0000 (+1100) Subject: Re: [PATCH 7/8] lib: add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=241e56145455972dcd4a94f88fc98aa2c1b3c37d;p=notmuch-archives.git Re: [PATCH 7/8] lib: add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t --- diff --git a/e6/0b2db691dc360fbd21a90e3c327eccf26e4115 b/e6/0b2db691dc360fbd21a90e3c327eccf26e4115 new file mode 100644 index 000000000..7d02fc249 --- /dev/null +++ b/e6/0b2db691dc360fbd21a90e3c327eccf26e4115 @@ -0,0 +1,130 @@ +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 2035F431FAF + for ; Sat, 20 Oct 2012 19:04:36 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.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 5slWtrzZ7RPR for ; + Sat, 20 Oct 2012 19:04:35 -0700 (PDT) +Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com + [209.85.160.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 81A0A431FAE + for ; Sat, 20 Oct 2012 19:04:35 -0700 (PDT) +Received: by mail-pb0-f53.google.com with SMTP id wz12so1476380pbc.26 + for ; Sat, 20 Oct 2012 19:04:34 -0700 (PDT) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=date:message-id:from:to:subject:in-reply-to:references:mime-version + :content-type:content-disposition:content-transfer-encoding; + bh=IbqX1BQP85/4YfMRbkEpnUEjcnCmgMZMJ2JVcHyVjBY=; + b=yOuJLiYLMNz6PXfdgRCqvkUOE1LJ1UjVuml4y47RS0wMHIg+xj+m4x99Ui15L04ehY + GTOe55yYbLkqkYLBbztr1DNj6FOI6XDoEMF8rlpqmZ9VN9qa97xZYg1I5J5Lo9lLCcSx + r2TIkGmjLvEkqURj5vTX7dl07snEpBTjmMUYJjx8cXkcEzR0+g+j6QWqeu72UAt3eEjo + mjDu9jSYEgmQtJs0EMChZ31rprvWyFZBaZQsun5n9UKzrZI0bJwXiVtGomgTGssCau0C + 2qvTEp2sSHF9lX3AE9AvyiCGTR1CZ4jRBeNzVx3nLTT2c9OWoXiO4pXipau/OoQfD4ei + 3btg== +Received: by 10.68.222.226 with SMTP id qp2mr9242477pbc.53.1350785074586; + Sat, 20 Oct 2012 19:04:34 -0700 (PDT) +Received: from localhost (215.42.233.220.static.exetel.com.au. + [220.233.42.215]) + by mx.google.com with ESMTPS id ju7sm3603077pbb.60.2012.10.20.19.04.32 + (version=TLSv1/SSLv3 cipher=OTHER); + Sat, 20 Oct 2012 19:04:33 -0700 (PDT) +Date: Sun, 21 Oct 2012 13:04:27 +1100 +Message-ID: <20121021130427.GA4820@hili.localdomain> +From: Peter Wang +To: notmuch@notmuchmail.org +Subject: Re: [PATCH 7/8] lib: add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t +In-Reply-To: <87txtr6o0c.fsf@betacantrips.com> +References: <1340198947-29370-1-git-send-email-novalazy@gmail.com> + <1340198947-29370-8-git-send-email-novalazy@gmail.com> + <87txtr6o0c.fsf@betacantrips.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=utf-8 +Content-Disposition: inline +Content-Transfer-Encoding: 8bit +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: Sun, 21 Oct 2012 02:04:36 -0000 + +On Fri, 19 Oct 2012 01:15:31 -0400, Ethan Glasser-Camp wrote: +> Peter Wang writes: +> +> > Add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t so that it can +> > cover all four values of search --exclude in the cli. +> +> This series looks good to me. It's a nice clean up and a nice new +> feature. Patches all apply. + +Thanks for the review. + +> However, I'm getting test failures like: +> +> FAIL Search, exclude "deleted" messages from message search --exclude=false +> --- excludes.3.expected 2012-10-19 04:45:06.900518377 +0000 +> +++ excludes.3.output 2012-10-19 04:45:06.900518377 +0000 +> @@ -1,2 +1,2 @@ +> -id:msg-001@notmuch-test-suite +> id:msg-002@notmuch-test-suite +> +id:msg-001@notmuch-test-suite +> +> FAIL Search, don't exclude "deleted" messages when --exclude=flag specified +> --- excludes.7.expected 2012-10-19 04:45:07.004518378 +0000 +> +++ excludes.7.output 2012-10-19 04:45:07.004518378 +0000 +> @@ -1,2 +1,2 @@ +> -thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) +> thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread) +> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) +> +> FAIL Search, don't exclude "deleted" messages from search if not configured +> --- excludes.8.expected 2012-10-19 04:45:07.028518377 +0000 +> +++ excludes.8.output 2012-10-19 04:45:07.028518377 +0000 +> @@ -1,2 +1,2 @@ +> -thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) +> thread:XXX 2001-01-05 [2/2] Notmuch Test Suite; Deleted (deleted inbox unread) +> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread) +> +> In other words, threads and messages are coming up out of order. I'm not +> sure of the right way to fix this. If you would like me to try sticking +> "| sort" here and there in the tests I will do so. I'm not sure if the +> test suite is guaranteed to scan messages in a certain order. + +Does it help if you add a "sleep 1" before the second generate_message +call, i.e. on line 35? + +> > - if (query->omit_excluded != NOTMUCH_EXCLUDE_FALSE) +> > + if (query->omit_excluded == NOTMUCH_EXCLUDE_TRUE || +> > + query->omit_excluded == NOTMUCH_EXCLUDE_ALL) +> > + { +> > final_query = Xapian::Query (Xapian::Query::OP_AND_NOT, +> > final_query, exclude_query); +> > - else { +> > + } else { +> +> "House style" is to not put braces around one-line then-clauses. This is +> the only place where you did that. + +I have to disagree. The condition is wrapped over two lines. The then +part is wrapped over two lines. The else part already has braces. +All suggest braces around the then part. + +Peter