debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib: choose oldest message when breaking reference loops

Browse source 
This preserves a sensible thread order
This commit is contained in:
David Bremner 2018-04-20 11:59:48 -03:00
parent 4e085b6d92
commit 491b1f4b40
2 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
lib/thread.cc
View file

@ -390,19 +390,36 @@ _thread_add_matched_message (notmuch_thread_t *thread,
static void static void
_resolve_thread_relationships (notmuch_thread_t *thread) _resolve_thread_relationships (notmuch_thread_t *thread)
{ {
notmuch_message_node_t *node; notmuch_message_node_t *node, *first_node;
notmuch_message_t *message, *parent; notmuch_message_t *message, *parent;
const char *in_reply_to; const char *in_reply_to;
for (node = thread->message_list->head; node; node = node->next) { first_node = thread->message_list->head;
if (! first_node)
return;
for (node = first_node->next; node; node = node->next) {
message = node->message; message = node->message;
in_reply_to = _notmuch_message_get_in_reply_to (message); in_reply_to = _notmuch_message_get_in_reply_to (message);
if (in_reply_to && strlen (in_reply_to) &&
g_hash_table_lookup_extended (thread->message_hash,
in_reply_to, NULL,
(void **) &parent))
_notmuch_message_add_reply (parent, message);
else
_notmuch_message_list_add_message (thread->toplevel_list, message);
}
/* /*
* if we reach the end of the list without finding a top-level * if we reach the end of the list without finding a top-level
* message, that means the thread is a cycle (or set of * message, that means the thread is a cycle (or set of cycles)
* cycles) and any message can be considered top-level * and any message can be considered top-level. Choose the oldest
* message, which happens to be first in our list.
*/ */
if ((thread->toplevel_list->head || node->next) && if (first_node) {
message = first_node->message;
in_reply_to = _notmuch_message_get_in_reply_to (message);
if (thread->toplevel_list->head &&
in_reply_to && strlen (in_reply_to) && in_reply_to && strlen (in_reply_to) &&
g_hash_table_lookup_extended (thread->message_hash, g_hash_table_lookup_extended (thread->message_hash,
in_reply_to, NULL, in_reply_to, NULL,

1
test/T050-new.sh
View file

@ -359,7 +359,6 @@ test_begin_subtest "reference loop does not crash"
test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT" test_expect_code 0 "notmuch show --format=json id:mid-loop-12@example.org id:mid-loop-21@example.org > OUTPUT"
test_begin_subtest "reference loop ordered by date" test_begin_subtest "reference loop ordered by date"
test_subtest_known_broken
threadid=$(notmuch search --output=threads id:mid-loop-12@example.org) threadid=$(notmuch search --output=threads id:mid-loop-12@example.org)
notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT
cat <<EOF > EXPECTED cat <<EOF > EXPECTED