From a40a91c33c181878eaeb2d36b3def186f6dbb282 Mon Sep 17 00:00:00 2001 From: Daniel Kahn Gillmor Date: Sat, 9 Apr 2016 22:02:34 +2100 Subject: [PATCH] [PATCH v3 7/7] complete ghost-on-removal-when-shared-thread-exists --- c0/477f3f66d679e6b0e4d3936f6e12298477dc87 | 105 ++++++++++++++++++++++ 1 file changed, 105 insertions(+) create mode 100644 c0/477f3f66d679e6b0e4d3936f6e12298477dc87 diff --git a/c0/477f3f66d679e6b0e4d3936f6e12298477dc87 b/c0/477f3f66d679e6b0e4d3936f6e12298477dc87 new file mode 100644 index 000000000..621f1d340 --- /dev/null +++ b/c0/477f3f66d679e6b0e4d3936f6e12298477dc87 @@ -0,0 +1,105 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by arlo.cworth.org (Postfix) with ESMTP id 39C3F6DE0360 + for ; Fri, 8 Apr 2016 18:03:02 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at cworth.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + 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 tyJciQat_1Qy for ; + Fri, 8 Apr 2016 18:02:54 -0700 (PDT) +Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108]) + by arlo.cworth.org (Postfix) with ESMTP id C9EFA6DE02D0 + for ; Fri, 8 Apr 2016 18:02:40 -0700 (PDT) +Received: from fifthhorseman.net (unknown [201.140.212.132]) + by che.mayfirst.org (Postfix) with ESMTPSA id 5538C10080 + for ; Fri, 8 Apr 2016 21:02:39 -0400 (EDT) +Received: by fifthhorseman.net (Postfix, from userid 1000) + id 0E84B200E0; Fri, 8 Apr 2016 22:02:35 -0300 (ART) +From: Daniel Kahn Gillmor +To: Notmuch Mail +Subject: [PATCH v3 7/7] complete ghost-on-removal-when-shared-thread-exists +Date: Fri, 8 Apr 2016 22:02:34 -0300 +Message-Id: <1460163754-22994-7-git-send-email-dkg@fifthhorseman.net> +X-Mailer: git-send-email 2.8.0.rc3 +In-Reply-To: <1460163754-22994-1-git-send-email-dkg@fifthhorseman.net> +References: <1459445693-3900-1-git-send-email-dkg@fifthhorseman.net> + <1460163754-22994-1-git-send-email-dkg@fifthhorseman.net> +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.20 +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: Sat, 09 Apr 2016 01:03:02 -0000 + +To fully complete the ghost-on-removal-when-shared-thread-exists +proposal, we need to clear all ghost messages when the last active +message is removed from a thread. +--- + lib/message.cc | 20 ++++++++++++++++++++ + test/T590-thread-breakage.sh | 6 +----- + 2 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/lib/message.cc b/lib/message.cc +index 1b423b0..39dbe53 100644 +--- a/lib/message.cc ++++ b/lib/message.cc +@@ -1098,6 +1098,26 @@ _notmuch_message_delete (notmuch_message_t *message) + + notmuch_message_destroy (ghost); + status = COERCE_STATUS (private_status, "Error converting to ghost message"); ++ } else { ++ /* the thread is empty; drop all ghost messages from it */ ++ notmuch_messages_t *messages; ++ status = _notmuch_query_search_documents (query, ++ "ghost", ++ &messages); ++ if (status == NOTMUCH_STATUS_SUCCESS) { ++ notmuch_status_t last_error = NOTMUCH_STATUS_SUCCESS; ++ while (notmuch_messages_valid (messages)) { ++ message = notmuch_messages_get (messages); ++ status = _notmuch_message_delete (message); ++ if (status) /* we'll report the last failure we see; ++ * if there is more than one failure, we ++ * forget about previous ones */ ++ last_error = status; ++ notmuch_message_destroy (message); ++ notmuch_messages_move_to_next (messages); ++ } ++ status = last_error; ++ } + } + notmuch_query_destroy (query); + return status; +diff --git a/test/T590-thread-breakage.sh b/test/T590-thread-breakage.sh +index 22e5cbc..969243e 100755 +--- a/test/T590-thread-breakage.sh ++++ b/test/T590-thread-breakage.sh +@@ -121,10 +121,6 @@ notmuch new >/dev/null + test_thread_count 0 'All messages gone: no threads' + test_subject_count apple 0 + test_subject_count banana 0 +-test_begin_subtest 'No ghosts should remain after full thread deletion' +-# this is known to fail; we are leaking ghost messages deliberately +-test_subtest_known_broken +-ghosts=$(../ghost-report ${MAIL_DIR}/.notmuch/xapian) +-test_expect_equal "$ghosts" "0" ++test_ghost_count 0 'No ghosts should remain after full thread deletion' + + test_done +-- +2.8.0.rc3 + -- 2.26.2