From 83dffdb25192e482ab25742e3cf4608c20441b0a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 28 Mar 2017 08:09:03 -0300 Subject: [PATCH 1/3] cli/dump: fix bug in dump header Fix copy paste error. (cherry picked from commit 1f3c7916f82774cacbfbb0fbc9d0e0aaae9399b3) (changes to missing test dropped) --- notmuch-dump.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/notmuch-dump.c b/notmuch-dump.c index e7965cea..0bb946f8 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -84,7 +84,7 @@ print_dump_header (gzFile output, int output_format, int include) sep = ","; } if (include & DUMP_INCLUDE_TAGS) { - gzprintf (output, "%sproperties", sep); + gzprintf (output, "%stags", sep); } gzputs (output, "\n"); } From 87f1d68440c3126a585427443339ff4c8e3067ef Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 31 Mar 2017 07:55:17 -0300 Subject: [PATCH 2/3] cli/dump: bump dump format version to 3 No changes to the format of the body, but the header format was fixed, and version 2 headers probably shouldn't be relied on. --- doc/man1/notmuch-dump.rst | 2 +- notmuch-client.h | 2 +- test/T590-libconfig.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst index 58570272..738ba4a3 100644 --- a/doc/man1/notmuch-dump.rst +++ b/doc/man1/notmuch-dump.rst @@ -95,7 +95,7 @@ Supported options for **dump** include The default is to include all available types of data. The option can be specified multiple times to select some subset. As - of version 2 of the dump format, there is a header line of the + of version 3 of the dump format, there is a header line of the following form | diff --git a/notmuch-client.h b/notmuch-client.h index d026e600..dc640326 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -465,7 +465,7 @@ typedef enum dump_includes { #define DUMP_INCLUDE_DEFAULT (DUMP_INCLUDE_TAGS | DUMP_INCLUDE_CONFIG | DUMP_INCLUDE_PROPERTIES) -#define NOTMUCH_DUMP_VERSION 2 +#define NOTMUCH_DUMP_VERSION 3 int notmuch_database_dump (notmuch_database_t *notmuch, diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh index e8c078d5..1b308693 100755 --- a/test/T590-libconfig.sh +++ b/test/T590-libconfig.sh @@ -112,7 +112,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR} EOF notmuch dump --include=config >OUTPUT cat <<'EOF' >EXPECTED -#notmuch-dump batch-tag:2 config +#notmuch-dump batch-tag:3 config #@ aaabefore beforeval #@ key%20with%20spaces value,%20with,%20spaces%21 #@ testkey1 testvalue1 From 68173a1dc5b1f6408525996467f7dd3025e3f0c6 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 1 Apr 2017 21:10:16 -0300 Subject: [PATCH 3/3] debian: changelog for 0.23.7-3 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8b05d602..41b45435 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +notmuch (0.23.7-3) unstable; urgency=medium + + * Cherry pick fixes to dump header from 0.24.1 + + -- David Bremner Sat, 01 Apr 2017 21:09:36 -0300 + notmuch (0.23.7-2) unstable; urgency=medium * Cherry pick 06adc276, fix use after free in libnotmuch4