--- /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 55EA9431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Dec 2012 18:40:15 -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 Xmh9k2ANhgx8 for <notmuch@notmuchmail.org>;\r
+ Sat, 1 Dec 2012 18:40:14 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-4.mit.edu (DMZ-MAILSEC-SCANNER-4.MIT.EDU\r
+ [18.9.25.15])\r
+ by olra.theworths.org (Postfix) with ESMTP id C1895431FC0\r
+ for <notmuch@notmuchmail.org>; Sat, 1 Dec 2012 18:40:13 -0800 (PST)\r
+X-AuditID: 1209190f-b7fec6d00000090d-88-50babf8cdec6\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 8F.F5.02317.C8FBAB05; Sat, 1 Dec 2012 21:40:12 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id qB22eCdv013713; \r
+ Sat, 1 Dec 2012 21:40:12 -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 qB22e61V025596\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Sat, 1 Dec 2012 21:40:10 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1TezTR-0000xV-SV; Sat, 01 Dec 2012 21:40:05 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 03/10] show: Support --use-schema\r
+Date: Sat, 1 Dec 2012 21:39:55 -0500\r
+Message-Id: <1354416002-3557-3-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+References: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrIIsWRmVeSWpSXmKPExsUixCmqrNuzf1eAwYVtFhbXb85kdmD0eLbq\r
+ FnMAYxSXTUpqTmZZapG+XQJXxu2LXcwFt4Qr+o8XNzDe4O9i5OSQEDCR2PStlw3CFpO4cG89\r
+ kM3FISSwj1Hi+9xXrBDOekaJBxfWMUI4D5kkjveuYoFw5jJKnH86hR2kn01AQ2Lb/uWMILaI\r
+ gLTEzruzgdo5OJgF1CT+dKmAhIUFDCW2PG4HK2cRUJV4eP8MC4jNK2Av8eTBARaIMxQlup9N\r
+ YANp5RRwkFjRzQMSFgIq+f/7GtsERv4FjAyrGGVTcqt0cxMzc4pTk3WLkxPz8lKLdE30cjNL\r
+ 9FJTSjcxgkNGkn8H47eDSocYBTgYlXh4GWftChBiTSwrrsw9xCjJwaQkyntlB1CILyk/pTIj\r
+ sTgjvqg0J7X4EKMEB7OSCC+LCVCONyWxsiq1KB8mJc3BoiTOezXlpr+QQHpiSWp2ampBahFM\r
+ VoaDQ0mCt3ofUKNgUWp6akVaZk4JQpqJgxNkOA/Q8Ed7QYYXFyTmFmemQ+RPMSpKifNeA0kI\r
+ gCQySvPgemEx/YpRHOgVYV5PkBU8wHQA1/0KaDAT0OA3y7aDDC5JREhJNTBWN398sqLlomNB\r
+ 0NVIVi7F4t9xK4+ecuq6xXE37MQMixs2DMdDfhfIar1caeEtcrJbxnLJhcM+yzXUKhVl1mtd\r
+ +ZPleb/x8TtP+50xDI4FdZxtC1/u+PlgRbzmHsk1sactZs3/LtAW8nMb0zbmdSY/j+rfe/D/\r
+ zIcH25dcNpzm4qPzNTlE8+EMJZbijERDLeai4kQAIttqPcQCAAA=\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, 02 Dec 2012 02:40:15 -0000\r
+\r
+---\r
+ man/man1/notmuch-show.1 | 20 ++++++++++++++++++++\r
+ notmuch-client.h | 2 ++\r
+ notmuch-show.c | 3 +++\r
+ 3 files changed, 25 insertions(+)\r
+\r
+diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1\r
+index 4481f21..e2fd0c2 100644\r
+--- a/man/man1/notmuch-show.1\r
++++ b/man/man1/notmuch-show.1\r
+@@ -108,6 +108,15 @@ message.\r
+ \r
+ .RS 4\r
+ .TP 4\r
++.BR \-\-use-schema=N\r
++\r
++Use the specified structured output schema 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
+@@ -181,6 +190,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 schema version is too old.\r
++.TP\r
++.B 21\r
++The requested schema 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-client.h b/notmuch-client.h\r
+index 95c4dd7..d931bbf 100644\r
+--- a/notmuch-client.h\r
++++ b/notmuch-client.h\r
+@@ -142,6 +142,8 @@ chomp_newline (char *str)\r
+ #define NOTMUCH_SCHEMA_CUR 1\r
+ /* The minimum schema version supported by the "search" command. */\r
+ #define NOTMUCH_SCHEMA_SEARCH 1\r
++/* The minimum schema version supported by the "show" command. */\r
++#define NOTMUCH_SCHEMA_SHOW 1\r
+ \r
+ /* The schema version requested by the caller on the command line. If\r
+ * no schema version is requested, this should be set to\r
+diff --git a/notmuch-show.c b/notmuch-show.c\r
+index 2fa2292..9d1f7c7 100644\r
+--- a/notmuch-show.c\r
++++ b/notmuch-show.c\r
+@@ -1059,6 +1059,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_schema_version, "use-schema", 0, 0 },\r
+ { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x',\r
+ (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE },\r
+ { "false", EXCLUDE_FALSE },\r
+@@ -1118,6 +1119,8 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[]))\r
+ break;\r
+ }\r
+ \r
++ notmuch_exit_if_unsupported_schema ("show", NOTMUCH_SCHEMA_SHOW);\r
++\r
+ /* Default is entire-thread = FALSE except for format=json. */\r
+ if (entire_thread == ENTIRE_THREAD_DEFAULT) {\r
+ if (format == &format_json)\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / blobdiff