CLI/new: support maildir synced tags in new.tags

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'.

diff --git a/notmuch-new.c b/notmuch-new.c
index a4829327ddddc2e79e35d6b22faff2ec4351dea2..e011788da590a74433a526c5fe727e604be7db3e 100644 (file)
--- 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 433effef5cc5feebf3d629d4f2cee7c11bd75524..b473ae4e1c0f8b0d04c25bd64eeed699935b06d6 100755 (executable)
--- 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