debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 20:08:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: delete directory documents on directory removal

Browse source 
There was a problem with the directory documents being left behind when
the filesystem directory was removed. This was worked around in [1].
However, that ignored the fact that the directory documents are also
still listed by notmuch_directory_get_child_directories() leading to
confusing results when running notmuch new. The directory documents are
found and queued for removal over and over again.

Fix the problem for real by removing the directory documents. This fixes
the tests flagged as broken in [2].

The (non-deterministic) hack test from [3] also still passes with this
change.

[1] commit acd66cdec0
[2] commit ed9ceda623
[3] id:1441445731-4362-1-git-send-email-jani@nikula.org
This commit is contained in:
Jani Nikula 2015-09-25 23:48:46 +03:00 committed by David Bremner
parent 727fcd18c6
commit e26d99dc7b
2 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
notmuch-new.c
View file

@ -878,17 +878,11 @@ _remove_directory (void *ctx,
goto DONE;
}
/*
* XXX: The library does not have a function to remove a directory
* document for a path. Usually this doesn't matter except for a
* slight waste of space. However, if the directory gets added to
* the filesystem again, the old directory document is found with
* the old mtime. Reset the directory mtime to avoid problems.
*/
notmuch_directory_set_mtime (directory, 0);
status = notmuch_directory_delete (directory);
DONE:
notmuch_directory_destroy (directory);
if (status)
notmuch_directory_destroy (directory);
return status;
}

6
test/T050-new.sh
View file

@ -93,7 +93,6 @@ No new mail. Detected 3 file renames."
test_begin_subtest "Deleted directory"
test_subtest_known_broken
rm -rf "${MAIL_DIR}"/dir-renamed
output=$(NOTMUCH_NEW --debug)
@ -102,7 +101,6 @@ No new mail. Removed 3 messages."
test_begin_subtest "New directory (at end of list)"
test_subtest_known_broken
generate_message [dir]=zzz
generate_message [dir]=zzz
@ -114,7 +112,6 @@ test_expect_equal "$output" "Added 3 new messages to the database."
test_begin_subtest "Deleted directory (end of list)"
test_subtest_known_broken
rm -rf "${MAIL_DIR}"/zzz
output=$(NOTMUCH_NEW --debug)
@ -173,7 +170,6 @@ test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover d
No new mail. Removed 3 messages."
test_begin_subtest "Support single-message mbox"
test_subtest_known_broken
cat > "${MAIL_DIR}"/mbox_file1 <<EOF
From test_suite@notmuchmail.org Fri Jan 5 15:43:57 2001
From: Notmuch Test Suite <test_suite@notmuchmail.org>
@ -187,7 +183,6 @@ test_expect_equal "$output" "Added 1 new message to the database."
# This test requires that notmuch new has been run at least once.
test_begin_subtest "Skip and report non-mail files"
test_subtest_known_broken
generate_message
mkdir -p "${MAIL_DIR}"/.git && touch "${MAIL_DIR}"/.git/config
touch "${MAIL_DIR}"/ignored_file
@ -224,7 +219,6 @@ output=$(NOTMUCH_NEW 2>&1)
test_expect_equal "$output" "Added 1 new message to the database."
test_begin_subtest "Ignore files and directories specified in new.ignore (multiple occurrences)"
test_subtest_known_broken
notmuch config set new.ignore .git ignored_file .ignored_hidden_file
notmuch new > /dev/null # ensure that files/folders will be printed in ASCII order.
touch "${MAIL_DIR}"/.git # change .git's mtime for notmuch new to rescan.