7f/bc205bbd89e1246bef8d070f284640c5869f1b

   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 C355A431FD9\r
   6         for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:37 -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 pQo5jkoNx0sv for <notmuch@notmuchmail.org>;\r
  16         Mon,  7 Oct 2013 15:33:33 -0700 (PDT)\r
  17 Received: from dmz-mailsec-scanner-4.mit.edu (dmz-mailsec-scanner-4.mit.edu\r
  18         [18.9.25.15])\r
  19         by olra.theworths.org (Postfix) with ESMTP id DB1F9431FB6\r
  20         for <notmuch@notmuchmail.org>; Mon,  7 Oct 2013 15:33:29 -0700 (PDT)\r
  21 X-AuditID: 1209190f-b7fa08e0000009c6-84-525336b7331f\r
  22 Received: from mailhub-auth-4.mit.edu ( [18.7.62.39])\r
  23         by dmz-mailsec-scanner-4.mit.edu (Symantec Messaging Gateway) with SMTP\r
  24         id 1C.4B.02502.7B633525; Mon,  7 Oct 2013 18:33:27 -0400 (EDT)\r
  25 Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11])\r
  26         by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id r97MXPLE024732; \r
  27         Mon, 7 Oct 2013 18:33:26 -0400\r
  28 Received: from drake.dyndns.org (26-4-172.dynamic.csail.mit.edu [18.26.4.172])\r
  29         (authenticated bits=0)\r
  30         (User authenticated as amdragon@ATHENA.MIT.EDU)\r
  31         by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id r97MXNWt028498\r
  32         (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
  33         Mon, 7 Oct 2013 18:33:25 -0400\r
  34 Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
  35         (envelope-from <amdragon@mit.edu>)\r
  36         id 1VTJMh-0006bh-Iw; Mon, 07 Oct 2013 18:33:23 -0400\r
  37 From: Austin Clements <amdragon@MIT.EDU>\r
  38 To: notmuch@notmuchmail.org\r
  39 Subject: [PATCH 01/11] schemata: Disambiguate non-terminal names\r
  40 Date: Mon,  7 Oct 2013 18:33:11 -0400\r
  41 Message-Id: <1381185201-25197-2-git-send-email-amdragon@mit.edu>\r
  42 X-Mailer: git-send-email 1.8.4.rc3\r
  43 In-Reply-To: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
  44 References: <1381185201-25197-1-git-send-email-amdragon@mit.edu>\r
  45 X-Brightmail-Tracker:\r
  46  H4sIAAAAAAAAA+NgFtrEIsWRmVeSWpSXmKPExsUixG6nrrvdLDjIYNZdTYvrN2cyOzB6PFt1\r
  47         izmAMYrLJiU1J7MstUjfLoEr4+6ylIIfHBV7b3WzNTBOYe9i5OSQEDCRuH37CyuELSZx4d56\r
  48         ti5GLg4hgX2MEivnLGaHcDYwSsxvvsgI4Rxmktg37xMrhDOXUeL8i8fMIP1sAhoS2/YvZwSx\r
  49         RQSkJXbenQ1UxMHBLKAm8adLBSQsLOAgsWH5LiYQm0VAVWLG3q8sIDYvUPzVl5tsEGcoSSw8\r
  50         tQ3sJE4BR4klGy+CxYWAaubuX8Q6gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0TvdzM\r
  51         Er3UlNJNjKCg4ZTk38H47aDSIUYBDkYlHt6Mo0FBQqyJZcWVuYcYJTmYlER5z5gGBwnxJeWn\r
  52         VGYkFmfEF5XmpBYfYpTgYFYS4RUwAsrxpiRWVqUW5cOkpDlYlMR5b3LYBwkJpCeWpGanphak\r
  53         FsFkZTg4lCR4w0CGChalpqdWpGXmlCCkmTg4QYbzAA1PBqnhLS5IzC3OTIfIn2JUlBLnnQ2S\r
  54         EABJZJTmwfXCovoVozjQK8K8W0GqeIAJAa77FdBgJqDBuuyBIINLEhFSUg2MjDPrVgq+/8mm\r
  55         7Tf3F6+I6yELhlvnMoVqd/rfW53BXzT9gsvhY98PNSktbg6fu+j7thqPm7yCyofvm0wJ/pxU\r
  56         3PrP4Xv7E8MlMmbrPFfEv/rZkrBEMuTk1PPqX8MmNh3o88gRc7p0eKe5vWiEqvFOk2MJ7XO/\r
  57         /96UcuxJbNEKsxOR50vuWd2/qcRSnJFoqMVcVJwIANEG9QLFAgAA\r
  58 X-BeenThere: notmuch@notmuchmail.org\r
  59 X-Mailman-Version: 2.1.13\r
  60 Precedence: list\r
  61 List-Id: "Use and development of the notmuch mail system."\r
  62         <notmuch.notmuchmail.org>\r
  63 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  64         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  65 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  66 List-Post: <mailto:notmuch@notmuchmail.org>\r
  67 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  68 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  69         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  70 X-List-Received-Date: Mon, 07 Oct 2013 22:33:38 -0000\r
  71 \r
  72 Previously, the show schema and the search schema used different\r
  73 "thread" non-terminals.  While these schemata don't interact, this is\r
  74 still confusing, so rename search's "thread" to "thread_summary".  To\r
  75 further limit confusion, prefix all top-level search non-terminals now\r
  76 begin with "search_".\r
  77 ---\r
  78  devel/schemata | 12 ++++++------\r
  79  1 file changed, 6 insertions(+), 6 deletions(-)\r
  80 \r
  81 diff --git a/devel/schemata b/devel/schemata\r
  82 index 2405756..cdd0e43 100644\r
  83 --- a/devel/schemata\r
  84 +++ b/devel/schemata\r
  85 @@ -122,21 +122,21 @@ notmuch search schema\r
  86  ---------------------\r
  87  \r
  88  # --output=summary\r
  89 -summary = [thread*]\r
  90 +search_summary = [thread_summary*]\r
  91  \r
  92  # --output=threads\r
  93 -threads = [threadid*]\r
  94 +search_threads = [threadid*]\r
  95  \r
  96  # --output=messages\r
  97 -messages = [messageid*]\r
  98 +search_messages = [messageid*]\r
  99  \r
 100  # --output=files\r
 101 -files = [string*]\r
 102 +search_files = [string*]\r
 103  \r
 104  # --output=tags\r
 105 -tags = [string*]\r
 106 +search_tags = [string*]\r
 107  \r
 108 -thread = {\r
 109 +thread_summary = {\r
 110      thread:         threadid,\r
 111      timestamp:      unix_time,\r
 112      date_relative:  string,   # user-friendly timestamp\r
 113 -- \r
 114 1.8.4.rc3\r
 115 \r