diff options
| author | David Bremner <david@tethera.net> | 2018-04-20 11:59:48 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2018-04-23 23:00:20 -0300 |
| commit | 491b1f4b4082bee18418942846ec6508856be7b4 (patch) | |
| tree | 17769e49120c9edc714ea0027e444b3b6950c771 | |
| parent | 4e085b6d92909b8f6d4a4b18ccd97fac8b7df620 (diff) | |
lib: choose oldest message when breaking reference loops
This preserves a sensible thread order
| -rw-r--r-- | lib/thread.cc | 35 | ||||
| -rwxr-xr-x | test/T050-new.sh | 1 |
2 files changed, 26 insertions, 10 deletions
diff --git a/lib/thread.cc b/lib/thread.cc index dbac002f..e961c76b 100644 --- a/lib/thread.cc +++ b/lib/thread.cc @@ -390,20 +390,37 @@ _thread_add_matched_message (notmuch_thread_t *thread, static void _resolve_thread_relationships (notmuch_thread_t *thread) { - notmuch_message_node_t *node; + notmuch_message_node_t *node, *first_node; notmuch_message_t *message, *parent; 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; in_reply_to = _notmuch_message_get_in_reply_to (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) and any message can be considered top-level - */ - if ((thread->toplevel_list->head || node->next) && - in_reply_to && strlen (in_reply_to) && + 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 + * message, that means the thread is a cycle (or set of cycles) + * and any message can be considered top-level. Choose the oldest + * message, which happens to be first in our list. + */ + 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) && g_hash_table_lookup_extended (thread->message_hash, in_reply_to, NULL, (void **) &parent)) diff --git a/test/T050-new.sh b/test/T050-new.sh index 320a7646..9025fa7a 100755 --- a/test/T050-new.sh +++ b/test/T050-new.sh @@ -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_begin_subtest "reference loop ordered by date" -test_subtest_known_broken threadid=$(notmuch search --output=threads id:mid-loop-12@example.org) notmuch show --format=mbox $threadid | grep '^Date' > OUTPUT cat <<EOF > EXPECTED |