From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 7/7] emacs: Use --format-version for search, show, and reply
Date: Sat, 15 Dec 2012 22:17:29 -0500 [thread overview]
Message-ID: <1355627849-29099-8-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1355627849-29099-1-git-send-email-amdragon@mit.edu>
---
emacs/notmuch-mua.el | 2 +-
emacs/notmuch-query.el | 2 +-
emacs/notmuch.el | 6 +++++-
test/emacs | 2 +-
test/emacs-show | 2 +-
5 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index ac2d29e..24eebff 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -146,7 +146,7 @@ list."
(unless (bolp) (insert "\n")))
(defun notmuch-mua-reply (query-string &optional sender reply-all)
- (let ((args '("reply" "--format=json"))
+ (let ((args '("reply" "--format=json" "--format-version=1"))
reply
original)
(when notmuch-show-process-crypto
diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el
index e7e3520..6e9f406 100644
--- a/emacs/notmuch-query.el
+++ b/emacs/notmuch-query.el
@@ -29,7 +29,7 @@ A thread is a forest or list of trees. A tree is a two element
list where the first element is a message, and the second element
is a possibly empty forest of replies.
"
- (let ((args '("show" "--format=json")))
+ (let ((args '("show" "--format=json" "--format-version=1")))
(if notmuch-show-process-crypto
(setq args (append args '("--decrypt"))))
(setq args (append args search-terms))
diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index b0fd387..63387a2 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -650,6 +650,10 @@ of the result."
(insert "Incomplete search results (search process was killed).\n"))
(when (eq status 'exit)
(insert "End of search results.\n")
+ ;; For version mismatch, there's no point in
+ ;; showing the search buffer
+ (when (or (= exit-status 20) (= exit-status 21))
+ (kill-buffer))
(condition-case nil
(notmuch-check-async-exit-status proc msg)
;; Suppress the error signal since strange
@@ -935,7 +939,7 @@ Other optional parameters are used as follows:
(let ((proc (start-process
"notmuch-search" buffer
notmuch-command "search"
- "--format=json"
+ "--format=json" "--format-version=1"
(if oldest-first
"--sort=oldest-first"
"--sort=newest-first")
diff --git a/test/emacs b/test/emacs
index 5067d67..6b18968 100755
--- a/test/emacs
+++ b/test/emacs
@@ -873,7 +873,7 @@ This is output
Error: Unexpected output from notmuch search:
This is an error
End of search results.
-Error invoking notmuch. $PWD/notmuch_fail search --format=json --sort=newest-first tag:inbox exited with status 1."
+Error invoking notmuch. $PWD/notmuch_fail search --format=json --format-version=1 --sort=newest-first tag:inbox exited with status 1."
test_done
diff --git a/test/emacs-show b/test/emacs-show
index 40fab61..ebf530b 100755
--- a/test/emacs-show
+++ b/test/emacs-show
@@ -178,7 +178,7 @@ test_emacs "(let ((notmuch-command \"$PWD/notmuch_fail\"))
(with-current-buffer \"*Notmuch errors*\"
(test-output \"ERROR\")))"
test_expect_equal "$(cat OUTPUT ERROR)" "\
-Error invoking notmuch. $PWD/notmuch_fail show --format=json --exclude=false ' * ' exited with status 1.
+Error invoking notmuch. $PWD/notmuch_fail show --format=json --format-version=1 --exclude=false ' * ' exited with status 1.
Error:
This is an error
Output:
--
1.7.10.4
next prev parent reply other threads:[~2012-12-16 3:17 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-16 3:17 [PATCH 0/7] Structed output versioning support Austin Clements
2012-12-16 3:17 ` [PATCH 1/7] cli: Framework for structured output versioning Austin Clements
2012-12-16 21:39 ` David Bremner
2012-12-16 3:17 ` [PATCH 2/7] search: Support --format-version Austin Clements
2012-12-16 3:17 ` [PATCH 3/7] show: " Austin Clements
2012-12-16 3:17 ` [PATCH 4/7] reply: " Austin Clements
2012-12-16 3:17 ` [PATCH 5/7] test: Sanity tests for the --format-version argument Austin Clements
2012-12-16 3:17 ` [PATCH 6/7] emacs: Special handling for version mismatch errors Austin Clements
2012-12-16 3:17 ` Austin Clements [this message]
2012-12-16 4:03 ` [PATCH 0/7] Structed output versioning support Tomi Ollila
2012-12-16 7:42 ` Mark Walters
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=1355627849-29099-8-git-send-email-amdragon@mit.edu \
--to=amdragon@mit.edu \
--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).