From 0601921f397c38cf6851ef31567d0fab9f68320e Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Mon, 20 Feb 2012 19:26:22 +1900 Subject: [PATCH] [PATCH v2 0/8] Rewrite JSON show format --- 52/535fc0e59d23c33687120c6557c5ad90107edf | 118 ++++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 52/535fc0e59d23c33687120c6557c5ad90107edf diff --git a/52/535fc0e59d23c33687120c6557c5ad90107edf b/52/535fc0e59d23c33687120c6557c5ad90107edf new file mode 100644 index 000000000..412e74790 --- /dev/null +++ b/52/535fc0e59d23c33687120c6557c5ad90107edf @@ -0,0 +1,118 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 9D74D431FD0 + for ; Sun, 19 Feb 2012 16:26:39 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id s1RnsWkSjHje for ; + Sun, 19 Feb 2012 16:26:38 -0800 (PST) +Received: from dmz-mailsec-scanner-2.mit.edu (DMZ-MAILSEC-SCANNER-2.MIT.EDU + [18.9.25.13]) + by olra.theworths.org (Postfix) with ESMTP id 6611C431FC2 + for ; Sun, 19 Feb 2012 16:26:36 -0800 (PST) +X-AuditID: 1209190d-b7fbf6d0000008ba-c9-4f41933b2ae1 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 9E.44.02234.B33914F4; Sun, 19 Feb 2012 19:26:35 -0500 (EST) +Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1K0QYZe016442; + Sun, 19 Feb 2012 19:26:35 -0500 +Received: from drake.mit.edu + (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [209.6.116.242]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1K0QXV0000297 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Sun, 19 Feb 2012 19:26:34 -0500 (EST) +Received: from amthrax by drake.mit.edu with local (Exim 4.77) + (envelope-from ) + id 1RzH5N-0001yA-5N; Sun, 19 Feb 2012 19:26:33 -0500 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 0/8] Rewrite JSON show format +Date: Sun, 19 Feb 2012 19:26:22 -0500 +Message-Id: <1329697590-7404-1-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.7.7.3 +In-Reply-To: <1329240823-7856-1-git-send-email-amdragon@mit.edu> +References: <1329240823-7856-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrGs92dHfYMYiA4vrN2cyW7xZOY/V + gcnj8NeFLB7PVt1iDmCK4rJJSc3JLEst0rdL4Mo4sesgY8F23oozrd9ZGhg3cXYxcnBICJhI + XJko1cXICWSKSVy4t56ti5GLQ0hgH6PErR23oZwNjBLfjvxggnDuM0nc3nyFBcKZzyixtK2b + HaSfTUBDYtv+5YwgtoiAtMTOu7NZQVYwA81tnxcCEhYWMJA4sfoUK4jNIqAq8au9hwnE5hWw + lzjXdJkN4gwFiXOrz4GN5BRwkNi/7z9YvRBQzaW7W1kmMPIvYGRYxSibklulm5uYmVOcmqxb + nJyYl5dapGukl5tZopeaUrqJERxIkrw7GN8dVDrEKMDBqMTDK1nm4C/EmlhWXJl7iFGSg0lJ + lPfUBEd/Ib6k/JTKjMTijPii0pzU4kOMEhzMSiK8C+yBcrwpiZVVqUX5MClpDhYlcV5VrXd+ + QgLpiSWp2ampBalFMFkZDg4lCd6GSUCNgkWp6akVaZk5JQhpJg5OkOE8QMNng9TwFhck5hZn + pkPkTzEqSonz1oMkBEASGaV5cL2wSH/FKA70ijBvGkgVDzBJwHW/AhrMBDSYV8gOZHBJIkJK + qoHxfNpRyf/1bVMy31RHlruYnmhJU9FVqZ94dKbLrVnrNA7Pcp+e/m4is8rCJ262Nx8oy0wL + Lj3BcvzAS7nPT0SZJFid62O9DZyWL7j43nn2ot5v6xvOGdz0UtCenV3g+Nj3iXoqZ9W9RefT + JfkED4utOux4YfO3K+sas5aYNXz9f+7lS+6gnJ27lViKMxINtZiLihMB8mnMIc8CAAA= +Cc: tomi.ollila@iki.fi +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Mon, 20 Feb 2012 00:26:40 -0000 + +v2 fixes some trivial whitespace issues in devel/schemata [1] and +beefs up one of the explanations in devel/schemata. None of the other +patches have changed, so I'm marking this ready. + +As a teaser, I've got mbox and raw converted to the new style, too, so +as soon as this goes in I'll send those patches (they aren't actually +dependent, but do share some diff context with this one). + +diff from v1 to v2: + +diff --git a/devel/schemata b/devel/schemata +index d90d4c6..24ad775 100644 +--- a/devel/schemata ++++ b/devel/schemata +@@ -71,7 +71,10 @@ part = { + # otherwise (leaf parts): + filename?: string, + content-charset?: string, +- content?: string # pre-fetched body content ++ # A leaf part's body content is optional, but may be included if ++ # it can be correctly encoded as a string. Consumers should use ++ # this in preference to fetching the part content separately. ++ content?: string + } + + # The headers of a message (format_headers_json with raw headers) or +@@ -101,7 +104,7 @@ signature = { + userid?: string + # if status is not "good": + keyid?: string +- # if the signature has errors: ++ # if the signature has errors: + errors?: int + } + +@@ -129,7 +132,7 @@ thread = { + date_relative: string, # user-friendly timestamp + matched: int, # number of matched messages + total: int, # total messages in thread +- authors: string, # comma-separated names with | between ++ authors: string, # comma-separated names with | between + # matched and unmatched + subject: string + } + -- 2.26.2