From b161d72ed541261c3c19e11163e2ae5213a1bc3a Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 25 Oct 2013 11:19:01 +2000 Subject: [PATCH] [PATCH v2 01/11] schemata: Disambiguate non-terminal names --- 36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 | 116 ++++++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 diff --git a/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 b/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 new file mode 100644 index 000000000..c7c38669b --- /dev/null +++ b/36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850 @@ -0,0 +1,116 @@ +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 E7CB9421178 + for ; Thu, 24 Oct 2013 08:19:54 -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 SP7S6ayBnwF4 for ; + Thu, 24 Oct 2013 08:19:50 -0700 (PDT) +Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu + [18.7.68.34]) + by olra.theworths.org (Postfix) with ESMTP id 57CB6429E51 + for ; Thu, 24 Oct 2013 08:19:27 -0700 (PDT) +X-AuditID: 12074422-b7f5a8e000000a34-07-52693a7ffb12 +Received: from mailhub-auth-1.mit.edu ( [18.9.21.35]) + by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP + id 30.66.02612.F7A39625; Thu, 24 Oct 2013 11:19:27 -0400 (EDT) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9OFJFK4012679; + Thu, 24 Oct 2013 11:19:15 -0400 +Received: from drake.dyndns.org + (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com + [216.15.114.40]) (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9OFJCv4012908 + (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT); + Thu, 24 Oct 2013 11:19:14 -0400 +Received: from amthrax by drake.dyndns.org with local (Exim 4.77) + (envelope-from ) + id 1VZMgq-0006dj-La; Thu, 24 Oct 2013 11:19:12 -0400 +From: Austin Clements +To: notmuch@notmuchmail.org +Subject: [PATCH v2 01/11] schemata: Disambiguate non-terminal names +Date: Thu, 24 Oct 2013 11:19:01 -0400 +Message-Id: <1382627951-25252-2-git-send-email-amdragon@mit.edu> +X-Mailer: git-send-email 1.8.4.rc3 +In-Reply-To: <1382627951-25252-1-git-send-email-amdragon@mit.edu> +References: <1382627951-25252-1-git-send-email-amdragon@mit.edu> +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixCmqrFtvlRlksGI+l0XTdGeL1XN5LK7f + nMnswOyxc9Zddo9b91+zezxbdYs5gDmKyyYlNSezLLVI3y6BK+PuspSCHxwVe291szUwTmHv + YuTkkBAwkZh99TMLhC0mceHeerYuRi4OIYF9jBItJxczQzgbGSUeLXsHlbnDJPHg+HZWCGcu + o8T9xsuMIP1sAhoS2/YvB7NFBKQldt6dzQpiMwtESxy5PIMNxBYWcJbo7/0NZHNwsAioSszs + KwIJ8wo4SKzq/cQMcYaSxMJT28BaOQUcJX6+vgY2Ugio5tfvMywTGPkXMDKsYpRNya3SzU3M + zClOTdYtTk7My0st0jXVy80s0UtNKd3ECAosdhelHYw/DyodYhTgYFTi4dX4kB4kxJpYVlyZ + e4hRkoNJSZT3nmlmkBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3ml6QDnelMTKqtSifJiUNAeL + kjjvLQ77ICGB9MSS1OzU1ILUIpisDAeHkgSvvyVQo2BRanpqRVpmTglCmomDE2Q4D9DwdJAa + 3uKCxNzizHSI/ClGRSlx3iSQhABIIqM0D64XFvmvGMWBXhHmLQep4gEmDbjuV0CDmYAGT1mS + BjK4JBEhJdXAyDf/wnsd6x+RM0Piv/74rXpux9EnPPZzFLKWLPcUUfN4295oKmgWsZD3zE37 + W5cL30ScKlxbxH/E9PIyH6/NWy/xeinZvJle+8KlzFroaFn2j0OtjK99Zx/K+il54XbaiYoN + k28LGb/9u+n5TI2X3OuZvNV7M16yFJ66L+I8R9Pv7/qybUfDKpVYijMSDbWYi4oTAQ2CeWzX AgAA +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: Thu, 24 Oct 2013 15:19:55 -0000 + +Previously, the show schema and the search schema used different +"thread" non-terminals. While these schemata don't interact, this is +still confusing, so rename search's "thread" to "thread_summary". To +further limit confusion, prefix all top-level search non-terminals now +begin with "search_". +--- + devel/schemata | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/devel/schemata b/devel/schemata +index 2405756..cdd0e43 100644 +--- a/devel/schemata ++++ b/devel/schemata +@@ -122,21 +122,21 @@ notmuch search schema + --------------------- + + # --output=summary +-summary = [thread*] ++search_summary = [thread_summary*] + + # --output=threads +-threads = [threadid*] ++search_threads = [threadid*] + + # --output=messages +-messages = [messageid*] ++search_messages = [messageid*] + + # --output=files +-files = [string*] ++search_files = [string*] + + # --output=tags +-tags = [string*] ++search_tags = [string*] + +-thread = { ++thread_summary = { + thread: threadid, + timestamp: unix_time, + date_relative: string, # user-friendly timestamp +-- +1.8.4.rc3 + -- 2.26.2