--- /dev/null
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id C1A11431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id fgCAJWSlXnHE for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 19:17:51 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+ [18.7.68.37])\r
+ by olra.theworths.org (Postfix) with ESMTP id D8C16431FD2\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:50 -0800 (PST)\r
+X-AuditID: 12074425-b7f606d0000008ea-c0-50cd3d5ebb32\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id F6.74.02282.E5D3DC05; Sat, 15 Dec 2012 22:17:50 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBG3Hdap012439; \r
+ Sat, 15 Dec 2012 22:17:39 -0500\r
+Received: from drake.dyndns.org\r
+ (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+ [209.6.116.242]) (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qBG3HaA8012057\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 15 Dec 2012 22:17:39 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Tk4jP-0007c6-LF; Sat, 15 Dec 2012 22:17:35 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 3/7] show: Support --format-version\r
+Date: Sat, 15 Dec 2012 22:17:25 -0500\r
+Message-Id: <1355627849-29099-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1355627849-29099-1-git-send-email-amdragon@mit.edu>\r
+References: <1355627849-29099-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsUixG6nohtnezbA4N9KeYvVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZVzZX1Dwm69ix9VLLA2Mz7i7GDk5JARMJO4u\r
+ mMIKYYtJXLi3nq2LkYtDSGAfo8T6pk4WCGcDo8ThCS/YQKqEBB4xSbR1KkMk5jJKrHjzgQkk\r
+ wSagIbFt/3JGEFtEQFpi593ZYGOZBRwlPu9fBNYsLGAsMe3SfbAaFgFViZU/HzGD2LwCDhJH\r
+ Wn+xQJyhKNH9bAJYPSdQ7+YtP6EWO0jMPnKUbQIj/wJGhlWMsim5Vbq5iZk5xanJusXJiXl5\r
+ qUW6Fnq5mSV6qSmlmxjBYeSiuoNxwiGlQ4wCHIxKPLwWX88ECLEmlhVX5h5ilORgUhLlzbE8\r
+ GyDEl5SfUpmRWJwRX1Sak1p8iFGCg1lJhDdpPlA5b0piZVVqUT5MSpqDRUmc90bKTX8hgfTE\r
+ ktTs1NSC1CKYrAwHh5IE7y4boKGCRanpqRVpmTklCGkmDk6Q4TxAw+eB1PAWFyTmFmemQ+RP\r
+ MSpKifPOAkkIgCQySvPgemFx/opRHOgVYd6FIFU8wBQB1/0KaDAT0ODlNiBXF5ckIqSkGhj3\r
+ /P259HrgbYvN7Zf/xX9kr7LJ5eCRqWPuadhku8Hn/qsPklUtj8pmrmIxVP7xqvyn2iFv56tN\r
+ t68yThL9ddPFxJ4/QC1BLuHwgu+zm2pq9292rdjbvWIbb4rHm1+GafHJW97atU7XW70i7s6C\r
+ Czwnl6zOzelapPT5jsrpH2dk5v3gTjz0R+y4EktxRqKhFnNRcSIAhkfgu84CAAA=\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 16 Dec 2012 03:17:53 -0000\r
+\r
+---\r
+ man/man1/notmuch-show.1 | 20 ++++++++++++++++++++\r
+ notmuch-show.c | 3 +++\r
+ 2 files changed, 23 insertions(+)\r
+\r
+diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+index bd41c48..44cec46 100644\r
+--- a/man/man1/notmuch-show.1\r
++++ b/man/man1/notmuch-show.1\r
+@@ -128,6 +128,15 @@ message.\r
+ \r
+ .RS 4\r
+ .TP 4\r
++.BR \-\-format-version=N\r
++\r
++Use the specified structured output format version. This is intended\r
++for programs that invoke \fBnotmuch\fR(1) internally. If omitted, the\r
++latest supported version will be used.\r
++.RE\r
++\r
++.RS 4\r
++.TP 4\r
+ .B \-\-part=N\r
+ \r
+ Output the single decoded MIME part N of a single message. The search\r
+@@ -201,6 +210,17 @@ column of output from the\r
+ .B notmuch search\r
+ command.\r
+ \r
++.SH EXIT STATUS\r
++\r
++This command supports the following special exit status codes\r
++\r
++.TP\r
++.B 20\r
++The requested format version is too old.\r
++.TP\r
++.B 21\r
++The requested format version is too new.\r
++\r
+ .SH SEE ALSO\r
+ \r
+ \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1),\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index a83fef9..39faf21 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -1066,6 +1066,7 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ { "mbox", NOTMUCH_FORMAT_MBOX },\r
+ { "raw", NOTMUCH_FORMAT_RAW },\r
+ { 0, 0 } } },\r
++ { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 },\r
+ { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',\r
+ (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+ { "false", EXCLUDE_FALSE },\r
+@@ -1128,6 +1129,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ break;\r
+ }\r
+ \r
++ notmuch_exit_if_unsupported_format ();\r
++\r
+ /* Default is entire-thread = FALSE except for format=json and\r
+ * format=sexp. */\r
+ if (entire_thread == ENTIRE_THREAD_DEFAULT) {\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff