[PATCH 2/7] search: Support --format-version

diff --git a/fd/da17e4b375ab03f1266c1a073ac8fc256f2f17 b/fd/da17e4b375ab03f1266c1a073ac8fc256f2f17
new file mode 100644 (file)
index 0000000..5fa6679
--- /dev/null
+++ b/fd/da17e4b375ab03f1266c1a073ac8fc256f2f17
@@ -0,0 +1,139 @@
+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 3FDAE431FBD\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:41 -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 IM4BuGEOIYA1 for <notmuch@notmuchmail.org>;\r
+       Sat, 15 Dec 2012 19:17:40 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-1.mit.edu (DMZ-MAILSEC-SCANNER-1.MIT.EDU\r
+       [18.9.25.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 86836431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:40 -0800 (PST)\r
+X-AuditID: 1209190c-b7f886d000000936-19-50cd3d547475\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-1.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 98.59.02358.45D3DC05; Sat, 15 Dec 2012 22:17:40 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qBG3HcIg020941; \r
+       Sat, 15 Dec 2012 22:17:38 -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 qBG3Hauw012056\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 15 Dec 2012 22:17:38 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1Tk4jP-0007c3-J5; Sat, 15 Dec 2012 22:17:35 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/7] search: Support --format-version\r
+Date: Sat, 15 Dec 2012 22:17:24 -0500\r
+Message-Id: <1355627849-29099-3-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+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrRtiezbAYO5pDovVc3ksrt+cyezA\r
+       5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZczfe4yp4C5/ReOeT8wNjCd4uhg5OSQETCTe\r
+       XjrGAmGLSVy4t56ti5GLQ0hgH6PEpvl7GSGcDYwSu96fgXIeMUl8/HaaGcKZyyhxp/ssM0g/\r
+       m4CGxLb9yxlBbBEBaYmdd2ezgtjMAo4Sn/cvYgOxhQVMJQ53LAWrZxFQlfix8ykTiM0r4CDR\r
+       vaeNDeIORYnuZxPAbE6g3s1bfoLZQkA1s48cZZvAyL+AkWEVo2xKbpVubmJmTnFqsm5xcmJe\r
+       XmqRrqFebmaJXmpK6SZGcChJ8uxgfHNQ6RCjAAejEg+vxdczAUKsiWXFlbmHGCU5mJREeXMs\r
+       zwYI8SXlp1RmJBZnxBeV5qQWH2KU4GBWEuFNmg9UzpuSWFmVWpQPk5LmYFES572cctNfSCA9\r
+       sSQ1OzW1ILUIJivDwaEkwctsAzRUsCg1PbUiLTOnBCHNxMEJMpwHaLgySA1vcUFibnFmOkT+\r
+       FKOilDjvU2ughABIIqM0D64XFuuvGMWBXhHm1QBp5wGmCbjuV0CDmYAGL7cBubq4JBEhJdXA\r
+       uPDVy+JTR3fPuGg0591zvwPPvSTLfL971NudStGL0fey+32o+2nyG2b9E5sbNh+xZbx3RcHi\r
+       0YwJcsKCdw/Whil6/U3ZZLximeb1L5u+ec2tsX6ezPxjQYnOzrSay0E7mHvX7qwxqne4uWtJ\r
+       341H8xm2fTkXZXVKe/3nvaw3bzceYDblvnj3p60SS3FGoqEWc1FxIgDB24vw0AIAAA==\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:41 -0000\r
+\r
+---\r
+ man/man1/notmuch-search.1 |   20 ++++++++++++++++++++\r
+ notmuch-search.c          |    3 +++\r
+ 2 files changed, 23 insertions(+)\r
+\r
+diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1\r
+index 0aff348..5c771fa 100644\r
+--- a/man/man1/notmuch-search.1\r
++++ b/man/man1/notmuch-search.1\r
+@@ -32,6 +32,15 @@ Presents the results in either JSON, S-Expressions or plain-text (default).\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 \-\-output=(summary|threads|messages|files|tags)\r
+ \r
+ .RS 4\r
+@@ -126,6 +135,17 @@ In this case all matching threads are returned but the "match count"\r
+ is the number of matching non-excluded messages in the thread.\r
+ .RE\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-search.c b/notmuch-search.c\r
+index 6218622..7704915 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -318,6 +318,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+                                 { "sexp", NOTMUCH_FORMAT_SEXP },\r
+                                 { "text", NOTMUCH_FORMAT_TEXT },\r
+                                 { 0, 0 } } },\r
++      { NOTMUCH_OPT_INT, &notmuch_format_version, "format-version", 0, 0 },\r
+       { NOTMUCH_OPT_KEYWORD, &output, "output", 'o',\r
+         (notmuch_keyword_t []){ { "summary", OUTPUT_SUMMARY },\r
+                                 { "threads", OUTPUT_THREADS },\r
+@@ -356,6 +357,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[])\r
+       INTERNAL_ERROR("no output format selected");\r
+     }\r
+ \r
++    notmuch_exit_if_unsupported_format ();\r
++\r
+     config = notmuch_config_open (ctx, NULL, NULL);\r
+     if (config == NULL)\r
+       return 1;\r
+-- \r
+1.7.10.4\r
+\r