[PATCH v4 6/7] On deletion, replace with ghost when other active messages in thread

diff --git a/78/913af1eb29ade64eef30043ee658d993269da8 b/78/913af1eb29ade64eef30043ee658d993269da8
new file mode 100644 (file)
index 0000000..266516b
--- /dev/null
+++ b/78/913af1eb29ade64eef30043ee658d993269da8
@@ -0,0 +1,141 @@
+Return-Path: <dkg@fifthhorseman.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 768DE6DE092B\r
+ for <notmuch@notmuchmail.org>; Fri,  8 Apr 2016 18:55:48 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[AWL=0.000]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id 1mqU_sJPVnX8 for <notmuch@notmuchmail.org>;\r
+ Fri,  8 Apr 2016 18:55:40 -0700 (PDT)\r
+Received: from che.mayfirst.org (che.mayfirst.org [209.234.253.108])\r
+ by arlo.cworth.org (Postfix) with ESMTP id A25286DE0352\r
+ for <notmuch@notmuchmail.org>; Fri,  8 Apr 2016 18:55:14 -0700 (PDT)\r
+Received: from fifthhorseman.net (unknown [201.140.212.132])\r
+ by che.mayfirst.org (Postfix) with ESMTPSA id ED6F710070\r
+ for <notmuch@notmuchmail.org>; Fri,  8 Apr 2016 21:55:12 -0400 (EDT)\r
+Received: by fifthhorseman.net (Postfix, from userid 1000)\r
+ id 5D99720555; Fri,  8 Apr 2016 22:54:52 -0300 (ART)\r
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH v4 6/7] On deletion,\r
+ replace with ghost when other active messages in thread\r
+Date: Fri,  8 Apr 2016 22:54:51 -0300\r
+Message-Id: <1460166892-29721-6-git-send-email-dkg@fifthhorseman.net>\r
+X-Mailer: git-send-email 2.8.0.rc3\r
+In-Reply-To: <1460166892-29721-1-git-send-email-dkg@fifthhorseman.net>\r
+References: <1459445693-3900-1-git-send-email-dkg@fifthhorseman.net>\r
+ <1460166892-29721-1-git-send-email-dkg@fifthhorseman.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sat, 09 Apr 2016 01:55:48 -0000\r
+\r
+There is no need to add a ghost message upon deletion if there are no\r
+other active messages in the thread.\r
+\r
+Also, if the message being deleted was a ghost already, we can just go\r
+ahead and delete it.\r
+---\r
+ lib/message.cc | 58 ++++++++++++++++++++++++++++++++++++++++++----------------\r
+ 1 file changed, 42 insertions(+), 16 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 2399ab3..1b423b0 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1044,11 +1044,14 @@ _notmuch_message_delete (notmuch_message_t *message)\r
+ {\r
+     notmuch_status_t status;\r
+     Xapian::WritableDatabase *db;\r
+-    const char *mid, *tid;\r
++    const char *mid, *tid, *query_string;\r
+     notmuch_message_t *ghost;\r
+     notmuch_private_status_t private_status;\r
+     notmuch_database_t *notmuch;\r
+-          \r
++    notmuch_query_t *query;\r
++    unsigned int count = 0;\r
++    notmuch_bool_t is_ghost;\r
++\r
+     mid = notmuch_message_get_message_id (message);\r
+     tid = notmuch_message_get_thread_id (message);\r
+     notmuch = message->notmuch;\r
+@@ -1059,22 +1062,45 @@ _notmuch_message_delete (notmuch_message_t *message)\r
+ \r
+     db = static_cast <Xapian::WritableDatabase *> (notmuch->xapian_db);\r
+     db->delete_document (message->doc_id);\r
+-          \r
+-    /* and reintroduce a ghost in its place */\r
+-    ghost = _notmuch_message_create_for_message_id (notmuch, mid, &private_status);\r
+-    if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {\r
+-      private_status = _notmuch_message_initialize_ghost (ghost, tid);\r
+-      if (! private_status)\r
+-          _notmuch_message_sync (ghost);\r
+-    } else if (private_status == NOTMUCH_PRIVATE_STATUS_SUCCESS) {\r
+-      /* this is deeply weird, and we should not have gotten into\r
+-         this state.  is there a better error message to return\r
+-         here? */\r
+-      return NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
++\r
++    /* if this was a ghost to begin with, we are done */\r
++    private_status = _notmuch_message_has_term (message, "type", "ghost", &is_ghost);\r
++    if (private_status)\r
++      return COERCE_STATUS (private_status,\r
++                            "Error trying to determine whether message was a ghost");\r
++    if (is_ghost)\r
++      return NOTMUCH_STATUS_SUCCESS;\r
++    \r
++    query_string = talloc_asprintf (message, "thread:%s", tid);\r
++    query = notmuch_query_create (notmuch, query_string);\r
++    if (query == NULL)\r
++      return NOTMUCH_STATUS_OUT_OF_MEMORY;\r
++    status = notmuch_query_count_messages_st (query, &count);\r
++    if (status) {\r
++      notmuch_query_destroy (query);\r
++      return status;\r
+     }\r
+ \r
+-    notmuch_message_destroy (ghost);\r
+-    return COERCE_STATUS (private_status, "Error converting to ghost message");\r
++    if (count > 0) {\r
++      /* reintroduce a ghost in its place because there are still\r
++       * other active messages in this thread: */\r
++      ghost = _notmuch_message_create_for_message_id (notmuch, mid, &private_status);\r
++      if (private_status == NOTMUCH_PRIVATE_STATUS_NO_DOCUMENT_FOUND) {\r
++          private_status = _notmuch_message_initialize_ghost (ghost, tid);\r
++          if (! private_status)\r
++              _notmuch_message_sync (ghost);\r
++      } else if (private_status == NOTMUCH_PRIVATE_STATUS_SUCCESS) {\r
++          /* this is deeply weird, and we should not have gotten\r
++             into this state.  is there a better error message to\r
++             return here? */\r
++          status = NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID;\r
++      }\r
++\r
++      notmuch_message_destroy (ghost);\r
++      status = COERCE_STATUS (private_status, "Error converting to ghost message");\r
++    }\r
++    notmuch_query_destroy (query);\r
++    return status;\r
+ }\r
+ \r
+ /* Transform a blank message into a ghost message.  The caller must\r
+-- \r
+2.8.0.rc3\r
+\r