--- /dev/null
+Return-Path: <tomi.ollila@iki.fi>\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 EC2B1431FAF\r
+ for <notmuch@notmuchmail.org>; Sun, 21 Oct 2012 05:10:41 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 IZv4SIPkh8wD for <notmuch@notmuchmail.org>;\r
+ Sun, 21 Oct 2012 05:10:39 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 01192431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 21 Oct 2012 05:10:38 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 40F2210036F;\r
+ Sun, 21 Oct 2012 15:10:40 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 7/8] lib: add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t\r
+In-Reply-To: <20121021130427.GA4820@hili.localdomain>\r
+References: <1340198947-29370-1-git-send-email-novalazy@gmail.com>\r
+ <1340198947-29370-8-git-send-email-novalazy@gmail.com>\r
+ <87txtr6o0c.fsf@betacantrips.com>\r
+ <20121021130427.GA4820@hili.localdomain>\r
+User-Agent: Notmuch/0.14+51~g62cd13b (http://notmuchmail.org) Emacs/24.2.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 21 Oct 2012 15:10:40 +0300\r
+Message-ID: <m24nlo2fgf.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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: Sun, 21 Oct 2012 12:10:42 -0000\r
+\r
+On Sun, Oct 21 2012, Peter Wang wrote:\r
+\r
+> On Fri, 19 Oct 2012 01:15:31 -0400, Ethan Glasser-Camp <ethan.glasser.camp@gmail.com> wrote:\r
+>> Peter Wang <novalazy@gmail.com> writes:\r
+>> \r
+>> > Add NOTMUCH_EXCLUDE_FLAG to notmuch_exclude_t so that it can\r
+>> > cover all four values of search --exclude in the cli.\r
+>> \r
+>> This series looks good to me. It's a nice clean up and a nice new\r
+>> feature. Patches all apply.\r
+>\r
+> Thanks for the review.\r
+>\r
+>> However, I'm getting test failures like:\r
+>> \r
+>> FAIL Search, exclude "deleted" messages from message search --exclude=false\r
+>> --- excludes.3.expected 2012-10-19 04:45:06.900518377 +0000\r
+>> +++ excludes.3.output 2012-10-19 04:45:06.900518377 +0000\r
+>> @@ -1,2 +1,2 @@\r
+>> -id:msg-001@notmuch-test-suite\r
+>> id:msg-002@notmuch-test-suite\r
+>> +id:msg-001@notmuch-test-suite\r
+>> \r
+>> FAIL Search, don't exclude "deleted" messages when --exclude=flag specified\r
+>> --- excludes.7.expected 2012-10-19 04:45:07.004518378 +0000\r
+>> +++ excludes.7.output 2012-10-19 04:45:07.004518378 +0000\r
+>> @@ -1,2 +1,2 @@\r
+>> -thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
+>> thread:XXX 2001-01-05 [1/2] Notmuch Test Suite; Not deleted reply (deleted inbox unread)\r
+>> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
+>> \r
+>> FAIL Search, don't exclude "deleted" messages from search if not configured\r
+>> --- excludes.8.expected 2012-10-19 04:45:07.028518377 +0000\r
+>> +++ excludes.8.output 2012-10-19 04:45:07.028518377 +0000\r
+>> @@ -1,2 +1,2 @@\r
+>> -thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
+>> thread:XXX 2001-01-05 [2/2] Notmuch Test Suite; Deleted (deleted inbox unread)\r
+>> +thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; Not deleted (inbox unread)\r
+>> \r
+>> In other words, threads and messages are coming up out of order. I'm not\r
+>> sure of the right way to fix this. If you would like me to try sticking\r
+>> "| sort" here and there in the tests I will do so. I'm not sure if the\r
+>> test suite is guaranteed to scan messages in a certain order.\r
+>\r
+> Does it help if you add a "sleep 1" before the second generate_message\r
+> call, i.e. on line 35?\r
+>\r
+>> > - if (query->omit_excluded != NOTMUCH_EXCLUDE_FALSE)\r
+>> > + if (query->omit_excluded == NOTMUCH_EXCLUDE_TRUE ||\r
+>> > + query->omit_excluded == NOTMUCH_EXCLUDE_ALL)\r
+>> > + {\r
+>> > final_query = Xapian::Query (Xapian::Query::OP_AND_NOT,\r
+>> > final_query, exclude_query);\r
+>> > - else {\r
+>> > + } else {\r
+>> \r
+>> "House style" is to not put braces around one-line then-clauses. This is\r
+>> the only place where you did that.\r
+>\r
+> I have to disagree. The condition is wrapped over two lines. The then\r
+> part is wrapped over two lines. The else part already has braces.\r
+> All suggest braces around the then part.\r
+\r
+Well, I personally would count none of these as convincing suggestions ;),\r
+but IMHO the braces are OK here (I don't start judging which I'd like more).\r
+\r
+> Peter\r
+\r
+Tomi\r
projects / notmuch-archives.git / commitdiff