[PATCH v3 7/9] lib: Enable ghost messages feature

diff --git a/1a/e5e9f126161bd3441dadcbecd025cb9f8e55ff b/1a/e5e9f126161bd3441dadcbecd025cb9f8e55ff
new file mode 100644 (file)
index 0000000..e2b85bb
--- /dev/null
+++ b/1a/e5e9f126161bd3441dadcbecd025cb9f8e55ff
@@ -0,0 +1,112 @@
+Return-Path: <aclements@csail.mit.edu>\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 B660A431FD4\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:31:34 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_MED=-2.3] 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 QHVHHFyc7zSV for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Oct 2014 05:31:29 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
+       [18.9.25.15])\r
+       (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 2C311429E28\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:31:00 -0700 (PDT)\r
+X-AuditID: 1209190f-f79aa6d000005b45-35-5448f503a11b\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       (using TLS with cipher AES256-SHA (256/256 bits))\r
+       (Client did not present a certificate)\r
+       by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id DA.6B.23365.305F8445; Thu, 23 Oct 2014 08:30:59 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s9NCUm66030503; \r
+       Thu, 23 Oct 2014 08:30:49 -0400\r
+Received: from drake.dyndns.org\r
+       (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [216.15.114.40]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s9NCUh4n008934\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Thu, 23 Oct 2014 08:30:48 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XhHXP-0007c5-E4; Thu, 23 Oct 2014 08:30:43 -0400\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 7/9] lib: Enable ghost messages feature\r
+Date: Thu, 23 Oct 2014 08:30:39 -0400\r
+Message-Id: <1414067441-29054-8-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixG6nrsv81SPE4O5GWYvVc3ksrt+cyezA\r
+       5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZcyY/Ze5oJ274sq2/0wNjBM5uxg5OSQETCTm\r
+       rLzMAmGLSVy4t56ti5GLQ0hgNpPExifvmCGcjYwSn/bOZYJw7jBJ/F0xhQXCWcIocffCT3aQ\r
+       fjYBfYkVayexgtgiAtISO+/OBrOZBRwlPu9fxAZiCwtYSeycfZMZxGYRUJU43/oKbDevgLvE\r
+       39PzmSDukJPYsPs/I4jNKeAhsWfHHbBeIaCa7c8Psk5g5F/AyLCKUTYlt0o3NzEzpzg1Wbc4\r
+       OTEvL7VI10QvN7NELzWldBMjKJQ4Jfl3MH47qHSIUYCDUYmHtyLZI0SINbGsuDL3EKMkB5OS\r
+       KG/MA6AQX1J+SmVGYnFGfFFpTmrxIUYJDmYlEd74C0A53pTEyqrUonyYlDQHi5I476YffCFC\r
+       AumJJanZqakFqUUwWRkODiUJ3oIvQI2CRanpqRVpmTklCGkmDk6Q4TxAwyeA1PAWFyTmFmem\r
+       Q+RPMSpKifMmfwZKCIAkMkrz4Hphsf6KURzoFWFeNZB2HmCagOt+BTSYCeTqDWCDSxIRUlIN\r
+       jMlczHbFh3o+nWSqP3jr1Od118QV/6sfVj67MubYrwn7Zx155SBv5la9KHhhzNso1tYHHfwC\r
+       x/5xCT68tuhmddH9c39ljL6YGM3ufG6a5/GuPtRGbq/1tglxm2bvuF5Z7v0z/W36IsbMlnUL\r
+       Q/YkGFuYfa1gs7j8rWOV5SqNbPuNmzpYtF2efVFiKc5INNRiLipOBACcpRar0AIAAA==\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: Thu, 23 Oct 2014 12:31:34 -0000\r
+\r
+From: Austin Clements <amdragon@mit.edu>\r
+\r
+This fixes the broken thread order test.\r
+---\r
+ lib/database-private.h    | 2 +-\r
+ test/T260-thread-order.sh | 1 -\r
+ 2 files changed, 1 insertion(+), 2 deletions(-)\r
+\r
+diff --git a/lib/database-private.h b/lib/database-private.h\r
+index e2e4bc8..15e03cc 100644\r
+--- a/lib/database-private.h\r
++++ b/lib/database-private.h\r
+@@ -166,7 +166,7 @@ struct _notmuch_database {\r
+  * databases will have it). */\r
+ #define NOTMUCH_FEATURES_CURRENT \\r
+     (NOTMUCH_FEATURE_FILE_TERMS | NOTMUCH_FEATURE_DIRECTORY_DOCS | \\r
+-     NOTMUCH_FEATURE_BOOL_FOLDER)\r
++     NOTMUCH_FEATURE_BOOL_FOLDER | NOTMUCH_FEATURE_GHOSTS)\r
+ \r
+ /* Return the list of terms from the given iterator matching a prefix.\r
+  * The prefix will be stripped from the strings in the returned list.\r
+diff --git a/test/T260-thread-order.sh b/test/T260-thread-order.sh\r
+index b435d79..99f5833 100755\r
+--- a/test/T260-thread-order.sh\r
++++ b/test/T260-thread-order.sh\r
+@@ -30,7 +30,6 @@ expected=$(for ((i = 0; i < $nthreads; i++)); do\r
+ test_expect_equal "$output" "$expected"\r
+ \r
+ test_begin_subtest "Messages with all parents get linked in all delivery orders"\r
+-test_subtest_known_broken\r
+ # Here we do the same thing as the previous test, but each message\r
+ # references all of its parents.  Since every message references the\r
+ # root of the thread, each thread should always be fully joined.  This\r
+-- \r
+2.1.0\r
+\r