--- /dev/null
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id E3A326DE1B6F\r
+ for <notmuch@notmuchmail.org>; Sun, 5 Apr 2015 16:02:46 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.536\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.536 tagged_above=-999 required=5 tests=[AWL=0.526, \r
+ T_HEADER_FROM_DIFFERENT_DOMAINS=0.01] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id QTD1-lcWU3Wt for <notmuch@notmuchmail.org>;\r
+ Sun, 5 Apr 2015 16:02:44 -0700 (PDT)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id 3BACB6DE1B7C\r
+ for <notmuch@notmuchmail.org>; Sun, 5 Apr 2015 16:02:44 -0700 (PDT)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1YetYI-0002pZ-I1; Sun, 05 Apr 2015 23:02:02 +0000\r
+Received: (nullmailer pid 2247 invoked by uid 1000); Sun, 05 Apr 2015\r
+ 22:59:25 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [WIP2 06/12] cli/show: add extra element to structured output for\r
+ metadata\r
+Date: Mon, 6 Apr 2015 07:59:08 +0900\r
+Message-Id: <1428274754-1698-7-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.1.4\r
+In-Reply-To: <1428274754-1698-1-git-send-email-david@tethera.net>\r
+References: <1428274754-1698-1-git-send-email-david@tethera.net>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch/>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 05 Apr 2015 23:02:47 -0000\r
+\r
+Initially this will contain the database uuid and last revision,\r
+and a query_type describing the remaining elements\r
+\r
+The changes to emacs/notmuch-tree.el and test/* are to (temporarily)\r
+force these to continue to use the old format.\r
+\r
+One non-trivial thing already tested is that the text and mbox formats\r
+do not change in format version 3.\r
+---\r
+ Makefile.local | 1 +\r
+ devel/schemata | 14 ++++++++++++--\r
+ emacs/notmuch-tree.el | 2 +-\r
+ lib/notmuch.h | 6 ++++++\r
+ lib/query.cc | 6 ++++++\r
+ notmuch-client.h | 4 ++--\r
+ notmuch-show.c | 4 ++--\r
+ test/T070-insert.sh | 2 +-\r
+ test/T160-json.sh | 10 +++++-----\r
+ test/T170-sexp.sh | 10 +++++-----\r
+ test/T190-multipart.sh | 4 ++--\r
+ test/T340-maildir-sync.sh | 2 +-\r
+ test/T350-crypto.sh | 14 +++++++-------\r
+ test/T470-missing-headers.sh | 2 +-\r
+ test/T510-thread-replies.sh | 10 +++++-----\r
+ test/test-lib.sh | 4 ++++\r
+ 16 files changed, 61 insertions(+), 34 deletions(-)\r
+\r
+diff --git a/Makefile.local b/Makefile.local\r
+index 6d54742..8e17c13 100644\r
+--- a/Makefile.local\r
++++ b/Makefile.local\r
+@@ -290,6 +290,7 @@ notmuch_client_srcs = \\r
+ sprinter-json.c \\r
+ sprinter-sexp.c \\r
+ sprinter-text.c \\r
++ sprinter-utils.c \\r
+ query-string.c \\r
+ mime-node.c \\r
+ crypto.c \\r
+diff --git a/devel/schemata b/devel/schemata\r
+index 98a1b2b..76dad01 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -14,7 +14,7 @@ are interleaved. Keys are printed as keywords (symbols preceded by a\r
+ colon), e.g. (:id "123" :time 54321 :from "foobar"). Null is printed as\r
+ nil, true as t and false as nil.\r
+ \r
+-This is version 2 of the structured output format.\r
++This is version 3 of the structured output format.\r
+ \r
+ Version history\r
+ ---------------\r
+@@ -26,6 +26,9 @@ v1\r
+ v2\r
+ - Added the thread_summary.query field.\r
+ \r
++v3\r
++- Initial dictionary of database metadata to notmuch show output\r
++\r
+ Common non-terminals\r
+ --------------------\r
+ \r
+@@ -38,12 +41,19 @@ threadid = string\r
+ # Message ID, sans "id:"\r
+ messageid = string\r
+ \r
++database_metadata = {\r
++ query_type: string\r
++ uuid: string\r
++ lastmod: int\r
++}\r
++\r
+ notmuch show schema\r
+ -------------------\r
+ \r
+ # A top-level set of threads (do_show)\r
+ # Returned by notmuch show without a --part argument\r
+-thread_set = [thread*]\r
++\r
++thread_set = [database_metadata, thread*]\r
+ \r
+ # Top-level messages in a thread (show_messages)\r
+ thread = [thread_node*]\r
+diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el\r
+index 8b6cd51..ca5f9b6 100644\r
+--- a/emacs/notmuch-tree.el\r
++++ b/emacs/notmuch-tree.el\r
+@@ -871,7 +871,7 @@ the same as for the function notmuch-tree."\r
+ (notmuch-tag-clear-cache)\r
+ (let ((proc (notmuch-start-notmuch\r
+ "notmuch-tree" (current-buffer) #'notmuch-tree-process-sentinel\r
+- "show" "--body=false" "--format=sexp"\r
++ "show" "--body=false" "--format=sexp" "--format-version=2"\r
+ message-arg search-args))\r
+ ;; Use a scratch buffer to accumulate partial output.\r
+ ;; This buffer will be killed by the sentinel, which\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index b6be727..5c17d97 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -781,6 +781,12 @@ notmuch_sort_t\r
+ notmuch_query_get_sort (notmuch_query_t *query);\r
+ \r
+ /**\r
++ * Return the associated notmuch database\r
++ */\r
++notmuch_database_t *\r
++notmuch_query_get_database (const notmuch_query_t *query);\r
++\r
++/**\r
+ * Add a tag that will be excluded from the query results by default.\r
+ * This exclusion will be overridden if this tag appears explicitly in\r
+ * the query.\r
+diff --git a/lib/query.cc b/lib/query.cc\r
+index 9cedb6a..61f85c0 100644\r
+--- a/lib/query.cc\r
++++ b/lib/query.cc\r
+@@ -654,3 +654,9 @@ notmuch_query_count_threads (notmuch_query_t *query)\r
+ \r
+ return count;\r
+ }\r
++\r
++notmuch_database_t *\r
++notmuch_query_get_database (const notmuch_query_t *query)\r
++{\r
++ return query->notmuch;\r
++}\r
+diff --git a/notmuch-client.h b/notmuch-client.h\r
+index ab0d188..76dbc38 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -139,7 +139,7 @@ chomp_newline (char *str)\r
+ * this. New (required) map fields can be added without increasing\r
+ * this.\r
+ */\r
+-#define NOTMUCH_FORMAT_CUR 2\r
++#define NOTMUCH_FORMAT_CUR 3\r
+ /* The minimum supported structured output format version. Requests\r
+ * for format versions below this will return an error. */\r
+ #define NOTMUCH_FORMAT_MIN 1\r
+@@ -148,7 +148,7 @@ chomp_newline (char *str)\r
+ * Must be between NOTMUCH_FORMAT_MIN and NOTMUCH_FORMAT_CUR,\r
+ * inclusive.\r
+ */\r
+-#define NOTMUCH_FORMAT_MIN_ACTIVE 1\r
++#define NOTMUCH_FORMAT_MIN_ACTIVE 2\r
+ \r
+ /* The output format version requested by the caller on the command\r
+ * line. If no format version is requested, this will be set to\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index b80933a..4489ea5 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -1019,7 +1019,7 @@ do_show (void *ctx,\r
+ if (! threads)\r
+ return 1;\r
+ \r
+- sp->begin_list (sp);\r
++ sprinter_start_output (sp, query, "threads");\r
+ \r
+ for ( ;\r
+ notmuch_threads_valid (threads);\r
+@@ -1041,7 +1041,7 @@ do_show (void *ctx,\r
+ \r
+ }\r
+ \r
+- sp->end (sp);\r
++ sprinter_finish_output (sp);\r
+ \r
+ return res != NOTMUCH_STATUS_SUCCESS;\r
+ }\r
+diff --git a/test/T070-insert.sh b/test/T070-insert.sh\r
+index 168345c..48d36af 100755\r
+--- a/test/T070-insert.sh\r
++++ b/test/T070-insert.sh\r
+@@ -38,7 +38,7 @@ cur_msg_filename=$(notmuch search --output=files "subject:insert-subject")\r
+ test_expect_equal_file "$cur_msg_filename" "$gen_msg_filename"\r
+ \r
+ test_begin_subtest "Insert message adds default tags"\r
+-output=$(notmuch show --format=json "subject:insert-subject")\r
++output=$(NOTMUCH_SHOW --format=json "subject:insert-subject")\r
+ expected='[[[{\r
+ "id": "'"${gen_msg_id}"'",\r
+ "match": true,\r
+diff --git a/test/T160-json.sh b/test/T160-json.sh\r
+index c1cf649..46c1314 100755\r
+--- a/test/T160-json.sh\r
++++ b/test/T160-json.sh\r
+@@ -4,16 +4,16 @@ test_description="--format=json output"\r
+ \r
+ test_begin_subtest "Show message: json"\r
+ add_message "[subject]=\"json-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[reply-to]=\"test_suite+replyto@notmuchmail.org\"" "[body]=\"json-show-message\""\r
+-output=$(notmuch show --format=json "json-show-message")\r
++output=$(NOTMUCH_SHOW --format=json "json-show-message")\r
+ test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\", \"Reply-To\": \"test_suite+replyto@notmuchmail.org\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ # This should be the same output as above.\r
+ test_begin_subtest "Show message: json --body=true"\r
+-output=$(notmuch show --format=json --body=true "json-show-message")\r
++output=$(NOTMUCH_SHOW --format=json --body=true "json-show-message")\r
+ test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\", \"Reply-To\": \"test_suite+replyto@notmuchmail.org\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"json-show-message\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Show message: json --body=false"\r
+-output=$(notmuch show --format=json --body=false "json-show-message")\r
++output=$(NOTMUCH_SHOW --format=json --body=false "json-show-message")\r
+ test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-subject\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Bcc\": \"test_suite+bcc@notmuchmail.org\", \"Reply-To\": \"test_suite+replyto@notmuchmail.org\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}}, []]]]"\r
+ \r
+ test_begin_subtest "Search message: json"\r
+@@ -32,7 +32,7 @@ test_expect_equal_json "$output" "[{\"thread\": \"XXX\",\r
+ \r
+ test_begin_subtest "Show message: json, utf-8"\r
+ add_message "[subject]=\"json-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""\r
+-output=$(notmuch show --format=json "jsön-show-méssage")\r
++output=$(NOTMUCH_SHOW --format=json "jsön-show-méssage")\r
+ test_expect_equal_json "$output" "[[[{\"id\": \"${gen_msg_id}\", \"match\": true, \"excluded\": false, \"filename\": \"${gen_msg_filename}\", \"timestamp\": 946728000, \"date_relative\": \"2000-01-01\", \"tags\": [\"inbox\",\"unread\"], \"headers\": {\"Subject\": \"json-show-utf8-body-sübjéct\", \"From\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"To\": \"Notmuch Test Suite <test_suite@notmuchmail.org>\", \"Date\": \"Sat, 01 Jan 2000 12:00:00 +0000\"}, \"body\": [{\"id\": 1, \"content-type\": \"text/plain\", \"content\": \"jsön-show-méssage\n\"}]}, []]]]"\r
+ \r
+ test_begin_subtest "Show message: json, inline attachment filename"\r
+@@ -44,7 +44,7 @@ emacs_fcc_message \\r
+ "(mml-attach-file \"$TEST_DIRECTORY/README\" nil nil \"inline\")\r
+ (message-goto-eoh)\r
+ (insert \"Message-ID: <$id>\n\")"\r
+-output=$(notmuch show --format=json "id:$id")\r
++output=$(NOTMUCH_SHOW --format=json "id:$id")\r
+ filename=$(notmuch search --output=files "id:$id")\r
+ # Get length of README after base64-encoding, minus additional newline.\r
+ attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))\r
+diff --git a/test/T170-sexp.sh b/test/T170-sexp.sh\r
+index 667e319..6c7402a 100755\r
+--- a/test/T170-sexp.sh\r
++++ b/test/T170-sexp.sh\r
+@@ -4,16 +4,16 @@ test_description="--format=sexp output"\r
+ \r
+ test_begin_subtest "Show message: sexp"\r
+ add_message "[subject]=\"sexp-show-subject\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[bcc]=\"test_suite+bcc@notmuchmail.org\"" "[reply-to]=\"test_suite+replyto@notmuchmail.org\"" "[body]=\"sexp-show-message\""\r
+-output=$(notmuch show --format=sexp "sexp-show-message")\r
++output=$(NOTMUCH_SHOW --format=sexp "sexp-show-message")\r
+ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :filename \"${gen_msg_filename}\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject \"sexp-show-subject\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :Bcc \"test_suite+bcc@notmuchmail.org\" :Reply-To \"test_suite+replyto@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"text/plain\" :content \"sexp-show-message\n\"))) ())))"\r
+ \r
+ # This should be the same output as above.\r
+ test_begin_subtest "Show message: sexp --body=true"\r
+-output=$(notmuch show --format=sexp --body=true "sexp-show-message")\r
++output=$(NOTMUCH_SHOW --format=sexp --body=true "sexp-show-message")\r
+ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :filename \"${gen_msg_filename}\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject \"sexp-show-subject\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :Bcc \"test_suite+bcc@notmuchmail.org\" :Reply-To \"test_suite+replyto@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"text/plain\" :content \"sexp-show-message\n\"))) ())))"\r
+ \r
+ test_begin_subtest "Show message: sexp --body=false"\r
+-output=$(notmuch show --format=sexp --body=false "sexp-show-message")\r
++output=$(NOTMUCH_SHOW --format=sexp --body=false "sexp-show-message")\r
+ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :filename \"${gen_msg_filename}\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject \"sexp-show-subject\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :Bcc \"test_suite+bcc@notmuchmail.org\" :Reply-To \"test_suite+replyto@notmuchmail.org\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\")) ())))"\r
+ \r
+ test_begin_subtest "Search message: sexp"\r
+@@ -23,7 +23,7 @@ test_expect_equal "$output" "((:thread \"0000000000000002\" :timestamp 946728000\r
+ \r
+ test_begin_subtest "Show message: sexp, utf-8"\r
+ add_message "[subject]=\"sexp-show-utf8-body-sübjéct\"" "[date]=\"Sat, 01 Jan 2000 12:00:00 -0000\"" "[body]=\"jsön-show-méssage\""\r
+-output=$(notmuch show --format=sexp "jsön-show-méssage")\r
++output=$(NOTMUCH_SHOW --format=sexp "jsön-show-méssage")\r
+ test_expect_equal "$output" "((((:id \"${gen_msg_id}\" :match t :excluded nil :filename \"${gen_msg_filename}\" :timestamp 946728000 :date_relative \"2000-01-01\" :tags (\"inbox\" \"unread\") :headers (:Subject \"sexp-show-utf8-body-sübjéct\" :From \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :To \"Notmuch Test Suite <test_suite@notmuchmail.org>\" :Date \"Sat, 01 Jan 2000 12:00:00 +0000\") :body ((:id 1 :content-type \"text/plain\" :content \"jsön-show-méssage\n\"))) ())))"\r
+ \r
+ test_begin_subtest "Show message: sexp, inline attachment filename"\r
+@@ -35,7 +35,7 @@ emacs_fcc_message \\r
+ "(mml-attach-file \"$TEST_DIRECTORY/README\" nil nil \"inline\")\r
+ (message-goto-eoh)\r
+ (insert \"Message-ID: <$id>\n\")"\r
+-output=$(notmuch show --format=sexp "id:$id")\r
++output=$(NOTMUCH_SHOW --format=sexp "id:$id")\r
+ filename=$(notmuch search --output=files "id:$id")\r
+ # Get length of README after base64-encoding, minus additional newline.\r
+ attachment_length=$(( $(base64 $TEST_DIRECTORY/README | wc -c) - 1 ))\r
+diff --git a/test/T190-multipart.sh b/test/T190-multipart.sh\r
+index ad8d29e..f8b805f 100755\r
+--- a/test/T190-multipart.sh\r
++++ b/test/T190-multipart.sh\r
+@@ -744,11 +744,11 @@ cat <<EOF >> EXPECTED.withhtml\r
+ EOF\r
+ \r
+ test_begin_subtest "html parts excluded by default"\r
+-notmuch show --format=json id:htmlmessage > OUTPUT\r
++NOTMUCH_SHOW --format=json id:htmlmessage > OUTPUT\r
+ test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED.nohtml)"\r
+ \r
+ test_begin_subtest "html parts included"\r
+-notmuch show --format=json --include-html id:htmlmessage > OUTPUT\r
++NOTMUCH_SHOW --format=json --include-html id:htmlmessage > OUTPUT\r
+ test_expect_equal_json "$(cat OUTPUT)" "$(cat EXPECTED.withhtml)"\r
+ \r
+ test_begin_subtest "indexes mime-type #1"\r
+diff --git a/test/T340-maildir-sync.sh b/test/T340-maildir-sync.sh\r
+index 3186e70..50b1fb5 100755\r
+--- a/test/T340-maildir-sync.sh\r
++++ b/test/T340-maildir-sync.sh\r
+@@ -35,7 +35,7 @@ output=$(cd ${MAIL_DIR}/cur; ls -1 adding-replied*)\r
+ test_expect_equal "$output" "adding-replied-tag:2,RS"\r
+ \r
+ test_begin_subtest "notmuch show works with renamed file (without notmuch new)"\r
+-output=$(notmuch show --format=json id:${gen_msg_id} | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json id:${gen_msg_id} | notmuch_json_show_sanitize)\r
+ test_expect_equal_json "$output" '[[[{"id": "XXXXX",\r
+ "match": true,\r
+ "excluded": false,\r
+diff --git a/test/T350-crypto.sh b/test/T350-crypto.sh\r
+index 477b397..d9e02d0 100755\r
+--- a/test/T350-crypto.sh\r
++++ b/test/T350-crypto.sh\r
+@@ -35,7 +35,7 @@ test_expect_success 'emacs delivery of signed message' \\r
+ "(mml-secure-message-sign)"'\r
+ \r
+ test_begin_subtest "signature verification"\r
+-output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --verify subject:"test signed message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+@@ -69,7 +69,7 @@ test_begin_subtest "signature verification with full owner trust"\r
+ # give the key full owner trust\r
+ echo "${FINGERPRINT}:6:" | gpg --no-tty --import-ownertrust >>"$GNUPGHOME"/trust.log 2>&1\r
+ gpg --no-tty --check-trustdb >>"$GNUPGHOME"/trust.log 2>&1\r
+-output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --verify subject:"test signed message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+@@ -103,7 +103,7 @@ test_expect_equal_json \\r
+ test_begin_subtest "signature verification with signer key unavailable"\r
+ # move the gnupghome temporarily out of the way\r
+ mv "${GNUPGHOME}"{,.bak}\r
+-output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --verify subject:"test signed message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+@@ -177,7 +177,7 @@ test_expect_equal \\r
+ "$expected"\r
+ \r
+ test_begin_subtest "decryption, --format=json"\r
+-output=$(notmuch show --format=json --decrypt subject:"test encrypted message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --decrypt subject:"test encrypted message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+@@ -235,7 +235,7 @@ test_expect_equal_file OUTPUT TESTATTACHMENT\r
+ test_begin_subtest "decryption failure with missing key"\r
+ mv "${GNUPGHOME}"{,.bak}\r
+ # The length of the encrypted attachment varies so must be normalized.\r
+-output=$(notmuch show --format=json --decrypt subject:"test encrypted message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --decrypt subject:"test encrypted message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|' \\r
+ | sed -e 's|"content-length": 6[1234567890]*|"content-length": 652|')\r
+@@ -272,7 +272,7 @@ test_expect_success 'emacs delivery of encrypted + signed message' \\r
+ "(mml-secure-message-sign-encrypt)"'\r
+ \r
+ test_begin_subtest "decryption + signature verification"\r
+-output=$(notmuch show --format=json --decrypt subject:"test encrypted message 002" \\r
++output=$(NOTMUCH_SHOW --format=json --decrypt subject:"test encrypted message 002" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+@@ -327,7 +327,7 @@ y\r
+ " \\r
+ | gpg --no-tty --quiet --command-fd 0 --armor --gen-revoke "0x${FINGERPRINT}!" 2>/dev/null \\r
+ | gpg --no-tty --quiet --import\r
+-output=$(notmuch show --format=json --verify subject:"test signed message 001" \\r
++output=$(NOTMUCH_SHOW --format=json --verify subject:"test signed message 001" \\r
+ | notmuch_json_show_sanitize \\r
+ | sed -e 's|"created": [1234567890]*|"created": 946728000|')\r
+ expected='[[[{"id": "XXXXX",\r
+diff --git a/test/T470-missing-headers.sh b/test/T470-missing-headers.sh\r
+index cb38301..c3ee430 100755\r
+--- a/test/T470-missing-headers.sh\r
++++ b/test/T470-missing-headers.sh\r
+@@ -94,7 +94,7 @@ Body\r
+ \f\r
+message}"\r
+ \r
+ test_begin_subtest "Show: json"\r
+-output=$(notmuch show --format=json '*' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json '*' | notmuch_json_show_sanitize)\r
+ expected=$(notmuch_json_show_sanitize <<EOF\r
+ [\r
+ [\r
+diff --git a/test/T510-thread-replies.sh b/test/T510-thread-replies.sh\r
+index 1392fbe..30ac39b 100755\r
+--- a/test/T510-thread-replies.sh\r
++++ b/test/T510-thread-replies.sh\r
+@@ -17,7 +17,7 @@ add_message '[id]="foo@one.com"' \\r
+ add_message '[in-reply-to]="mumble"' \\r
+ '[references]="<foo@one.com>"' \\r
+ '[subject]="Re: one"'\r
+-output=$(notmuch show --format=json 'subject:one' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json 'subject:one' | notmuch_json_show_sanitize)\r
+ expected='[[[{"id": "foo@one.com",\r
+ "match": true,\r
+ "excluded": false,\r
+@@ -51,7 +51,7 @@ add_message '[id]="foo@two.com"' \\r
+ add_message '[in-reply-to]="<bar@baz.com>"' \\r
+ '[references]="<foo@two.com>"' \\r
+ '[subject]="Re: two"'\r
+-output=$(notmuch show --format=json 'subject:two' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json 'subject:two' | notmuch_json_show_sanitize)\r
+ expected='[[[{"id": "foo@two.com",\r
+ "match": true, "excluded": false,\r
+ "filename": "YYYYY",\r
+@@ -80,7 +80,7 @@ add_message '[id]="foo@three.com"' \\r
+ '[subject]="three"'\r
+ add_message '[in-reply-to]="<foo@three.com>"' \\r
+ '[subject]="Re: three"'\r
+-output=$(notmuch show --format=json 'subject:three' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json 'subject:three' | notmuch_json_show_sanitize)\r
+ expected='[[[{"id": "foo@three.com", "match": true, "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["inbox", "unread"],\r
+@@ -109,7 +109,7 @@ add_message '[id]="bar@four.com"' \\r
+ add_message '[in-reply-to]="<baz@four.com>"' \\r
+ '[references]="<baz@four.com> <foo@four.com>"' \\r
+ '[subject]="neither"'\r
+-output=$(notmuch show --format=json 'subject:four' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json 'subject:four' | notmuch_json_show_sanitize)\r
+ expected='[[[{"id": "foo@four.com", "match": true, "excluded": false,\r
+ "filename": "YYYYY",\r
+ "timestamp": 978709437, "date_relative": "2001-01-05", "tags": ["inbox", "unread"],\r
+@@ -143,7 +143,7 @@ add_message '[id]="foo@five.com"' \\r
+ add_message '[id]="bar@five.com"' \\r
+ '[references]="<foo@five.com> (garbage)"' \\r
+ '[subject]="not-five"'\r
+-output=$(notmuch show --format=json 'subject:five' | notmuch_json_show_sanitize)\r
++output=$(NOTMUCH_SHOW --format=json 'subject:five' | notmuch_json_show_sanitize)\r
+ expected='[[[{"id": "XXXXX", "match": true, "excluded": false,\r
+ "filename": "YYYYY", "timestamp": 42, "date_relative": "2001-01-05",\r
+ "tags": ["inbox", "unread"], "headers": {"Subject": "five",\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 486d1c4..d30608a 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -669,6 +669,10 @@ NOTMUCH_NEW ()\r
+ notmuch new "${@}" | grep -v -E -e '^Processed [0-9]*( total)? file|Found [0-9]* total file'\r
+ }\r
+ \r
++NOTMUCH_SHOW () {\r
++ notmuch show --format-version=2 "${@}"\r
++}\r
++\r
+ notmuch_search_sanitize ()\r
+ {\r
+ perl -pe 's/("?thread"?: ?)("?)................("?)/\1\2XXX\3/'\r
+-- \r
+2.1.4\r
+\r
projects / notmuch-archives.git / commitdiff