36/3dd9e4a0cbffe07d986ccd2e63a2222e02a850

   1 Return-Path: <amdragon@mit.edu>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id E7CB9421178\r
   6         for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:54 -0700 (PDT)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.7\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
  12         tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  13 Received: from olra.theworths.org ([127.0.0.1])\r
  14         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  15         with ESMTP id SP7S6ayBnwF4 for <notmuch@notmuchmail.org>;\r
  16         Thu, 24 Oct 2013 08:19:50 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-5.mit.edu (dmz-mailsec-scanner-5.mit.edu\r
  18         [18.7.68.34])\r
  19         by olra.theworths.org (Postfix) with ESMTP id 57CB6429E51\r
  20         for <notmuch@notmuchmail.org>; Thu, 24 Oct 2013 08:19:27 -0700 (PDT)\r
  21 X-AuditID: 12074422-b7f5a8e000000a34-07-52693a7ffb12\r
  22 Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
  23         by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 30.66.02612.F7A39625; Thu, 24 Oct 2013 11:19:27 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id r9OFJFK4012679; \r
  27         Thu, 24 Oct 2013 11:19:15 -0400\r
  28 Received: from drake.dyndns.org\r
  29         (216-15-114-40.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
  30         [216.15.114.40]) (authenticated bits=0)\r
  31         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  32         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r9OFJCv4012908\r
  33         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  34         Thu, 24 Oct 2013 11:19:14 -0400\r
  35 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  36         (envelope-from <amdragon@mit.edu>)\r
  37         id 1VZMgq-0006dj-La; Thu, 24 Oct 2013 11:19:12 -0400\r
  38 From: Austin Clements <amdragon@MIT.EDU>\r
  39 To: notmuch@notmuchmail.org\r
  40 Subject: [PATCH v2 01/11] schemata: Disambiguate non-terminal names\r
  41 Date: Thu, 24 Oct 2013 11:19:01 -0400\r
  42 Message-Id: <1382627951-25252-2-git-send-email-amdragon@mit.edu>\r
  43 X-Mailer: git-send-email 1.8.4.rc3\r
  44 In-Reply-To: <1382627951-25252-1-git-send-email-amdragon@mit.edu>\r
  45 References: <1382627951-25252-1-git-send-email-amdragon@mit.edu>\r
  46 X-Brightmail-Tracker:\r
  47  H4sIAAAAAAAAA+NgFjrCIsWRmVeSWpSXmKPExsUixCmqrFtvlRlksGI+l0XTdGeL1XN5LK7f\r
  48         nMnswOyxc9Zddo9b91+zezxbdYs5gDmKyyYlNSezLLVI3y6BK+PuspSCHxwVe291szUwTmHv\r
  49         YuTkkBAwkZh99TMLhC0mceHeerYuRi4OIYF9jBItJxczQzgbGSUeLXsHlbnDJPHg+HZWCGcu\r
  50         o8T9xsuMIP1sAhoS2/YvB7NFBKQldt6dzQpiMwtESxy5PIMNxBYWcJbo7/0NZHNwsAioSszs\r
  51         KwIJ8wo4SKzq/cQMcYaSxMJT28BaOQUcJX6+vgY2Ugio5tfvMywTGPkXMDKsYpRNya3SzU3M\r
  52         zClOTdYtTk7My0st0jXVy80s0UtNKd3ECAosdhelHYw/DyodYhTgYFTi4dX4kB4kxJpYVlyZ\r
  53         e4hRkoNJSZT3nmlmkBBfUn5KZUZicUZ8UWlOavEhRgkOZiUR3ml6QDnelMTKqtSifJiUNAeL\r
  54         kjjvLQ77ICGB9MSS1OzU1ILUIpisDAeHkgSvvyVQo2BRanpqRVpmTglCmomDE2Q4D9DwdJAa\r
  55         3uKCxNzizHSI/ClGRSlx3iSQhABIIqM0D64XFvmvGMWBXhHmLQep4gEmDbjuV0CDmYAGT1mS\r
  56         BjK4JBEhJdXAyDf/wnsd6x+RM0Piv/74rXpux9EnPPZzFLKWLPcUUfN4295oKmgWsZD3zE37\r
  57         W5cL30ScKlxbxH/E9PIyH6/NWy/xeinZvJle+8KlzFroaFn2j0OtjK99Zx/K+il54XbaiYoN\r
  58         k28LGb/9u+n5TI2X3OuZvNV7M16yFJ66L+I8R9Pv7/qybUfDKpVYijMSDbWYi4oTAQ2CeWzX        AgAA\r
  59 X-BeenThere: notmuch@notmuchmail.org\r
  60 X-Mailman-Version: 2.1.13\r
  61 Precedence: list\r
  62 List-Id: "Use and development of the notmuch mail system."\r
  63         <notmuch.notmuchmail.org>\r
  64 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  66 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  67 List-Post: <mailto:notmuch@notmuchmail.org>\r
  68 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  69 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  70         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  71 X-List-Received-Date: Thu, 24 Oct 2013 15:19:55 -0000\r
  72 \r
  73 Previously, the show schema and the search schema used different\r
  74 "thread" non-terminals.  While these schemata don't interact, this is\r
  75 still confusing, so rename search's "thread" to "thread_summary".  To\r
  76 further limit confusion, prefix all top-level search non-terminals now\r
  77 begin with "search_".\r
  78 ---\r
  79  devel/schemata | 12 ++++++------\r
  80  1 file changed, 6 insertions(+), 6 deletions(-)\r
  81 \r
  82 diff --git a/devel/schemata b/devel/schemata\r
  83 index 2405756..cdd0e43 100644\r
  84 --- a/devel/schemata\r
  85 +++ b/devel/schemata\r
  86 @@ -122,21 +122,21 @@ notmuch search schema\r
  87  ---------------------\r
  88  \r
  89  # --output=summary\r
  90 -summary = [thread*]\r
  91 +search_summary = [thread_summary*]\r
  92  \r
  93  # --output=threads\r
  94 -threads = [threadid*]\r
  95 +search_threads = [threadid*]\r
  96  \r
  97  # --output=messages\r
  98 -messages = [messageid*]\r
  99 +search_messages = [messageid*]\r
 100  \r
 101  # --output=files\r
 102 -files = [string*]\r
 103 +search_files = [string*]\r
 104  \r
 105  # --output=tags\r
 106 -tags = [string*]\r
 107 +search_tags = [string*]\r
 108  \r
 109 -thread = {\r
 110 +thread_summary = {\r
 111      thread:         threadid,\r
 112      timestamp:      unix_time,\r
 113      date_relative:  string,   # user-friendly timestamp\r
 114 -- \r
 115 1.8.4.rc3\r
 116 \r