From e68022416d543e50d7cd4eaad218bddd90fdb805 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 7 May 2017 22:44:22 -0300 Subject: [PATCH 1/6] test: add known broken test --include=properties Reported in [1], --include=properties currently implies --include=tags, but it should not. [1] id:87y3u8vjbo.fsf@tethera.net --- test/T610-message-property.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh index 65ff19dc..7d95bde6 100755 --- a/test/T610-message-property.sh +++ b/test/T610-message-property.sh @@ -209,6 +209,15 @@ EOF notmuch dump | grep '^#=' > OUTPUT test_expect_equal_file PROPERTIES OUTPUT +test_begin_subtest "dump _only_ message properties" +test_subtest_known_broken +cat < EXPECTED +#notmuch-dump batch-tag:3 properties +#= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue1 testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3 +EOF +notmuch dump --include=properties > OUTPUT +test_expect_equal_file EXPECTED OUTPUT + test_begin_subtest "restore missing message property (single line)" notmuch dump | grep '^#=' > BEFORE1 From 11fda0bf2fd74b227d15a2bb6b36a8ce6403c8e9 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 7 May 2017 22:44:23 -0300 Subject: [PATCH 2/6] cli/dump: don't include tags when not asked for Add in the analogous test for tags that is given for properties a few lines below. --- notmuch-dump.c | 3 ++- test/T610-message-property.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index 0bb946f8..f0ac1932 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -250,7 +250,8 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output, message = notmuch_messages_get (messages); - if (dump_tags_message (notmuch, message, output_format, output, + if ((include & DUMP_INCLUDE_TAGS) && + dump_tags_message (notmuch, message, output_format, output, &buffer, &buffer_size)) return EXIT_FAILURE; diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh index 7d95bde6..ba5f55da 100755 --- a/test/T610-message-property.sh +++ b/test/T610-message-property.sh @@ -210,7 +210,6 @@ notmuch dump | grep '^#=' > OUTPUT test_expect_equal_file PROPERTIES OUTPUT test_begin_subtest "dump _only_ message properties" -test_subtest_known_broken cat < EXPECTED #notmuch-dump batch-tag:3 properties #= 4EFC743A.3060609@april.org fancy%20key%20with%20%c3%a1cc%c3%a8nts=import%20value%20with%20= testkey1=alice testkey1=bob testkey1=testvalue1 testkey1=testvalue2 testkey3=alice3 testkey3=bob3 testkey3=testvalue3 From 4fb08341a4d43fd98e7b69c2766f401edfeeee01 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 1 Jun 2017 07:13:00 -0300 Subject: [PATCH 3/6] version: bump to 0.24.2 --- bindings/python/notmuch/version.py | 2 +- version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index ae192fe1..49bca347 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.24.1' +__VERSION__ = '0.24.2' SOVERSION = '4' diff --git a/version b/version index 48b91fd8..8b95abd9 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.24.1 +0.24.2 From b6494a8dd90ab4e231a9a1a81263a188f2fbc818 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 1 Jun 2017 07:19:46 -0300 Subject: [PATCH 4/6] NEWS: news for 0.24.2 --- NEWS | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/NEWS b/NEWS index a63e340e..40153add 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,15 @@ +Notmuch 0.24.2 (2017-06-01) + +Command Line Interface +---------------------- + +Fix output from `notmuch dump --include=properties` to not include tags. + +Emacs +----- + +Fix filename stashing in tree view. + Notmuch 0.24.1 (2017-04-01) =========================== From 6773235ea333ed0607db442850dd064133118913 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 1 Jun 2017 07:25:56 -0300 Subject: [PATCH 5/6] debian: changelog for 0.24.2-1 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 478f450f..c955fbfd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +notmuch (0.24.2-1) experimental; urgency=medium + + * Fix dump output to not include tags when not asked for + * Fix file name stashing in emacs tree view. + + -- David Bremner Thu, 01 Jun 2017 07:24:55 -0300 + notmuch (0.24.1-1) experimental; urgency=medium * Restore Xapian wildcard queries to from: and subject: From 2e86a4da55c29e0751d950839cdcbe40234ca8ba Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 1 Jun 2017 07:32:10 -0300 Subject: [PATCH 6/6] fixup! NEWS: news for 0.24.2 --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index 40153add..70bce788 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,5 @@ Notmuch 0.24.2 (2017-06-01) +=========================== Command Line Interface ----------------------