[PATCH 9/9] lib: Don't needlessly create directory docs in _notmuch_message_remove_fi...

diff --git a/f9/7efadd6b4d46f8464d70147fed7158ca80c33b b/f9/7efadd6b4d46f8464d70147fed7158ca80c33b
new file mode 100644 (file)
index 0000000..6cd682f
--- /dev/null
+++ b/f9/7efadd6b4d46f8464d70147fed7158ca80c33b
@@ -0,0 +1,98 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 2416D429E27\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id 8XNm-XhW3OFt for <notmuch@notmuchmail.org>;\r
+       Thu, 17 May 2012 21:13:55 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 3634B431FD7\r
+       for <notmuch@notmuchmail.org>; Thu, 17 May 2012 21:13:53 -0700 (PDT)\r
+X-AuditID: 1209190c-b7fad6d000000920-fd-4fb5cc8004a3\r
+Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id E7.1D.02336.08CC5BF4; Fri, 18 May 2012 00:13:52 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id q4I4DqOM009483; \r
+       Fri, 18 May 2012 00:13:52 -0400\r
+Received: from drake.mit.edu\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q4I4Dp4c026797\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Fri, 18 May 2012 00:13:52 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SVEZb-0000zL-6K; Fri, 18 May 2012 00:13:51 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 9/9] lib: Don't needlessly create directory docs in\r
+       _notmuch_message_remove_filename\r
+Date: Fri, 18 May 2012 00:13:42 -0400\r
+Message-Id: <1337314423-3702-10-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+References: <1337314423-3702-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixG6nrttwZqu/wavzOhbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxqTWeewFz9kq+q52MTUwnmDtYuTkkBAwkZgwdRUjhC0mceHe\r
+       erYuRi4OIYF9jBKfbzWCFQkJbGCU2HVbFiJxn0li1f23TBDOLEaJZxuPsYBUsQloSGzbvxxs\r
+       lIiAtMTOu7OBujk4mAXUJP50qYCEhQVSJI40nwMrYRFQlZh9fj6YzSvgIHH23BOoi+Qlnt7v\r
+       YwNp5QSKTzseDXGDvcS/C80sExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdI11MvNLNFL\r
+       TSndxAgKGU5Jnh2Mbw4qHWIU4GBU4uHdMWervxBrYllxZe4hRkkOJiVR3u8ngUJ8SfkplRmJ\r
+       xRnxRaU5qcWHGCU4mJVEeGW7gXK8KYmVValF+TApaQ4WJXFeFa13fkIC6YklqdmpqQWpRTBZ\r
+       GQ4OJQnet6eBGgWLUtNTK9Iyc0oQ0kwcnCDDeUCGnwEZXlyQmFucmQ6RP8WoKCXO+wOkWQAk\r
+       kVGaB9cLi+lXjOJArwjzcoC08wDTAVz3K6DBTECDy3I3gQwuSURISTUwbl/Rfsxk5v+WrlCJ\r
+       slMVCYLTzgj5pZ3M7HDwTfUW3bsi3Ldm4rT593KDVVJz/v1bPbWtqlhec/76PvEbChLZQUEM\r
+       f2f3XJNyS/1q/4vl1xK1KiljuZcXvql196k3Lj2c5XPedX2std/sxIo8SZFnbyOYL/qsO2sk\r
+       8en0aqYrp2RWNf+UMZdWYinOSDTUYi4qTgQATePa2cQCAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://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: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Fri, 18 May 2012 04:13:56 -0000\r
+\r
+Previously, if passed a filename with a directory that did not exist\r
+in the database, _notmuch_message_remove_filename would needlessly\r
+create that directory document.  Fix it so that doesn't happen.\r
+---\r
+ lib/message.cc |    4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index 8d552f1..6787506 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -541,8 +541,8 @@ _notmuch_message_remove_filename (notmuch_message_t *message,\r
+     Xapian::TermIterator i, last;\r
+ \r
+     status = _notmuch_database_filename_to_direntry (\r
+-      local, message->notmuch, filename, NOTMUCH_FIND_CREATE, &direntry);\r
+-    if (status)\r
++      local, message->notmuch, filename, NOTMUCH_FIND_LOOKUP, &direntry);\r
++    if (status || !direntry)\r
+       return status;\r
+ \r
+     /* Unlink this file from its parent directory. */\r
+-- \r
+1.7.10\r
+\r