debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-24 11:58:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2017-06-01 07:54:38 -03:00
commit 1ec634461e
6 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
NEWS
View file

@ -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) Notmuch 0.24.1 (2017-04-01)
=========================== ===========================

2
bindings/python/notmuch/version.py
View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.24.1' __VERSION__ = '0.24.2'
SOVERSION = '5' SOVERSION = '5'

7
debian/changelog vendored
View file

@ -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 notmuch (0.24.1-1) experimental; urgency=medium
* Restore Xapian wildcard queries to from: and subject: * Restore Xapian wildcard queries to from: and subject:

3
notmuch-dump.c
View file

@ -250,7 +250,8 @@ database_dump_file (notmuch_database_t *notmuch, gzFile output,
message = notmuch_messages_get (messages); 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)) &buffer, &buffer_size))
return EXIT_FAILURE; return EXIT_FAILURE;

8
test/T610-message-property.sh
View file

@ -209,6 +209,14 @@ EOF
notmuch dump | grep '^#=' > OUTPUT notmuch dump | grep '^#=' > OUTPUT
test_expect_equal_file PROPERTIES 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)" test_begin_subtest "restore missing message property (single line)"
notmuch dump | grep '^#=' > BEFORE1 notmuch dump | grep '^#=' > BEFORE1

2
version
View file

@ -1 +1 @@
0.24.1 0.24.2