We reorder reading maildir flags to avoid overwriting 'new.tags'. The
inverted status of 'unread' means the maildir flag needs to be checked
a second time.
I backpedalled here on the idea of supporting 'new.tags' without
'unread' in the presence of maildir syncing. For files in 'new/', it
seems quite natural to tag them as 'unread'.
---
notmuch-new.c | 10 ++++++++--
test/T340-maildir-sync.sh | 16 ++--------------
2 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/notmuch-new.c b/notmuch-new.c
index 16b4d022..2a68af0e 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -267,10 +267,16 @@ add_file (notmuch_database_t *notmuch, const char
*filename,
case NOTMUCH_STATUS_SUCCESS:
state->added_messages++;
notmuch_message_freeze (message);
- for (tag = state->new_tags; *tag != NULL; tag++)
- notmuch_message_add_tag (message, *tag);
if (state->synchronize_flags)
notmuch_message_maildir_flags_to_tags (message);
+
+ for (tag = state->new_tags; *tag != NULL; tag++) {
+ if (strcmp ("unread", *tag) !=0 ||
+ !notmuch_message_has_maildir_flag (message, 'S')) {
+ notmuch_message_add_tag (message, *tag);
+ }
+ }
+
notmuch_message_thaw (message);
break;
/* Non-fatal issues (go on to next file). */
diff --git a/test/T340-maildir-sync.sh b/test/T340-maildir-sync.sh
index 433effef..b473ae4e 100755
--- a/test/T340-maildir-sync.sh
+++ b/test/T340-maildir-sync.sh
@@ -196,26 +196,14 @@ notmuch search 'subject:"File in new"' |
notmuch_search_sanitize > output
test_expect_equal "$(< output)" \
"thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test unread)"
-test_begin_subtest "unread is not mandatory in new/"
-test_subtest_known_broken
-OLDCONFIG=$(notmuch config get new.tags)
-notmuch config set new.tags test
-add_message [subject]='"File in new/"' [dir]=new [filename]='file-in-new'
-notmuch config set new.tags $OLDCONFIG
-notmuch search 'subject:"File in new"' | notmuch_search_sanitize > output
-test_expect_equal "$(< output)" \
-"thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; File in new/ (test)"
-
for tag in draft flagged passed replied; do
-
test_begin_subtest "$tag is valid in new.tags"
- test_subtest_known_broken
OLDCONFIG=$(notmuch config get new.tags)
- notmuch config set new.tags "$tag"
+ notmuch config set new.tags "$tag;unread"
add_message [subject]="\"$tag sync in new\"" [dir]=new
notmuch config set new.tags $OLDCONFIG
notmuch search "subject:\"$tag sync in new\"" | notmuch_search_sanitize >
output
test_expect_equal "$(< output)" \
- "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; $tag
sync in new ($tag)"
+ "thread:XXX 2001-01-05 [1/1] Notmuch Test Suite; $tag
sync in new ($tag unread)"
done
test_done
--
2.13.2
_______________________________________________
notmuch mailing list
notmuch@notmuchmail.org
https://notmuchmail.org/mailman/listinfo/notmuch
