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 2D0436DE092B for ; Fri, 8 Apr 2016 18:55:47 -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=[AWL=0.000] 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 22KEEzBhZIVJ for ; Fri, 8 Apr 2016 18:55:39 -0700 (PDT) Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108]) by arlo.cworth.org (Postfix) with ESMTP id 3D3AD6DE02C6 for ; Fri, 8 Apr 2016 18:55:14 -0700 (PDT) Received: from fifthhorseman.net (unknown [201.140.212.132]) by che.mayfirst.org (Postfix) with ESMTPSA id B7DDB1006F for ; Fri, 8 Apr 2016 21:55:12 -0400 (EDT) Received: by fifthhorseman.net (Postfix, from userid 1000) id 6124120698; Fri, 8 Apr 2016 22:54:52 -0300 (ART) From: Daniel Kahn Gillmor To: Notmuch Mail Subject: [PATCH v4 7/7] complete ghost-on-removal-when-shared-thread-exists Date: Fri, 8 Apr 2016 22:54:52 -0300 Message-Id: <1460166892-29721-7-git-send-email-dkg@fifthhorseman.net> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1460166892-29721-1-git-send-email-dkg@fifthhorseman.net> References: <1459445693-3900-1-git-send-email-dkg@fifthhorseman.net> <1460166892-29721-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:55:47 -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 81f27db..45446b9 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_content_count apple 0 test_content_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