From: David Bremner <david@tethera.net>
To: notmuch@notmuchmail.org, notmuch@freelists.org
Subject: [PATCH 3/3] CLI/new: support maildir synced tags in new.tags
Date: Sat, 19 Aug 2017 22:07:27 -0300 [thread overview]
Message-ID: <20170820010727.30117-4-david@tethera.net> (raw)
In-Reply-To: <20170820010727.30117-1-david@tethera.net>
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
next prev parent reply other threads:[~2017-08-20 1:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-20 1:07 fix for maildir synced tags in new.tags David Bremner
2017-08-20 1:07 ` [PATCH 1/3] lib/message: split n_m_maildir_flags_tags, store maildir flags David Bremner
2017-08-20 1:07 ` [PATCH 2/3] lib: add notmuch_message_has_maildir_flag David Bremner
2017-08-20 1:07 ` David Bremner [this message]
2017-08-30 23:30 ` fix for maildir synced tags in new.tags David Bremner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://notmuchmail.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170820010727.30117-4-david@tethera.net \
--to=david@tethera.net \
--cc=notmuch@freelists.org \
--cc=notmuch@notmuchmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://yhetil.org/notmuch.git/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).