--- /dev/null
+Return-Path: <amthrax@drake.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 1994D429E2B\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:07:24 -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 WRu40kZ59v2z for <notmuch@notmuchmail.org>;\r
+ Sat, 11 Jun 2011 13:07:22 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+ [18.7.68.36])\r
+ by olra.theworths.org (Postfix) with ESMTP id 0F7B7431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 11 Jun 2011 13:07:21 -0700 (PDT)\r
+X-AuditID: 12074424-b7bc6ae000005a77-73-4df3caf941fc\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 2F.25.23159.9FAC3FD4; Sat, 11 Jun 2011 16:07:21 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id p5BK7LFv015082; \r
+ Sat, 11 Jun 2011 16:07:21 -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 p5BK7KVv006049\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 11 Jun 2011 16:07:21 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.76)\r
+ (envelope-from <amthrax@drake.mit.edu>)\r
+ id 1QVUSm-0000Ib-8W; Sat, 11 Jun 2011 16:07:20 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 14/17] new: Cleanup. De-duplicate file name removal code.\r
+Date: Sat, 11 Jun 2011 16:04:40 -0400\r
+Message-Id: <1307822683-848-15-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.5.1\r
+In-Reply-To: <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+References: <87ei34rnc5.fsf@yoom.home.cworth.org>\r
+ <1307822683-848-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixCmqrPvz1Gdfg/ZDGhbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxr9X95kLropWvHi3j72B8YBgFyMHh4SAicTayWZdjJxAppjE\r
+ hXvr2boYuTiEBPYxSkxo/coC4WxglPhweTdU5j6TRNPOK0wQznxGiZ2bX7OC9LMJaEhs27+c\r
+ EcQWEZCW2Hl3NivICmYBNYk/XSogYWEBL4mVB9ewg9gsAqoSH749YAKxeQXsJRZOmcIGcYaC\r
+ xJUr81hAbE6g+LyDV8FsIYE0iSW3drNPYORfwMiwilE2JbdKNzcxM6c4NVm3ODkxLy+1SNdc\r
+ LzezRC81pXQTIyho2F1UdjA2H1I6xCjAwajEw3tq1WdfIdbEsuLK3EOMkhxMSqK8OieAQnxJ\r
+ +SmVGYnFGfFFpTmpxYcYJTiYlUR417d/8hXiTUmsrEotyodJSXOwKInzzpNU9xUSSE8sSc1O\r
+ TS1ILYLJynBwKEnwSgKjQ0iwKDU9tSItM6cEIc3EwQkynAdo+NGTQDW8xQWJucWZ6RD5U4zG\r
+ HI83bDrEyNG+GUgKseTl56VKifOqg4wTACnNKM2DmwaL/FeM4kDPCfP+ABnIA0wacPNeAa1i\r
+ AlolUAq2qiQRISXVwLh/aaPe8s8zTn4pefBF4PLt1eEb+fJa50wOebzRyXfFolW+9a82nm5T\r
+ 4NwVV761dP80sainrL9lDaZ3iohoSnx6+UZq1jfFczcue7dedbvCqWem4bephGvS3GcvghPq\r
+ FtuXTL9v/T3+jODm4wobnj52qDGVbbvF2Mn480jGBhedrret155kca1SYinOSDTUYi4qTgQA\r
+ 6anu1NcCAAA=\r
+Cc: Austin Clements <amdragon@mit.edu>\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: Sat, 11 Jun 2011 20:07:24 -0000\r
+\r
+Previously, file name removal was implemented identically in two\r
+places. Now it's captured in one function.\r
+\r
+This is important because file name removal is about to get slightly\r
+more complicated with eager tag synchronization and correct removal\r
+atomicity.\r
+---\r
+ notmuch-new.c | 29 +++++++++++++++++------------\r
+ 1 files changed, 17 insertions(+), 12 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index cdc8a1c..dc349f6 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -696,6 +696,21 @@ upgrade_print_progress (void *closure,\r
+ fflush (stdout);\r
+ }\r
+ \r
++/* Remove one message filename from the database. */\r
++static notmuch_status_t\r
++remove_filename (notmuch_database_t *notmuch,\r
++ const char *path,\r
++ add_files_state_t *add_files_state)\r
++{\r
++ notmuch_status_t status;\r
++ status = notmuch_database_remove_message (notmuch, path);\r
++ if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)\r
++ add_files_state->renamed_messages++;\r
++ else\r
++ add_files_state->removed_messages++;\r
++ return status;\r
++}\r
++\r
+ /* Recursively remove all filenames from the database referring to\r
+ * 'path' (or to any of its children). */\r
+ static void\r
+@@ -706,7 +721,6 @@ _remove_directory (void *ctx,\r
+ {\r
+ notmuch_directory_t *directory;\r
+ notmuch_filenames_t *files, *subdirs;\r
+- notmuch_status_t status;\r
+ char *absolute;\r
+ \r
+ directory = notmuch_database_get_directory (notmuch, path);\r
+@@ -717,11 +731,7 @@ _remove_directory (void *ctx,\r
+ {\r
+ absolute = talloc_asprintf (ctx, "%s/%s", path,\r
+ notmuch_filenames_get (files));\r
+- status = notmuch_database_remove_message (notmuch, absolute);\r
+- if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)\r
+- add_files_state->renamed_messages++;\r
+- else\r
+- add_files_state->removed_messages++;\r
++ remove_filename (notmuch, absolute, add_files_state);\r
+ talloc_free (absolute);\r
+ }\r
+ \r
+@@ -752,7 +762,6 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+ char *dot_notmuch_path;\r
+ struct sigaction action;\r
+ _filename_node_t *f;\r
+- notmuch_status_t status;\r
+ int i;\r
+ notmuch_bool_t timer_is_active = FALSE;\r
+ \r
+@@ -841,11 +850,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])\r
+ \r
+ gettimeofday (&tv_start, NULL);\r
+ for (f = add_files_state.removed_files->head; f && !interrupted; f = f->next) {\r
+- status = notmuch_database_remove_message (notmuch, f->filename);\r
+- if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)\r
+- add_files_state.renamed_messages++;\r
+- else\r
+- add_files_state.removed_messages++;\r
++ remove_filename (notmuch, f->filename, &add_files_state);\r
+ if (do_print_progress) {\r
+ do_print_progress = 0;\r
+ generic_print_progress ("Cleaned up", "messages",\r
+-- \r
+1.7.5.1\r
+\r
projects / notmuch-archives.git / commitdiff