--- /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 DD055431FB6\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:42 -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 UxQaiVbm9TFB for <notmuch@notmuchmail.org>;\r
+ Sat, 15 Dec 2012 19:17:42 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-3.mit.edu (DMZ-MAILSEC-SCANNER-3.MIT.EDU\r
+ [18.9.25.14])\r
+ by olra.theworths.org (Postfix) with ESMTP id 8F42E431FBD\r
+ for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 19:17:41 -0800 (PST)\r
+X-AuditID: 1209190e-b7f516d0000008e4-aa-50cd3d548867\r
+Received: from mailhub-auth-2.mit.edu ( [18.7.62.36])\r
+ by dmz-mailsec-scanner-3.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 73.C1.02276.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-2.mit.edu (8.13.8/8.9.2) with ESMTP id qBG3HdbT012438; \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 qBG3HbYW012058\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-0007c8-Mj; Sat, 15 Dec 2012 22:17:35 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/7] reply: Support --format-version\r
+Date: Sat, 15 Dec 2012 22:17:26 -0500\r
+Message-Id: <1355627849-29099-5-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+NgFtrLIsWRmVeSWpSXmKPExsUixG6nohtiezbA4NQOU4vVc3ksrt+cyezA\r
+ 5LFz1l12j2erbjEHMEVx2aSk5mSWpRbp2yVwZcz9NoOx4CFfRf/c5YwNjNe5uxg5OSQETCTe\r
+ /fzOCmGLSVy4t56ti5GLQ0hgH6PEyu1PGCGcDYwSBzecZYFwHjFJPOn5xw7hzGWUmDrjAjNI\r
+ P5uAhsS2/csZQWwRAWmJnXdng81lFnCU+Lx/ERuILQy0r7f3Glg9i4CqxNTVZ1hAbF4BB4kP\r
+ zX/YIO5QlOh+NgHM5gTq3bzlJ5gtBFQz+8hRtgmM/AsYGVYxyqbkVunmJmbmFKcm6xYnJ+bl\r
+ pRbpGuvlZpbopaaUbmIEhRKnJN8Oxq8HlQ4xCnAwKvHwWnw9EyDEmlhWXJl7iFGSg0lJlDfH\r
+ 8myAEF9SfkplRmJxRnxRaU5q8SFGCQ5mJRHepPlA5bwpiZVVqUX5MClpDhYlcd4rKTf9hQTS\r
+ E0tSs1NTC1KLYLIyHBxKErzMNkBDBYtS01Mr0jJzShDSTBycIMN5gIYrg9TwFhck5hZnpkPk\r
+ TzEqSonzSoEkBEASGaV5cL2wWH/FKA70ijCvBkgVDzBNwHW/AhrMBDR4uQ3I1cUliQgpqQbG\r
+ DR+Y+G/zHRF4uGLt2Uuqa/9nbRVouxhSPeHKT+VrQWW1soUNy3dd+toyl8OIZ2PW6+b7nzkv\r
+ rgt9cCVozfRNE0pc1aX1tpbd2n5k4pof4stDOBev22R653+IgFH7zLhK9+n7WQwa5k4Xiut6\r
+ VmftsuL+PE4vyy+Tyl/KuO7/wdF1xGymeLLhSyWW4oxEQy3mouJEABX4TXjQAgAA\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:43 -0000\r
+\r
+---\r
+ man/man1/notmuch-reply.1 | 21 +++++++++++++++++++++\r
+ notmuch-reply.c | 3 +++\r
+ 2 files changed, 24 insertions(+)\r
+\r
+diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1\r
+index fa04c9e..9fa1956 100644\r
+--- a/man/man1/notmuch-reply.1\r
++++ b/man/man1/notmuch-reply.1\r
+@@ -57,6 +57,16 @@ to create a reply message intelligently.\r
+ Only produces In\-Reply\-To, References, To, Cc, and Bcc headers.\r
+ .RE\r
+ .RE\r
++\r
++.RS\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\r
+ .TP 4\r
+ .BR \-\-reply\-to= ( all | sender )\r
+@@ -99,6 +109,17 @@ formats do not.\r
+ .RE\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-reply.c b/notmuch-reply.c\r
+index 720749d..22c58ff 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -733,6 +733,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ { "sexp", FORMAT_SEXP },\r
+ { "headers-only", FORMAT_HEADERS_ONLY },\r
+ { 0, 0 } } },\r
++ { NOTMUCH_OPT_INT, ¬much_format_version, "format-version", 0, 0 },\r
+ { NOTMUCH_OPT_KEYWORD, &reply_all, "reply-to", 'r',\r
+ (notmuch_keyword_t []){ { "all", TRUE },\r
+ { "sender", FALSE },\r
+@@ -759,6 +760,8 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])\r
+ reply_format_func = notmuch_reply_format_default;\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
projects / notmuch-archives.git / commitdiff