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 ca048aebf01f99ddb0e3815f9c2a0693fdc69cee..f3f2b3942fafd82bcd842a067be93f71c205ff63 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
-      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 1099122426afc9267a14219d26da2cbde0615c31..e8f17250818900467daebda7db5d63803040ab3a 100644 (file)
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -470,7 +470,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 181def34566beb01677cfb83e7350f035fdaa32f..d45c9f87d17aca17aa0040ec8cd2e214acda21c1 100755 (executable)
--- 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 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
-#notmuch-dump batch-tag:2 config
+#notmuch-dump batch-tag:3 config
 #@ aaabefore beforeval
 #@ key%20with%20spaces value,%20with,%20spaces%21
 #@ testkey1 testvalue1