reply: Support --format-version

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

View file

@ -57,6 +57,16 @@ to create a reply message intelligently.
Only produces In\-Reply\-To, References, To, Cc, and Bcc headers. Only produces In\-Reply\-To, References, To, Cc, and Bcc headers.
.RE .RE
.RE .RE
.RS
.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 .RS
.TP 4 .TP 4
.BR \-\-reply\-to= ( all | sender ) .BR \-\-reply\-to= ( all | sender )
@ -99,6 +109,17 @@ formats do not.
.RE .RE
.RE .RE
.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

@ -733,6 +733,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
{ "sexp", FORMAT_SEXP }, { "sexp", FORMAT_SEXP },
{ "headers-only", FORMAT_HEADERS_ONLY }, { "headers-only", FORMAT_HEADERS_ONLY },
{ 0, 0 } } }, { 0, 0 } } },
{ NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 },
{ NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r', { NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r',
(notmuch_keyword_t []){ { "all", TRUE }, (notmuch_keyword_t []){ { "all", TRUE },
{ "sender", FALSE }, { "sender", FALSE },
@ -759,6 +760,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
reply_format_func = notmuch_reply_format_default; reply_format_func = notmuch_reply_format_default;
} }
notmuch_exit_if_unsupported_format ();
config = notmuch_config_open (ctx, NULL, NULL); config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL) if (config == NULL)
return 1; return 1;