show: Support --format-version

This commit is contained in:
Austin Clements 2012-12-15 22:17:25 -05:00 committed by David Bremner
parent 3152cf4b12
commit aecff2c9fd
2 changed files with 23 additions and 0 deletions

View file

@ -126,6 +126,15 @@ message.
.RE .RE
.RE .RE
.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 .RS 4
.TP 4 .TP 4
.B \-\-part=N .B \-\-part=N
@ -201,6 +210,17 @@ column of output from the
.B notmuch search .B notmuch search
command. 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 .SH SEE ALSO
\fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),

View file

@ -1066,6 +1066,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
{ "mbox", NOTMUCH_FORMAT_MBOX }, { "mbox", NOTMUCH_FORMAT_MBOX },
{ "raw", NOTMUCH_FORMAT_RAW }, { "raw", NOTMUCH_FORMAT_RAW },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 },
{ NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
(notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
{ "false", EXCLUDE_FALSE }, { "false", EXCLUDE_FALSE },
@ -1128,6 +1129,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))
break; break;
} }
notmuch_exit_if_unsupported_format ();
/* Default is entire-thread = FALSE except for format=json and /* Default is entire-thread = FALSE except for format=json and
* format=sexp. */ * format=sexp. */
if (entire_thread == ENTIRE_THREAD_DEFAULT) { if (entire_thread == ENTIRE_THREAD_DEFAULT) {