--- /dev/null
+Return-Path: <aaronecay@gmail.com>\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 CBE10431FAE\r
+ for <notmuch@notmuchmail.org>; Tue, 5 Mar 2013 19:32:01 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 oNltIgGJgyHI for <notmuch@notmuchmail.org>;\r
+ Tue, 5 Mar 2013 19:32:00 -0800 (PST)\r
+Received: from mail-qa0-f49.google.com (mail-qa0-f49.google.com\r
+ [209.85.216.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id D5D75431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 5 Mar 2013 19:31:59 -0800 (PST)\r
+Received: by mail-qa0-f49.google.com with SMTP id o13so2299693qaj.15\r
+ for <notmuch@notmuchmail.org>; Tue, 05 Mar 2013 19:31:59 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=x-received:from:to:subject:date:message-id:x-mailer:in-reply-to\r
+ :references; bh=I7SQero4dXbgF6qFSxlWsUGDj3/BMJ8eRDxPC+Q+CsE=;\r
+ b=G5mMAVUqWubcywuFIEOnq1mhVw36rS5mfnAgEJ0C4HG1O/kNvaR8dV7n/wybChWky5\r
+ X7cY+HcQXw8fUIlWKshAZVTxLYSH06V3WRqKG7FmHzmKf7sxdJhS8ssrtO6/YO0qXzdk\r
+ xMwW7uVCC1hEZnnsDT4+8I2QEDC9ciFIpW6JmgLo/SVTPM82snxklLrO5fi1qIiom4Kg\r
+ 5h1FefyIYeTj65MIuh1gqw5SyIjMrKv01HR5F/LbfrhRLEfx+ALiTT0Xf7sYnQp3oSt0\r
+ FZK9oThaLMe127S2AUZPsR74jbTFbghISRR4ruPpbrAK2h++AQiiYQziaAochxRiV6FS\r
+ C6CA==\r
+X-Received: by 10.229.198.22 with SMTP id em22mr9334247qcb.2.1362540718664;\r
+ Tue, 05 Mar 2013 19:31:58 -0800 (PST)\r
+Received: from haize.hsd1.pa.comcast.net (c-68-80-94-73.hsd1.pa.comcast.net.\r
+ [68.80.94.73])\r
+ by mx.google.com with ESMTPS id q5sm46570133qaz.2.2013.03.05.19.31.57\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128);\r
+ Tue, 05 Mar 2013 19:31:58 -0800 (PST)\r
+From: Aaron Ecay <aaronecay@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] lib/database.cc: change how the parent of a message is\r
+ calculated\r
+Date: Tue, 5 Mar 2013 22:31:49 -0500\r
+Message-Id: <1362540709-28765-2-git-send-email-aaronecay@gmail.com>\r
+X-Mailer: git-send-email 1.8.1.5\r
+In-Reply-To: <1362540709-28765-1-git-send-email-aaronecay@gmail.com>\r
+References: <87ppzfzxuk.fsf@zancas.localnet>\r
+ <1362540709-28765-1-git-send-email-aaronecay@gmail.com>\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: Wed, 06 Mar 2013 03:32:01 -0000\r
+\r
+Presently, the code which finds the parent of a message as it is being\r
+added to the database assumes that the first Message-ID-like substring\r
+of the In-Reply-To header is the parent Message ID. Some mail clients,\r
+however, put stuff other than the Message-ID of the parent in the\r
+In-Reply-To header, such as the email address of the sender of the\r
+parent. This can fool notmuch.\r
+\r
+The updated algorithm prefers the last Message ID in the References\r
+header. The References header lists messages oldest-first, so the last\r
+Message ID is the parent (RFC2822, p. 24). The References header is\r
+also less likely to be in a non-standard\r
+syntax (http://cr.yp.to/immhf/thread.html,\r
+http://www.jwz.org/doc/threading.html). In case the References header\r
+is not to be found, fall back to the old behavior.\r
+\r
+V2 of this patch, incorporating feedback from Jani and (indirectly)\r
+Austin.\r
+---\r
+ lib/database.cc | 48 +++++++++++++++++++++++++++++++++---------------\r
+ test/thread-replies | 4 ----\r
+ 2 files changed, 33 insertions(+), 19 deletions(-)\r
+\r
+diff --git a/lib/database.cc b/lib/database.cc\r
+index 91d4329..52ed618 100644\r
+--- a/lib/database.cc\r
++++ b/lib/database.cc\r
+@@ -501,8 +501,10 @@ _parse_message_id (void *ctx, const char *message_id, const char **next)\r
+ * 'message_id' in the result (to avoid mass confusion when a single\r
+ * message references itself cyclically---and yes, mail messages are\r
+ * not infrequent in the wild that do this---don't ask me why).\r
+-*/\r
+-static void\r
++ *\r
++ * Return the last reference parsed, if it is not equal to message_id.\r
++ */\r
++static char *\r
+ parse_references (void *ctx,\r
+ const char *message_id,\r
+ GHashTable *hash,\r
+@@ -511,7 +513,7 @@ parse_references (void *ctx,\r
+ char *ref;\r
+ \r
+ if (refs == NULL || *refs == '\0')\r
+- return;\r
++ return NULL;\r
+ \r
+ while (*refs) {\r
+ ref = _parse_message_id (ctx, refs, &refs);\r
+@@ -519,6 +521,17 @@ parse_references (void *ctx,\r
+ if (ref && strcmp (ref, message_id))\r
+ g_hash_table_insert (hash, ref, NULL);\r
+ }\r
++\r
++ /* The return value of this function is used to add a parent\r
++ * reference to the database. We should avoid making a message\r
++ * its own parent, thus the following check.\r
++ */\r
++\r
++ if (ref && strcmp(ref, message_id)) {\r
++ return ref;\r
++ } else {\r
++ return NULL;\r
++ }\r
+ }\r
+ \r
+ notmuch_status_t\r
+@@ -1510,28 +1523,33 @@ _notmuch_database_link_message_to_parents (notmuch_database_t *notmuch,\r
+ {\r
+ GHashTable *parents = NULL;\r
+ const char *refs, *in_reply_to, *in_reply_to_message_id;\r
++ const char *last_ref_message_id, *this_message_id;\r
+ GList *l, *keys = NULL;\r
+ notmuch_status_t ret = NOTMUCH_STATUS_SUCCESS;\r
+ \r
+ parents = g_hash_table_new_full (g_str_hash, g_str_equal,\r
+ _my_talloc_free_for_g_hash, NULL);\r
++ this_message_id = notmuch_message_get_message_id (message);\r
+ \r
+ refs = notmuch_message_file_get_header (message_file, "references");\r
+- parse_references (message, notmuch_message_get_message_id (message),\r
+- parents, refs);\r
++ last_ref_message_id = parse_references (message,\r
++ this_message_id,\r
++ parents, refs);\r
+ \r
+ in_reply_to = notmuch_message_file_get_header (message_file, "in-reply-to");\r
+- parse_references (message, notmuch_message_get_message_id (message),\r
+- parents, in_reply_to);\r
+-\r
+- /* Carefully avoid adding any self-referential in-reply-to term. */\r
+- in_reply_to_message_id = _parse_message_id (message, in_reply_to, NULL);\r
+- if (in_reply_to_message_id &&\r
+- strcmp (in_reply_to_message_id,\r
+- notmuch_message_get_message_id (message)))\r
+- {\r
++ in_reply_to_message_id = parse_references (message,\r
++ this_message_id,\r
++ parents, in_reply_to);\r
++\r
++ /* For the parent of this message, use the last message ID of the\r
++ * References header, if available. If not, fall back to the\r
++ * first message ID in the In-Reply-To header. */\r
++ if (last_ref_message_id) {\r
++ _notmuch_message_add_term (message, "replyto",\r
++ last_ref_message_id);\r
++ } else if (in_reply_to_message_id) {\r
+ _notmuch_message_add_term (message, "replyto",\r
+- _parse_message_id (message, in_reply_to, NULL));\r
++ in_reply_to_message_id);\r
+ }\r
+ \r
+ keys = g_hash_table_get_keys (parents);\r
+diff --git a/test/thread-replies b/test/thread-replies\r
+index a902691..28c2b1f 100755\r
+--- a/test/thread-replies\r
++++ b/test/thread-replies\r
+@@ -11,7 +11,6 @@ constructed properly, even in the presence of non-RFC-compliant headers'\r
+ . ./test-lib.sh\r
+ \r
+ test_begin_subtest "Use References when In-Reply-To is broken"\r
+-test_subtest_known_broken\r
+ add_message '[id]="foo@one.com"' \\r
+ '[subject]=one'\r
+ add_message '[in-reply-to]="mumble"' \\r
+@@ -46,7 +45,6 @@ expected=`echo "$expected" | notmuch_json_show_sanitize`\r
+ test_expect_equal_json "$output" "$expected"\r
+ \r
+ test_begin_subtest "Prefer References to In-Reply-To"\r
+-test_subtest_known_broken\r
+ add_message '[id]="foo@two.com"' \\r
+ '[subject]=two'\r
+ add_message '[in-reply-to]="<bar@baz.com>"' \\r
+@@ -77,7 +75,6 @@ expected=`echo "$expected" | notmuch_json_show_sanitize`\r
+ test_expect_equal_json "$output" "$expected"\r
+ \r
+ test_begin_subtest "Use In-Reply-To when no References"\r
+-test_subtest_known_broken\r
+ add_message '[id]="foo@three.com"' \\r
+ '[subject]="three"'\r
+ add_message '[in-reply-to]="<foo@three.com>"' \\r
+@@ -104,7 +101,6 @@ expected=`echo "$expected" | notmuch_json_show_sanitize`\r
+ test_expect_equal_json "$output" "$expected"\r
+ \r
+ test_begin_subtest "Use last Reference"\r
+-test_subtest_known_broken\r
+ add_message '[id]="foo@four.com"' \\r
+ '[subject]="four"'\r
+ add_message '[id]="bar@four.com"' \\r
+-- \r
+1.8.1.5\r
+\r
projects / notmuch-archives.git / commitdiff