From: Austin Clements Date: Sun, 16 Dec 2012 03:17:25 +0000 (+1900) Subject: [PATCH 3/7] show: Support --format-version X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=8642ca9f753e3af26d2a69784d41127437192fa4;p=notmuch-archives.git [PATCH 3/7] show: Support --format-version --- diff --git a/70/3fe82b513b72b446a293272bd77c833941884a b/70/3fe82b513b72b446a293272bd77c833941884a new file mode 100644 index 000000000..80463e567 --- /dev/null +++ b/70/3fe82b513b72b446a293272bd77c833941884a @@ -0,0 +1,139 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C1A11431FBD + for ; Sat, 15 Dec 2012 19:17:52 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id fgCAJWSlXnHE for ; + Sat, 15 Dec 2012 19:17:51 -0800 (PST) +Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU + [18.7.68.37]) + by olra.theworths.org (Postfix) with ESMTP id D8C16431FD2 + for ; Sat, 15 Dec 2012 19:17:50 -0800 (PST) +X-AuditID: 12074425-b7f606d0000008ea-c0-50cd3d5ebb32 +Received: from mailhub-auth-2.mit.edu ( [18.7.62.36]) + by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP + id F6.74.02282.E5D3DC05; Sat, 15 Dec 2012 22:17:50 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBG3Hdap012439; + Sat, 15 Dec 2012 22:17:39 -0500 +Received: from drake.dyndns.org + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBG3HaA8012057 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sat, 15 Dec 2012 22:17:39 -0500 (EST) +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1Tk4jP-0007c6-LF; Sat, 15 Dec 2012 22:17:35 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH 3/7] show: Support --format-version +Date: Sat, 15 Dec 2012 22:17:25 -0500 +Message-Id: <1355627849-29099-4-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1355627849-29099-1-git-send-email-amdragon@mit.edu> +References: <1355627849-29099-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nohtnezbA4N9KeYvVc3ksrt+cyezA + 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZVzZX1Dwm69ix9VLLA2Mz7i7GDk5JARMJO4u + mMIKYYtJXLi3nq2LkYtDSGAfo8T6pk4WCGcDo8ThCS/YQKqEBB4xSbR1KkMk5jJKrHjzgQkk + wSagIbFt/3JGEFtEQFpi593ZYGOZBRwlPu9fBNYsLGAsMe3SfbAaFgFViZU/HzGD2LwCDhJH + Wn+xQJyhKNH9bAJYPSdQ7+YtP6EWO0jMPnKUbQIj/wJGhlWMsim5Vbq5iZk5xanJusXJiXl5 + qUW6Fnq5mSV6qSmlmxjBYeSiuoNxwiGlQ4wCHIxKPLwWX88ECLEmlhVX5h5ilORgUhLlzbE8 + GyDEl5SfUpmRWJwRX1Sak1p8iFGCg1lJhDdpPlA5b0piZVVqUT5MSpqDRUmc90bKTX8hgfTE + ktTs1NSC1CKYrAwHh5IE7y4boKGCRanpqRVpmTklCGkmDk6Q4TxAw+eB1PAWFyTmFmemQ+RP + MSpKifPOAkkIgCQySvPgemFx/opRHOgVYd6FIFU8wBQB1/0KaDAT0ODlNiBXF5ckIqSkGhj3 + /P259HrgbYvN7Zf/xX9kr7LJ5eCRqWPuadhku8Hn/qsPklUtj8pmrmIxVP7xqvyn2iFv56tN + t68yThL9ddPFxJ4/QC1BLuHwgu+zm2pq9292rdjbvWIbb4rHm1+GafHJW97atU7XW70i7s6C + Czwnl6zOzelapPT5jsrpH2dk5v3gTjz0R+y4EktxRqKhFnNRcSIAhkfgu84CAAA= +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sun, 16 Dec 2012 03:17:53 -0000 + +--- + 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 +