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