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.

diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst
index 585702726bf155d9e8ecd569775565289ac26f12..738ba4a3e0f9c84491ca3b51f23c1683ace65390 100644 (file)
--- 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
 
       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
 
       |
       following form
 
       |

diff --git a/notmuch-client.h b/notmuch-client.h
index d026e6004239a1868dd44dde4b16de58fc0351a6..dc640326d4ec933d7cd21daff2541086b5d00af4 100644 (file)
--- 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 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,
 
 int
 notmuch_database_dump (notmuch_database_t *notmuch,

diff --git a/test/T590-libconfig.sh b/test/T590-libconfig.sh
index e8c078d56965bca424945783398e52a1b79e5a16..1b308693c527cf026f1fa5005e93f20f54588813 100755 (executable)
--- 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
 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
 #@ aaabefore beforeval
 #@ key%20with%20spaces value,%20with,%20spaces%21
 #@ testkey1 testvalue1