From: David Bremner <david@tethera.net>
To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org
Subject: [PATCH] cli/dump: bump dump format version to 3
Date: Fri, 31 Mar 2017 07:55:17 -0300 [thread overview]
Message-ID: <20170331105517.14488-1-david@tethera.net> (raw)
In-Reply-To: <20170328110903.16252-3-david@tethera.net>
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/T240-dump-restore.sh | 2 +-
test/T590-libconfig.sh | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst
index ca048aeb..f3f2b394 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 7a674873..a6f70eae 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -469,7 +469,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/T240-dump-restore.sh b/test/T240-dump-restore.sh
index a4eab65e..1f1f0866 100755
--- a/test/T240-dump-restore.sh
+++ b/test/T240-dump-restore.sh
@@ -5,7 +5,7 @@ test_description="\"notmuch dump\" and \"notmuch restore\""
NOTMUCH_NEW > /dev/null
test_begin_subtest "dump header"
cat <<EOF > EXPECTED
-#notmuch-dump batch-tag:2 config,properties,tags
+#notmuch-dump batch-tag:3 config,properties,tags
EOF
notmuch dump > OUTPUT
test_expect_equal_file EXPECTED OUTPUT
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
--
2.11.0
next prev parent reply other threads:[~2017-03-31 10:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-28 11:09 fix for dump headers David Bremner
2017-03-28 11:09 ` [PATCH 1/2] test: add known broken test for dump header David Bremner
2017-04-01 0:23 ` David Bremner
2017-03-28 11:09 ` [PATCH 2/2] cli/dump: fix bug in " David Bremner
2017-03-31 10:55 ` David Bremner [this message]
2017-04-01 11:12 ` fix for dump headers Tomi Ollila
2017-04-01 12:41 ` 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=20170331105517.14488-1-david@tethera.net \
--to=david@tethera.net \
--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).