--- /dev/null
+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 AF4D1431FDF\r
+ for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:30:55 -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 fhzgoL60PYuP for <notmuch@notmuchmail.org>;\r
+ Thu, 23 Oct 2014 05:30:48 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (dmz-mailsec-scanner-7.mit.edu\r
+ [18.7.68.36])\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 13E9D431FD4\r
+ for <notmuch@notmuchmail.org>; Thu, 23 Oct 2014 05:30:48 -0700 (PDT)\r
+X-AuditID: 12074424-f79346d000004923-fa-5448f4f75e6d\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+ (using TLS with cipher AES256-SHA (256/256 bits))\r
+ (Client did not present a certificate)\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id A6.1C.18723.7F4F8445; Thu, 23 Oct 2014 08:30:47 -0400 (EDT)\r
+Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
+ by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id s9NCUk9Q001784; \r
+ Thu, 23 Oct 2014 08:30:47 -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 s9NCUh6H008924\r
+ (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT);\r
+ Thu, 23 Oct 2014 08:30:46 -0400\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.84)\r
+ (envelope-from <aclements@csail.mit.edu>)\r
+ id 1XhHXP-0007bZ-3z; 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 0/9] Add ghost messages and fix thread linking\r
+Date: Thu, 23 Oct 2014 08:30:32 -0400\r
+Message-Id: <1414067441-29054-1-git-send-email-aclements@csail.mit.edu>\r
+X-Mailer: git-send-email 2.1.0\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFlrKIsWRmVeSWpSXmKPExsUixCmqrfv9i0eIwbkN0har5/JYXL85k9mB\r
+ yWPnrLvsHs9W3WIOYIrisklJzcksSy3St0vgymi7s52p4I9QxZEj11gaGBfxdzFyckgImEjM\r
+ Ov6GCcIWk7hwbz1bFyMXh5DAbCaJ6S97mSGcjYwSb9+cZYVw7jBJLL40mx3CWcIosfvsSkaQ\r
+ fjYBfYkVayexgtgiAtISO+/OBrOZBWQlfpz/A2YLCzhK7NuyBWwfi4CqxPIHHWwgNq+Au0Tr\r
+ 3WWsEHfISWzY/Z9xAiPvAkaGVYyyKblVurmJmTnFqcm6xcmJeXmpRbrmermZJXqpKaWbGEGh\r
+ we6isoOx+ZDSIUYBDkYlHt6KZI8QIdbEsuLK3EOMkhxMSqK8MQ+AQnxJ+SmVGYnFGfFFpTmp\r
+ xYcYJTiYlUR44y8A5XhTEiurUovyYVLSHCxK4rybfvCFCAmkJ5akZqemFqQWwWRlODiUJHgZ\r
+ gTEgJFiUmp5akZaZU4KQZuLgBBnOAzT81meQ4cUFibnFmekQ+VOMilLivMkgCQGQREZpHlwv\r
+ LHZfMYoDvSLMuwGkigcY93Ddr4AGM4FcvQFscEkiQkqqgTG+o0Uq/HfegmfuRecdopf9C7Xe\r
+ seKludbtB3szb7gt/Htph9jNz05bJKqf3yzSNi9OKuZeaXH1g5h2pqxJUtCyCw9uBiVqMoSq\r
+ qmxxvPVl9ecjU+fermgO7Op6tadgp5/AhZ+bMnVrjWWi9ZQ8Pn5vnZtiG2OYnb/stLLu8YzS\r
+ PuWAgJfJ5kosxRmJhlrMRcWJAANIyJC4AgAA\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:30:55 -0000\r
+\r
+This is v3 of\r
+id:1412637438-4821-1-git-send-email-aclements@csail.mit.edu.\r
+This fixes some comments, as suggested by Mark. There are no\r
+code changes relative to v2. The diff from v2 is below.\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 6e51a72..3601f9d 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -2121,10 +2121,13 @@ _consume_metadata_thread_id (void *ctx, notmuch_database_t *notmuch,\r
+ /* Given a blank or ghost 'message' and its corresponding\r
+ * 'message_file' link it to existing threads in the database.\r
+ *\r
+- * The first check is in the metadata of the database to see if we\r
+- * have pre-allocated a thread_id in advance for this message, (which\r
+- * would have happened if a message was previously added that\r
+- * referenced this one).\r
++ * First, if is_ghost, this retrieves the thread ID already stored in\r
++ * the message (which will be the case if a message was previously\r
++ * added that referenced this one). If the message is blank\r
++ * (!is_ghost), it doesn't have a thread ID yet (we'll generate one\r
++ * later in this function). If the database does not support ghost\r
++ * messages, this checks for a thread ID stored in database metadata\r
++ * for this message ID.\r
+ *\r
+ * Second, we look at 'message_file' and its link-relevant headers\r
+ * (References and In-Reply-To) for message IDs.\r
+@@ -2132,12 +2135,12 @@ _consume_metadata_thread_id (void *ctx, notmuch_database_t *notmuch,\r
+ * Finally, we look in the database for existing message that\r
+ * reference 'message'.\r
+ *\r
+- * In all cases, we assign to the current message the first thread_id\r
+- * found (through either parent or child). We will also merge any\r
+- * existing, distinct threads where this message belongs to both,\r
+- * (which is not uncommon when messages are processed out of order).\r
++ * In all cases, we assign to the current message the first thread ID\r
++ * found. We will also merge any existing, distinct threads where this\r
++ * message belongs to both, (which is not uncommon when messages are\r
++ * processed out of order).\r
+ *\r
+- * Finally, if no thread ID has been found through parent or child, we\r
++ * Finally, if no thread ID has been found through referenced messages, we\r
+ * call _notmuch_message_generate_thread_id to generate a new thread\r
+ * ID. This should only happen for new, top-level messages, (no\r
+ * References or In-Reply-To header in this message, and no previously\r
+\r
projects / notmuch-archives.git / commitdiff