show: Support --format-version

diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1
index bd41c48af2d0588d88609df940aab9248bed1c77..44cec46d571b6b5921d9b966ab8209048ee7f16c 100644 (file)
--- a/man/man1/notmuch-show.1
+++ b/man/man1/notmuch-show.1
@@ -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
 .TP 4
 .B \-\-part=N
 .RS 4
 .TP 4
 .B \-\-part=N


@@ -201,6 +210,17 @@ column of output from the
 .B notmuch search
 command.
 
 .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),
 .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 a83fef9362bc548b80ae14937822cc47c1e6fdbb..39faf218f1a00d65ce629f05c2ecdbe2c732dd1c 100644 (file)
--- 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 } } },
                                  { "mbox", NOTMUCH_FORMAT_MBOX },
                                  { "raw", NOTMUCH_FORMAT_RAW },
                                  { 0, 0 } } },

+       { NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 },

        { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',
          (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },
                                  { "false", EXCLUDE_FALSE },
        { 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;
     }
 
        break;
     }
 

+    notmuch_exit_if_unsupported_format ();
+

     /* Default is entire-thread = FALSE except for format=json and
      * format=sexp. */
     if (entire_thread == ENTIRE_THREAD_DEFAULT) {
     /* Default is entire-thread = FALSE except for format=json and
      * format=sexp. */
     if (entire_thread == ENTIRE_THREAD_DEFAULT) {