[PATCH v2 10/12] lib: Enable ghost messages feature

diff --git a/dc/dfcfc6b910fa3d4a240584e48492f828d1da69 b/dc/dfcfc6b910fa3d4a240584e48492f828d1da69
new file mode 100644 (file)
index 0000000..4abaf35
--- /dev/null
+++ b/dc/dfcfc6b910fa3d4a240584e48492f828d1da69
@@ -0,0 +1,110 @@
+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 C820B431FBD\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:43 -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 GCn2NIVYiosw for <notmuch@notmuchmail.org>;\r
+       Mon,  6 Oct 2014 16:17:42 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu\r
+       [18.9.25.13])\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 AF001431FC4\r
+       for <notmuch@notmuchmail.org>; Mon,  6 Oct 2014 16:17:31 -0700 (PDT)\r
+X-AuditID: 1209190d-f79c06d000006f95-0f-5433230bafe1\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-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 74.74.28565.B0323345; Mon,  6 Oct 2014 19:17:31 -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 s96NHTqm032099; \r
+       Mon, 6 Oct 2014 19:17:30 -0400\r
+Received: from drake.dyndns.org ([12.185.136.2]) (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 s96NHRW1014553\r
+       (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+       Mon, 6 Oct 2014 19:17:29 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+       (envelope-from <aclements@csail.mit.edu>)\r
+       id 1XbHWs-0001Ju-9R; Mon, 06 Oct 2014 17:17:22 -0600\r
+From: Austin Clements <aclements@csail.mit.edu>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 10/12] lib: Enable ghost messages feature\r
+Date: Mon,  6 Oct 2014 17:17:16 -0600\r
+Message-Id: <1412637438-4821-11-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+In-Reply-To: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+References: <1412637438-4821-1-git-send-email-aclements@csail.mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrHIsWRmVeSWpSXmKPExsUixG6nrsutbBxi0HBR3uJGazejxfWbM5kd\r
+       mDyerbrF7LHl0HvmAKYoLpuU1JzMstQifbsErowZs/8yF7RzV1zZ9p+pgXEiZxcjJ4eEgInE\r
+       xK+XWSBsMYkL99azdTFycQgJzGaS+LYWJAHibGCU6L9wA8pZyiTRNncqlLOEUWLG8hvsIP1s\r
+       AvoSK9ZOYgWxRQSkJXbenQ1mMwtYSlz92s4EYgsL2Ehcu9PNDGKzCKhK3Dt8H6yGV8Bd4u+y\r
+       I4wQd8hJbNj9H8zmBIqvuTIZrEZIwE3i+c+nLBMY+RcwMqxilE3JrdLNTczMKU5N1i1OTszL\r
+       Sy3SNdLLzSzRS00p3cQICiZOSd4djO8OKh1iFOBgVOLhjdhhGCLEmlhWXJl7iFGSg0lJlHcO\r
+       u3GIEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRFert9GIUK8KYmVValF+TApaQ4WJXHeTT/4QoQE\r
+       0hNLUrNTUwtSi2CyMhwcShK8xkpAQwWLUtNTK9Iyc0oQ0kwcnCDDeYCG/1MEquEtLkjMLc5M\r
+       h8ifYlSUEucNBkkIgCQySvPgemHR/opRHOgVYd4gkBU8wEQB1/0KaDAT0GDTOfogg0sSEVJS\r
+       DYwlhx7N+1upnXrk2xkpsf9r/wo+Ef648GZQfpjBOc44q4tOj9g3xJSlt3Xfc3ilp9iVushG\r
+       4O7KWT8EBfWCjebNlj9n/u7VIc++oG/XGG0eTwmbp2q7STH7/HbNj/v+lJyLmvnpvNLUz/sZ\r
+       uYwf6qTNtV+ybC3nGYaCXrd7ibvmcM6vuryfodhEiaU4I9FQi7moOBEANARfk9ECAAA=\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: Mon, 06 Oct 2014 23:17:44 -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