Merge branch 'release'

diff --git a/NEWS b/NEWS
index a63e340ee18f0ac7d0c06fdc516d914cd70af0ce..70bce78825df54cdc06f7ae15f5b11a4cf8e9d6d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+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)
 ===========================
 

diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py
index bfdcf7ed32cca758e67bb4ea8c6418851422a47b..6101902b8ecd20a8a79af1cb77cc4d189fe83d35 100644 (file)
--- 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 = '5'

diff --git a/debian/changelog b/debian/changelog
index 478f450f7e3e9389b3eed9cf1c5420c83b9e4f3b..c955fbfd5c5f5b70edbfe841d891b36312f17dd6 100644 (file)
--- 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 <bremner@debian.org>  Thu, 01 Jun 2017 07:24:55 -0300
+
 notmuch (0.24.1-1) experimental; urgency=medium
 
   * Restore Xapian wildcard queries to from: and subject:

diff --git a/notmuch-dump.c b/notmuch-dump.c
index e451ac0c8e89448819184e2480b83db222ac93d6..5cc3b2f62b46530e5dbb3f63b5d127043fc9c610 100644 (file)
--- 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 65ff19dc17d9401b38611986420794d8537c52d8..ba5f55daf9b189176a2955be325d98847094728f 100755 (executable)
--- a/test/T610-message-property.sh
+++ b/test/T610-message-property.sh
@@ -209,6 +209,14 @@ EOF
 notmuch dump | grep '^#=' > OUTPUT
 test_expect_equal_file PROPERTIES OUTPUT
 
+test_begin_subtest "dump _only_ message properties"
+cat <<EOF > 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

diff --git a/version b/version
index 48b91fd89c0759b898d563d1141cc93ef25e16fe..8b95abd9483e5ec2c932da88c141b56dc1f2b550 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.24.1
+0.24.2