From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 832B66DE023E for ; Fri, 20 Jul 2018 16:38:36 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.001 X-Spam-Level: X-Spam-Status: No, score=-0.001 tagged_above=-999 required=5 tests=[AWL=0.010, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DFcloEGCCk9c for ; Fri, 20 Jul 2018 16:38:35 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 7C6C36DE0217 for ; Fri, 20 Jul 2018 16:38:32 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.89) (envelope-from ) id 1fgeyk-00025Z-UC; Fri, 20 Jul 2018 19:38:30 -0400 Received: (nullmailer pid 2979 invoked by uid 1000); Fri, 20 Jul 2018 23:37:52 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 6/9] lib: initial fix for "ghost replyto" Date: Sat, 21 Jul 2018 08:37:43 +0900 Message-Id: <20180720233746.2844-7-david@tethera.net> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180720233746.2844-1-david@tethera.net> References: <20180720233746.2844-1-david@tethera.net> X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 20 Jul 2018 23:38:36 -0000 This fixes the failing test of _resolve_thread_relationships introduced above, but will probably place messages in-reply-to ghosts (i.e. in-reply-to missing messages) too far up in the thread in more complicated examples. In particular it does not follow the suggestion in the XXX: comment to choose the deepest parent. --- lib/thread.cc | 53 ++++++++++++++++++++++++++++++++++----- test/T260-thread-order.sh | 1 - 2 files changed, 47 insertions(+), 7 deletions(-) diff --git a/lib/thread.cc b/lib/thread.cc index 93508359..417235ea 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -406,22 +406,52 @@ _parent_via_in_reply_to (notmuch_thread_t *thread, notmuch_message_t *message) { } } +static void +_parent_or_toplevel (notmuch_thread_t *thread, notmuch_message_t *message) +{ + bool found = false; + notmuch_message_t *parent = NULL; + const notmuch_string_list_t *references = + _notmuch_message_get_references (message); + for (notmuch_string_node_t *ref_node = references->head; + ! found && ref_node; ref_node = ref_node->next) { + if ((found = g_hash_table_lookup_extended (thread->message_hash, + ref_node->string, NULL, + (void **) &parent))) { + _notmuch_message_add_reply (parent, message); + } + } + if (! found) + _notmuch_message_list_add_message (thread->toplevel_list, message); +} + static void _resolve_thread_relationships (notmuch_thread_t *thread) { notmuch_message_node_t *node, *first_node; notmuch_message_t *message; + void *local; + notmuch_message_list_t *maybe_toplevel_list; first_node = thread->message_list->head; if (! first_node) return; + local = talloc_new (thread); + maybe_toplevel_list = _notmuch_message_list_create (local); + for (node = first_node->next; node; node = node->next) { message = node->message; if (! _parent_via_in_reply_to (thread, message)) - _notmuch_message_list_add_message (thread->toplevel_list, message); + _notmuch_message_list_add_message (maybe_toplevel_list, message); } + for (notmuch_messages_t *roots = _notmuch_messages_create (maybe_toplevel_list); + notmuch_messages_valid (roots); + notmuch_messages_move_to_next (roots)) { + notmuch_message_t *message = notmuch_messages_get (roots); + _parent_or_toplevel (thread, message); + } /* * if we reach the end of the list without finding a top-level * message, that means the thread is a cycle (or set of cycles) @@ -431,20 +461,31 @@ _resolve_thread_relationships (notmuch_thread_t *thread) if (first_node) { message = first_node->message; if (! thread->toplevel_list->head || - ! _parent_via_in_reply_to (thread, message)) - _notmuch_message_list_add_message (thread->toplevel_list, message); + ! _parent_via_in_reply_to (thread, message)) { + /* + * If the oldest message happens to be in-reply-to a + * missing message, we only check for references if there + * is some other candidate for root message. + */ + if (thread->toplevel_list->head) + _parent_or_toplevel (thread, message); + else + _notmuch_message_list_add_message (thread->toplevel_list, message); + } } /* XXX: After scanning through the entire list looking for parents * via "In-Reply-To", we should do a second pass that looks at the - * list of messages IDs in the "References" header instead. (And - * for this the parent would be the "deepest" message of all the - * messages found in the "References" list.) + * list of messages IDs in the "References" header instead. + * Unlike the current quick fix, the parent should be the + * "deepest" message of all the messages found in the "References" + * list. * * Doing this will allow messages and sub-threads to be positioned * correctly in the thread even when an intermediate message is * missing from the thread. */ + talloc_free (local); } /* Create a new notmuch_thread_t object by finding the thread diff --git a/test/T260-thread-order.sh b/test/T260-thread-order.sh index ce8636b9..9565f296 100755 --- a/test/T260-thread-order.sh +++ b/test/T260-thread-order.sh @@ -78,7 +78,6 @@ test_expect_equal "$output" "$expected" add_email_corpus threading test_begin_subtest "reply to ghost" -test_subtest_known_broken notmuch show --entire-thread=true id:000-real-root@example.org | grep ^Subject: | head -1 > OUTPUT cat < EXPECTED Subject: root message -- 2.18.0