--- /dev/null
+Return-Path: <jani@nikula.org>\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 F104C6DE1926\r
+ for <notmuch@notmuchmail.org>; Tue, 3 Nov 2015 11:50:17 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.191\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.191 tagged_above=-999 required=5\r
+ tests=[AWL=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,\r
+ RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] 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 kdozXDrG-alt for <notmuch@notmuchmail.org>;\r
+ Tue, 3 Nov 2015 11:50:14 -0800 (PST)\r
+Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com\r
+ [74.125.82.49]) by arlo.cworth.org (Postfix) with ESMTPS id 93DC56DE0281 for\r
+ <notmuch@notmuchmail.org>; Tue, 3 Nov 2015 11:50:13 -0800 (PST)\r
+Received: by wmll128 with SMTP id l128so96605380wml.0\r
+ for <notmuch@notmuchmail.org>; Tue, 03 Nov 2015 11:50:11 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=nikula_org.20150623.gappssmtp.com; s=20150623;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references\r
+ :in-reply-to:references;\r
+ bh=+Ura8p8X5sRQN0tfESvEafAAba/BGrNRDaqUUlt1uoI=;\r
+ b=chQxy9e7BkgQWJe0aM3Q1YUi6X5A0w+le3VIqcwwAhRSTVKGZpo1r7JuPDMI4afcmL\r
+ fMOwKHb9sFg6qIAffcoJvpJkIbHLHElqETgpm9OBId4OPFutsLaqQpfhE3JhAElYB4Wh\r
+ GlYs32215SJ4bODqilNQkczTHzs89irjCzMKfxzFeAVyTDQP7FJJbqSC4zxqT35pGD3t\r
+ Rx3IOBVeDjm5wF2y6UJrz4bfsZnmMSuknb5oTUw81JBO1n6iD/CuJhqig7Nny0aOJcOj\r
+ Ee3fxB1wubwDSUJjScsF77Jm5g16kspcU9KGIvm2bspibtGcEOFulsVJjJkPl2FMzkcu\r
+ KPrQ==\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+ :references:in-reply-to:references;\r
+ bh=+Ura8p8X5sRQN0tfESvEafAAba/BGrNRDaqUUlt1uoI=;\r
+ b=aCNW1U4gf1bJBwSlMBhfRL2ID9zLGWjKrXF3j2mKqjUTgg3urj69ThFLbpB5JvFMWC\r
+ L5h7nGtPBmTcSf8kwUiIQRw1D9ZJUK8lrbDJUJXkw90oETwVYM3qvD0bjLfPDudHDTs9\r
+ EfrV9CNm9hCmAP0gYjkvnVqVy6KLk0PPOJlevbz4QYvYxhV9Btfw4+r57Yw8m2qtGDsd\r
+ bvovhlY9naGvpx5aSAMo6qqP1ZisIT/vMw/WxaetkulPAUEQnWD1flvd2pWrWtw9JA9A\r
+ nycClxqe5TFwIokDlveViLOVbmiN99EB+FjBmSXnj+TiPbh76yNvA90SkNDxWCgDhezf\r
+ TcrQ==\r
+X-Gm-Message-State:\r
+ ALoCoQn3l2n5d5rLGN8UuM2x6Z67Mm5FkmyoJuihuf4ewKZQrM2qh44FBxZozoyVt5qoVciMPvOu\r
+X-Received: by 10.28.137.211 with SMTP id l202mr22157798wmd.90.1446580211612; \r
+ Tue, 03 Nov 2015 11:50:11 -0800 (PST)\r
+Received: from localhost (mobile-access-bceec0-208.dhcp.inet.fi.\r
+ [188.238.192.208])\r
+ by smtp.gmail.com with ESMTPSA id q204sm24942935wmg.4.2015.11.03.11.50.10\r
+ (version=TLSv1/SSLv3 cipher=OTHER);\r
+ Tue, 03 Nov 2015 11:50:11 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [RFC 1/5] cli: fix function name in notmuch new debug logging\r
+Date: Tue, 3 Nov 2015 21:49:29 +0200\r
+Message-Id:\r
+ <2c0b2439c1d7c799542aa5290c2e4342d6efccf4.1446579858.git.jani@nikula.org>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <cover.1446579858.git.jani@nikula.org>\r
+References: <cover.1446579858.git.jani@nikula.org>\r
+In-Reply-To: <cover.1446579858.git.jani@nikula.org>\r
+References: <cover.1446579858.git.jani@nikula.org>\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: Tue, 03 Nov 2015 19:50:18 -0000\r
+\r
+add_files_recursive has been renamed add_files long ago.\r
+---\r
+ notmuch-new.c | 15 +++++++--------\r
+ test/T050-new.sh | 40 ++++++++++++++++++++--------------------\r
+ 2 files changed, 27 insertions(+), 28 deletions(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index d45d0af8642a..e5037761c8ee 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -445,7 +445,7 @@ add_files (notmuch_database_t *notmuch,\r
+ */\r
+ if (_entry_in_ignore_list (entry->d_name, state)) {\r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 1: explicitly ignoring %s/%s\n",\r
++ printf ("(D) add_files, pass 1: explicitly ignoring %s/%s\n",\r
+ path, entry->d_name);\r
+ continue;\r
+ }\r
+@@ -513,9 +513,8 @@ add_files (notmuch_database_t *notmuch,\r
+ /* Ignore files & directories user has configured to be ignored */\r
+ if (_entry_in_ignore_list (entry->d_name, state)) {\r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 2: explicitly ignoring %s/%s\n",\r
+- path,\r
+- entry->d_name);\r
++ printf ("(D) add_files, pass 2: explicitly ignoring %s/%s\n",\r
++ path, entry->d_name);\r
+ continue;\r
+ }\r
+ \r
+@@ -529,7 +528,7 @@ add_files (notmuch_database_t *notmuch,\r
+ notmuch_filenames_get (db_files));\r
+ \r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 2: queuing passed file %s for deletion from database\n",\r
++ printf ("(D) add_files, pass 2: queuing passed file %s for deletion from database\n",\r
+ absolute);\r
+ \r
+ _filename_list_add (state->removed_files, absolute);\r
+@@ -547,7 +546,7 @@ add_files (notmuch_database_t *notmuch,\r
+ char *absolute = talloc_asprintf (state->removed_directories,\r
+ "%s/%s", path, filename);\r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 2: queuing passed directory %s for deletion from database\n",\r
++ printf ("(D) add_files, pass 2: queuing passed directory %s for deletion from database\n",\r
+ absolute);\r
+ \r
+ _filename_list_add (state->removed_directories, absolute);\r
+@@ -618,7 +617,7 @@ add_files (notmuch_database_t *notmuch,\r
+ "%s/%s", path,\r
+ notmuch_filenames_get (db_files));\r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 3: queuing leftover file %s for deletion from database\n",\r
++ printf ("(D) add_files, pass 3: queuing leftover file %s for deletion from database\n",\r
+ absolute);\r
+ \r
+ _filename_list_add (state->removed_files, absolute);\r
+@@ -633,7 +632,7 @@ add_files (notmuch_database_t *notmuch,\r
+ notmuch_filenames_get (db_subdirs));\r
+ \r
+ if (state->debug)\r
+- printf ("(D) add_files_recursive, pass 3: queuing leftover directory %s for deletion from database\n",\r
++ printf ("(D) add_files, pass 3: queuing leftover directory %s for deletion from database\n",\r
+ absolute);\r
+ \r
+ _filename_list_add (state->removed_directories, absolute);\r
+diff --git a/test/T050-new.sh b/test/T050-new.sh\r
+index 81cf2fad10ad..93a6fa94ae7c 100755\r
+--- a/test/T050-new.sh\r
++++ b/test/T050-new.sh\r
+@@ -64,7 +64,7 @@ generate_message\r
+ notmuch new > /dev/null\r
+ mv "$gen_msg_filename" "${gen_msg_filename}"-renamed\r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed file ${gen_msg_filename} for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 2: queuing passed file ${gen_msg_filename} for deletion from database\r
+ No new mail. Detected 1 file rename."\r
+ \r
+ \r
+@@ -72,7 +72,7 @@ test_begin_subtest "Deleted message"\r
+ \r
+ rm "${gen_msg_filename}"-renamed\r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database\r
+ No new mail. Removed 1 message."\r
+ \r
+ \r
+@@ -88,7 +88,7 @@ notmuch new > /dev/null\r
+ mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed\r
+ \r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory ${MAIL_DIR}/dir for deletion from database\r
+ No new mail. Detected 3 file renames."\r
+ \r
+ \r
+@@ -96,7 +96,7 @@ test_begin_subtest "Deleted directory"\r
+ rm -rf "${MAIL_DIR}"/dir-renamed\r
+ \r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir-renamed for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory ${MAIL_DIR}/dir-renamed for deletion from database\r
+ No new mail. Removed 3 messages."\r
+ \r
+ \r
+@@ -115,7 +115,7 @@ test_begin_subtest "Deleted directory (end of list)"\r
+ rm -rf "${MAIL_DIR}"/zzz\r
+ \r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/zzz for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory ${MAIL_DIR}/zzz for deletion from database\r
+ No new mail. Removed 3 messages."\r
+ \r
+ \r
+@@ -166,7 +166,7 @@ test_begin_subtest "Deleted two-level directory"\r
+ rm -rf "${MAIL_DIR}"/two\r
+ \r
+ output=$(NOTMUCH_NEW --debug)\r
+-test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database\r
++test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database\r
+ No new mail. Removed 3 messages."\r
+ \r
+ test_begin_subtest "Support single-message mbox"\r
+@@ -227,20 +227,20 @@ mkdir -p "${MAIL_DIR}"/one/two/three/.git\r
+ touch "${MAIL_DIR}"/{one,one/two,one/two/three}/ignored_file\r
+ output=$(NOTMUCH_NEW --debug 2>&1 | sort)\r
+ test_expect_equal "$output" \\r
+-"(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.git\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/ignored_file\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/.git\r
+-(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/.git\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/ignored_file\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/.git\r
+-(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file\r
++"(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/ignored_file\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/.git\r
++(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.git\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/ignored_file\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/.git\r
++(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file\r
+ No new mail."\r
+ \r
+ \r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff