[Patch v8 4/6] Update devel/schemata for --entire-thread=false

diff --git a/a4/31da25901d655ba70a8543dbe4dbf752d0a9ce b/a4/31da25901d655ba70a8543dbe4dbf752d0a9ce
new file mode 100644 (file)
index 0000000..96c06b6
--- /dev/null
+++ b/a4/31da25901d655ba70a8543dbe4dbf752d0a9ce
@@ -0,0 +1,97 @@
+Return-Path: <markwalters1009@gmail.com>\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 7A34E431FD5\r
+       for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:12 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+       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 tLXb4qP3Lw6x for <notmuch@notmuchmail.org>;\r
+       Sat, 16 Jun 2012 03:22:11 -0700 (PDT)\r
+Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ 60507431FAE   for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:11 -0700\r
+ (PDT)\r
+Received: by wgbdt14 with SMTP id dt14so3070260wgb.2\r
+       for <notmuch@notmuchmail.org>; Sat, 16 Jun 2012 03:22:10 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;\r
+       bh=tANVdmUV5fhD3PCH1bNZY0t9tn15aQw9ZNiYxv0s5LQ=;\r
+       b=S5YHhGBijp4zPd6TbV0fYhb2R3CPZkX/qBIiHyIYn5knIZz6WS1X/RZ+d6h+P6cN2+\r
+       0oq8swp7N48cp5JgvuK2gL3D9CJ0/KZgdY5mtk8NLqGLvCgBchM6u7LQr6FiGrUIph+i\r
+       DvvSRJU4NIw+eCZf7Rhan9TVoYPP4s6Vf5BhHqABO6IgpcT1HUEyUq3AjvlKTDag0uLX\r
+       9U4ZXGl2wrEZ6Pd7jiQx/Sret4f/FhNqKbZT6ngk5ymOKT/IluMUA07OxLEtX5VAgvJg\r
+       0VJ632z/PF92Soz4o3i1Al0j0IIKqRxdc6c/6E03AJA7qU1iNY2FLzH0tHcoGc3QyLED\r
+       ZwUw==\r
+Received: by 10.180.20.137 with SMTP id n9mr10585492wie.3.1339842130001;\r
+       Sat, 16 Jun 2012 03:22:10 -0700 (PDT)\r
+Received: from localhost (94-192-233-223.zone6.bethere.co.uk.\r
+ [94.192.233.223])     by mx.google.com with ESMTPS id\r
+ gc6sm9565333wib.0.2012.06.16.03.22.08 (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sat, 16 Jun 2012 03:22:09 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v8 4/6] Update devel/schemata for --entire-thread=false\r
+Date: Sat, 16 Jun 2012 11:21:45 +0100\r
+Message-Id: <1339842107-10632-5-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1339842107-10632-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1339842107-10632-1-git-send-email-markwalters1009@gmail.com>\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: Sat, 16 Jun 2012 10:22:12 -0000\r
+\r
+Also remove the Json --entire-thread item from devel/TODO.\r
+---\r
+ devel/TODO     |    2 --\r
+ devel/schemata |    2 +-\r
+ 2 files changed, 1 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/devel/TODO b/devel/TODO\r
+index 7b750af..eb757af 100644\r
+--- a/devel/TODO\r
++++ b/devel/TODO\r
+@@ -92,8 +92,6 @@ and email address in the From: line. We could also then easily support\r
+ "notmuch compose --from <something>" to support getting at alternate\r
+ email addresses.\r
+ \r
+-Fix the --format=json option to not imply --entire-thread.\r
+-\r
+ Implement "notmuch search --exclude-threads=<search-terms>" to allow\r
+ for excluding muted threads, (and any other negative, thread-based\r
+ filtering that the user wants to do).\r
+diff --git a/devel/schemata b/devel/schemata\r
+index 977cea7..8fcab8e 100644\r
+--- a/devel/schemata\r
++++ b/devel/schemata\r
+@@ -32,7 +32,7 @@ thread = [thread_node*]\r
+ \r
+ # A message and its replies (show_messages)\r
+ thread_node = [\r
+-    message?,                 # present if --entire-thread or matched\r
++    message?,                 # null if not matched and not --entire-thread\r
+     [thread_node*]            # children of message\r
+ ]\r
+ \r
+-- \r
+1.7.9.1\r
+\r