From: Austin Clements <amdragon@MIT.EDU>
To: notmuch@notmuchmail.org
Subject: [PATCH 3/7] show: Support --format-version
Date: Sat, 15 Dec 2012 22:17:25 -0500 [thread overview]
Message-ID: <1355627849-29099-4-git-send-email-amdragon@mit.edu> (raw)
In-Reply-To: <1355627849-29099-1-git-send-email-amdragon@mit.edu>
---
man/man1/notmuch-show.1 | 20 ++++++++++++++++++++
notmuch-show.c | 3 +++
2 files changed, 23 insertions(+)
diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
index bd41c48..44cec46 100644
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -128,6 +128,15 @@ message.
.RS 4
.TP 4
+.BR \-\-format-version=N
+
+Use the specified structured output format version. This is intended
+for programs that invoke \fBnotmuch\fR(1) internally. If omitted, the
+latest supported version will be used.
+.RE
+
+.RS 4
+.TP 4
.B \-\-part=N
Output the single decoded MIME part N of a single message. The search
@@ -201,6 +210,17 @@ column of output from the
.B notmuch search
command.
+.SH EXIT STATUS
+
+This command supports the following special exit status codes
+
+.TP
+.B 20
+The requested format version is too old.
+.TP
+.B 21
+The requested format version is too new.
+
.SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),
diff --git a/notmuch-show.c b/notmuch-show.c
index a83fef9..39faf21 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -1066,6 +1066,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
{ "mbox", NOTMUCH_FORMAT_MBOX },
{ "raw", NOTMUCH_FORMAT_RAW },
{ 0, 0 } } },
+ { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 },
{ NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
(notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
{ "false", EXCLUDE_FALSE },
@@ -1128,6 +1129,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
break;
}
+ notmuch_exit_if_unsupported_format ();
+
/* Default is entire-thread = FALSE except for format=json and
* format=sexp. */
if (entire_thread == ENTIRE_THREAD_DEFAULT) {
--
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 ` Austin Clements [this message]
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 ` [PATCH 7/7] emacs: Use --format-version for search, show, and reply Austin Clements
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-4-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).