[PATCH 1/6] Sync schemata with current code structure

diff --git a/09/bffd89487ba361ab0498bf3c30fe21a80621bb b/09/bffd89487ba361ab0498bf3c30fe21a80621bb
new file mode 100644 (file)
index 0000000..1f20426
--- /dev/null
+++ b/09/bffd89487ba361ab0498bf3c30fe21a80621bb
@@ -0,0 +1,159 @@
+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 EDD71431FB6\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:01 -0700 (PDT)\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 8DwOEfTt4bPB for <notmuch@notmuchmail.org>;\r
+       Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 56E1B431FBC\r
+       for <notmuch@notmuchmail.org>; Sat,  7 Apr 2012 17:58:00 -0700 (PDT)\r
+X-AuditID: 12074424-b7fae6d000000906-a8-4f80e297ab8b\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id BD.C3.02310.792E08F4; Sat,  7 Apr 2012 20:57:59 -0400 (EDT)\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 q380vxGZ005094; \r
+       Sat, 7 Apr 2012 20:57:59 -0400\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 q380vwlP002164\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 7 Apr 2012 20:57:58 -0400 (EDT)\r
+Received: from amthrax by drake.mit.edu with local (Exim 4.77)\r
+       (envelope-from <amthrax@drake.mit.edu>)\r
+       id 1SGgS5-0001SN-U3; Sat, 07 Apr 2012 20:57:57 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/6] Sync schemata with current code structure\r
+Date: Sat,  7 Apr 2012 20:57:45 -0400\r
+Message-Id: <1333846670-5356-2-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+References: <1333846670-5356-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixCmqrTv9UYO/wY7j1hbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxvyns9kKDglXrOmaxtzAOIuvi5GTQ0LAROLq/1esELaYxIV7\r
+       69m6GLk4hAT2MUpsvf+QDSQhJLCeUeL+MmWIxD0miRdLbjFDOPMZJXYdmMEEUsUmoCGxbf9y\r
+       RhBbREBaYufd2UBjOTiYBdQk/nSpgISFBewkNty4BlbCIqAqcWB3AzOIzStgL7Hz2VeoKxQk\r
+       nq07DjaSU8BBYnvrVmaII+wlli4+zjiBkX8BI8MqRtmU3Crd3MTMnOLUZN3i5MS8vNQiXXO9\r
+       3MwSvdSU0k2MoKBhd1HZwdh8SOkQowAHoxIPr+XuBn8h1sSy4srcQ4ySHExKorxPHwCF+JLy\r
+       UyozEosz4otKc1KLDzFKcDArifDePwyU401JrKxKLcqHSUlzsCiJ82povfMTEkhPLEnNTk0t\r
+       SC2CycpwcChJ8L5+CNQoWJSanlqRlplTgpBm4uAEGc4DNFzyEcjw4oLE3OLMdIj8KUZFKXHe\r
+       FyDNAiCJjNI8uF5YVL9iFAd6RZj3O0gVDzAhwHW/AhrMBDS45lU9yOCSRISUVAOj0dXupE0c\r
+       TUvYxdXzNnNbz8qYanXoef6vyu6fsneTnqyJd5Xhsgvp9l65WOmjXbyr1b2WAqFnHy4e6Fp9\r
+       yPfGHWOZtsodS6JWtZ12dzEI+rasbsYim8bmeZ9Wn5zKUBqWP6nSNFD1x87VTlyOxw++kOO8\r
+       xN8nMtPXhVt5+/Jzaqs4ZT07fHYqsRRnJBpqMRcVJwIA5YLQfcUCAAA=\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, 08 Apr 2012 00:58:02 -0000\r
+\r
+The schema itself hasn't changed, but many of the references to\r
+functions in notmuch-show.c were out of date.\r
+---\r
+ devel/schemata |   21 +++++++--------------\r
+ 1 files changed, 7 insertions(+), 14 deletions(-)\r
+\r
+diff --git a/devel/schemata b/devel/schemata\r
+index 728a46f..977cea7 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -36,7 +36,7 @@ thread_node = [\r
+     [thread_node*]            # children of message\r
+ ]\r
+ \r
+-# A message (show_message)\r
++# A message (format_part_json)\r
+ message = {\r
+     # (format_message_json)\r
+     id:             messageid,\r
+@@ -50,18 +50,13 @@ message = {\r
+     body:           [part]\r
+ }\r
+ \r
+-# A MIME part (show_message_body)\r
++# A MIME part (format_part_json)\r
+ part = {\r
+-    # format_part_start_json\r
+     id:             int|string, # part id (currently DFS part number)\r
+ \r
+-    # format_part_encstatus_json\r
+     encstatus?:     encstatus,\r
+-\r
+-    # format_part_sigstatus_json\r
+     sigstatus?:     sigstatus,\r
+ \r
+-    # format_part_content_json\r
+     content-type:   string,\r
+     content-id?:    string,\r
+     # if content-type starts with "multipart/":\r
+@@ -77,9 +72,7 @@ part = {\r
+     content?:       string\r
+ }\r
+ \r
+-# The headers of a message (format_headers_json with raw headers\r
+-# and reply = FALSE) or a part (format_headers_message_part_json\r
+-# with pretty-printed headers)\r
++# The headers of a message or part (format_headers_json with reply = FALSE)\r
+ headers = {\r
+     Subject:        string,\r
+     From:           string,\r
+@@ -89,14 +82,14 @@ headers = {\r
+     Date:           string\r
+ }\r
+ \r
+-# Encryption status (format_part_encstatus_json)\r
++# Encryption status (format_part_json)\r
+ encstatus = [{status: "good"|"bad"}]\r
+ \r
+ # Signature status (format_part_sigstatus_json)\r
+ sigstatus = [signature*]\r
+ \r
+ signature = {\r
+-    # signature_status_to_string\r
++    # (signature_status_to_string)\r
+     status:         "none"|"good"|"bad"|"error"|"unknown",\r
+     # if status is "good":\r
+     fingerprint?:   string,\r
+@@ -142,14 +135,14 @@ notmuch reply schema\r
+ --------------------\r
+ \r
+ reply = {\r
+-    # The headers of the constructed reply (format_headers_json with\r
+-    # raw headers and reply = TRUE)\r
++    # The headers of the constructed reply\r
+     reply-headers: reply_headers,\r
+ \r
+     # As in the show format (format_part_json)\r
+     original: message\r
+ }\r
+ \r
++# Reply headers (format_headers_json with reply = TRUE)\r
+ reply_headers = {\r
+     Subject:        string,\r
+     From:           string,\r
+-- \r
+1.7.9.1\r
+\r