[PATCH v2 0/8] Rewrite JSON show format

diff --git a/52/535fc0e59d23c33687120c6557c5ad90107edf b/52/535fc0e59d23c33687120c6557c5ad90107edf
new file mode 100644 (file)
index 0000000..412e747
--- /dev/null
+++ b/52/535fc0e59d23c33687120c6557c5ad90107edf
@@ -0,0 +1,118 @@
+Return-Path: <amthrax@drake.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 9D74D431FD0\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:39 -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 s1RnsWkSjHje for <notmuch@notmuchmail.org>;\r
+       Sun, 19 Feb 2012 16:26:38 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU\r
+       [18.9.25.13])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6611C431FC2\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 16:26:36 -0800 (PST)\r
+X-AuditID: 1209190d-b7fbf6d0000008ba-c9-4f41933b2ae1\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 9E.44.02234.B33914F4; Sun, 19 Feb 2012 19:26:35 -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 q1K0QYZe016442; \r
+       Sun, 19 Feb 2012 19:26:35 -0500\r
+Received: from drake.mit.edu\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 q1K0QXV0000297\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 19 Feb 2012 19:26:34 -0500 (EST)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1RzH5N-0001yA-5N; Sun, 19 Feb 2012 19:26:33 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 0/8] Rewrite JSON show format\r
+Date: Sun, 19 Feb 2012 19:26:22 -0500\r
+Message-Id: <1329697590-7404-1-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.7.3\r
+In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+References: <1329240823-7856-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGs92dHfYMYiA4vrN2cyW7xZOY/V\r
+       gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4sesgY8F23oozrd9ZGhg3cXYxcnBICJhI\r
+       XJko1cXICWSKSVy4t56ti5GLQ0hgH6PErR23oZwNjBLfjvxggnDuM0nc3nyFBcKZzyixtK2b\r
+       HaSfTUBDYtv+5YwgtoiAtMTOu7NZQVYwA81tnxcCEhYWMJA4sfoUK4jNIqAq8au9hwnE5hWw\r
+       lzjXdJkN4gwFiXOrz4GN5BRwkNi/7z9YvRBQzaW7W1kmMPIvYGRYxSibklulm5uYmVOcmqxb\r
+       nJyYl5dapGukl5tZopeaUrqJERxIkrw7GN8dVDrEKMDBqMTDK1nm4C/EmlhWXJl7iFGSg0lJ\r
+       lPfUBEd/Ib6k/JTKjMTijPii0pzU4kOMEhzMSiK8C+yBcrwpiZVVqUX5MClpDhYlcV5VrXd+\r
+       QgLpiSWp2ampBalFMFkZDg4lCd6GSUCNgkWp6akVaZk5JQhpJg5OkOE8QMNng9TwFhck5hZn\r
+       pkPkTzEqSonz1oMkBEASGaV5cL2wSH/FKA70ijBvGkgVDzBJwHW/AhrMBDSYV8gOZHBJIkJK\r
+       qoHxfNpRyf/1bVMy31RHlruYnmhJU9FVqZ94dKbLrVnrNA7Pcp+e/m4is8rCJ262Nx8oy0wL\r
+       Lj3BcvzAS7nPT0SZJFid62O9DZyWL7j43nn2ot5v6xvOGdz0UtCenV3g+Nj3iXoqZ9W9RefT\r
+       JfkED4utOux4YfO3K+sas5aYNXz9f+7lS+6gnJ27lViKMxINtZiLihMB8mnMIc8CAAA=\r
+Cc: tomi.ollila@iki.fi\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: Mon, 20 Feb 2012 00:26:40 -0000\r
+\r
+v2 fixes some trivial whitespace issues in devel/schemata [1] and\r
+beefs up one of the explanations in devel/schemata.  None of the other\r
+patches have changed, so I'm marking this ready.\r
+\r
+As a teaser, I've got mbox and raw converted to the new style, too, so\r
+as soon as this goes in I'll send those patches (they aren't actually\r
+dependent, but do share some diff context with this one).\r
+\r
+diff from v1 to v2:\r
+\r
+diff --git a/devel/schemata b/devel/schemata\r
+index d90d4c6..24ad775 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -71,7 +71,10 @@ part = {\r
+     # otherwise (leaf parts):\r
+     filename?:      string,\r
+     content-charset?: string,\r
+-    content?:       string    # pre-fetched body content\r
++    # A leaf part's body content is optional, but may be included if\r
++    # it can be correctly encoded as a string.  Consumers should use\r
++    # this in preference to fetching the part content separately.\r
++    content?:       string\r
+ }\r
+ \r
+ # The headers of a message (format_headers_json with raw headers) or\r
+@@ -101,7 +104,7 @@ signature = {\r
+     userid?:        string\r
+     # if status is not "good":\r
+     keyid?:         string\r
+-    # if the signature has errors:    \r
++    # if the signature has errors:\r
+     errors?:        int\r
+ }\r
+ \r
+@@ -129,7 +132,7 @@ thread = {\r
+     date_relative:  string,   # user-friendly timestamp\r
+     matched:        int,      # number of matched messages\r
+     total:          int,      # total messages in thread\r
+-    authors:        string,   # comma-separated names with | between \r
++    authors:        string,   # comma-separated names with | between\r
+                               # matched and unmatched\r
+     subject:        string\r
+ }\r
+\r