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

cli/dump: bump dump format version to 3

Browse source 
No changes to the format of the body, but the header format was
fixed, and version 2 headers probably shouldn't be relied on.
This commit is contained in:
David Bremner 2017-03-31 07:55:17 -03:00
parent 1f3c7916f8
commit d47e184118
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/man1/notmuch-dump.rst
View file

@ -95,7 +95,7 @@ Supported options for **dump** include
The default is to include all available types of data. The The default is to include all available types of data. The
option can be specified multiple times to select some subset. As 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
| |

2
notmuch-client.h
View file

@ -470,7 +470,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 int
notmuch_database_dump (notmuch_database_t *notmuch, notmuch_database_dump (notmuch_database_t *notmuch,

2
test/T240-dump-restore.sh
View file

@ -5,7 +5,7 @@ test_description="\"notmuch dump\" and \"notmuch restore\""
NOTMUCH_NEW > /dev/null NOTMUCH_NEW > /dev/null
test_begin_subtest "dump header" test_begin_subtest "dump header"
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
#notmuch-dump batch-tag:2 config,properties,tags #notmuch-dump batch-tag:3 config,properties,tags
EOF EOF
notmuch dump > OUTPUT notmuch dump > OUTPUT
test_expect_equal_file EXPECTED OUTPUT test_expect_equal_file EXPECTED OUTPUT

2
test/T590-libconfig.sh
View file

@ -112,7 +112,7 @@ cat c_head - c_tail <<'EOF' | test_C ${MAIL_DIR}
EOF EOF
notmuch dump --include=config >OUTPUT notmuch dump --include=config >OUTPUT
cat <<'EOF' >EXPECTED cat <<'EOF' >EXPECTED
#notmuch-dump batch-tag:2 config #notmuch-dump batch-tag:3 config
#@ aaabefore beforeval #@ aaabefore beforeval
#@ key%20with%20spaces value,%20with,%20spaces%21 #@ key%20with%20spaces value,%20with,%20spaces%21
#@ testkey1 testvalue1 #@ testkey1 testvalue1