debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-25 12:28:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: fix function name in notmuch new debug logging

Browse source 
add_files_recursive has been renamed add_files long ago.
This commit is contained in:
Jani Nikula 2015-11-03 21:49:29 +02:00 committed by David Bremner
parent 190f69169d
commit b645f41605
2 changed files with 27 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
notmuch-new.c
View file

@ -445,7 +445,7 @@ add_files (notmuch_database_t *notmuch,
*/ */
if (_entry_in_ignore_list (entry->d_name, state)) { if (_entry_in_ignore_list (entry->d_name, state)) {
if (state->debug) 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); path, entry->d_name);
continue; continue;
} }
@ -513,9 +513,8 @@ add_files (notmuch_database_t *notmuch,
/* Ignore files & directories user has configured to be ignored */ /* Ignore files & directories user has configured to be ignored */
if (_entry_in_ignore_list (entry->d_name, state)) { if (_entry_in_ignore_list (entry->d_name, state)) {
if (state->debug) if (state->debug)
printf ("(D) add_files_recursive, pass 2: explicitly ignoring %s/%s\n", printf ("(D) add_files, pass 2: explicitly ignoring %s/%s\n",
path, path, entry->d_name);
entry->d_name);
continue; continue;
} }
@ -529,7 +528,7 @@ add_files (notmuch_database_t *notmuch,
notmuch_filenames_get (db_files)); notmuch_filenames_get (db_files));
if (state->debug) 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); absolute);
_filename_list_add (state->removed_files, 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, char *absolute = talloc_asprintf (state->removed_directories,
"%s/%s", path, filename); "%s/%s", path, filename);
if (state->debug) 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); absolute);
_filename_list_add (state->removed_directories, absolute); _filename_list_add (state->removed_directories, absolute);
@ -618,7 +617,7 @@ add_files (notmuch_database_t *notmuch,
"%s/%s", path, "%s/%s", path,
notmuch_filenames_get (db_files)); notmuch_filenames_get (db_files));
if (state->debug) 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); absolute);
_filename_list_add (state->removed_files, absolute); _filename_list_add (state->removed_files, absolute);
@ -633,7 +632,7 @@ add_files (notmuch_database_t *notmuch,
notmuch_filenames_get (db_subdirs)); notmuch_filenames_get (db_subdirs));
if (state->debug) 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); absolute);
_filename_list_add (state->removed_directories, absolute); _filename_list_add (state->removed_directories, absolute);

40
test/T050-new.sh
View file

@ -64,7 +64,7 @@ generate_message
notmuch new > /dev/null notmuch new > /dev/null
mv "$gen_msg_filename" "${gen_msg_filename}"-renamed mv "$gen_msg_filename" "${gen_msg_filename}"-renamed
output=$(NOTMUCH_NEW --debug) 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." No new mail. Detected 1 file rename."
@ -72,7 +72,7 @@ test_begin_subtest "Deleted message"
rm "${gen_msg_filename}"-renamed rm "${gen_msg_filename}"-renamed
output=$(NOTMUCH_NEW --debug) 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." No new mail. Removed 1 message."
@ -88,7 +88,7 @@ notmuch new > /dev/null
mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed
output=$(NOTMUCH_NEW --debug) 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." No new mail. Detected 3 file renames."
@ -96,7 +96,7 @@ test_begin_subtest "Deleted directory"
rm -rf "${MAIL_DIR}"/dir-renamed rm -rf "${MAIL_DIR}"/dir-renamed
output=$(NOTMUCH_NEW --debug) 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." No new mail. Removed 3 messages."
@ -115,7 +115,7 @@ test_begin_subtest "Deleted directory (end of list)"
rm -rf "${MAIL_DIR}"/zzz rm -rf "${MAIL_DIR}"/zzz
output=$(NOTMUCH_NEW --debug) 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." No new mail. Removed 3 messages."
@ -166,7 +166,7 @@ test_begin_subtest "Deleted two-level directory"
rm -rf "${MAIL_DIR}"/two rm -rf "${MAIL_DIR}"/two
output=$(NOTMUCH_NEW --debug) 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." No new mail. Removed 3 messages."
test_begin_subtest "Support single-message mbox" 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 touch "${MAIL_DIR}"/{one,one/two,one/two/three}/ignored_file
output=$(NOTMUCH_NEW --debug 2>&1 | sort) output=$(NOTMUCH_NEW --debug 2>&1 | sort)
test_expect_equal "$output" \ test_expect_equal "$output" \
"(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.git "(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git
(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file (D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file (D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file
(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/ignored_file (D) add_files, 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, 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, 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, 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, pass 2: explicitly ignoring ${MAIL_DIR}/.git
(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file (D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file (D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file
(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/ignored_file (D) add_files, 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, 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, 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 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file
No new mail." No new mail."