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