cli: fix function name in notmuch new debug logging

add_files_recursive has been renamed add_files long ago.

diff --git a/notmuch-new.c b/notmuch-new.c
index d45d0af8642a3f2f4815808c91509e5a0145eda6..e5037761c8ee7f1b481f8aa342dddf5865874f65 100644 (file)
--- 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)
         */
        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;
        }
                        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)
        /* 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;
        }
 
            continue;
        }
 


@@ -529,7 +528,7 @@ add_files (notmuch_database_t *notmuch,
                                              notmuch_filenames_get (db_files));
 
            if (state->debug)
                                              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);
                        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)
                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);
                        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)
                                          "%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);
                    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)
                                          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);
                    absolute);
 
        _filename_list_add (state->removed_directories, absolute);

diff --git a/test/T050-new.sh b/test/T050-new.sh
index 81cf2fad10ad27bcf793ebe2c1a0a126dce586ba..93a6fa94ae7cc9c1377194563f7b6ae8d24730ae 100755 (executable)
--- 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)
 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."
 
 
 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)
 
 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."
 
 
 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)
 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."
 
 
 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)
 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."
 
 
 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)
 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."
 
 
 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)
 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"
 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" \
 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."
 
 
 No new mail."