Return-Path: <markwalters1009@gmail.com>
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 1B4B7431FC0
	for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:29 -0700 (PDT)
X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
X-Spam-Flag: NO
X-Spam-Score: 0.201
X-Spam-Level: 
X-Spam-Status: No, score=0.201 tagged_above=-999 required=5
	tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,
	FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,
	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 wDNf9OQUBg-K for <notmuch@notmuchmail.org>;
	Sun,  3 Jun 2012 04:46:28 -0700 (PDT)
Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com
 [74.125.82.45])	(using TLSv1 with cipher RC4-SHA (128/128 bits))	(No client
 certificate requested)	by olra.theworths.org (Postfix) with ESMTPS id
 44006431FBF	for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 04:46:27 -0700
 (PDT)
Received: by wgbdt14 with SMTP id dt14so2742236wgb.2
	for <notmuch@notmuchmail.org>; Sun, 03 Jun 2012 04:46:25 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
	h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references;
	bh=tANVdmUV5fhD3PCH1bNZY0t9tn15aQw9ZNiYxv0s5LQ=;
	b=R6ZmmlMQ1TGd31h2tMVVFLW7rViYTbGoDll4sApBfeC961Eu1dXLKxQHkku6IHjKBY
	YSl1J0EPWv25o2mZ2Tvn+eHpqboYkg7rfGBzXsJOl0T1cNj9qw5w9yw4sdHuCQ5Dq8Z0
	qK/eNOVoEVJDj6ImMYRT76RsIOoqDfRpUfO6Jp0fJFD4+WdFKSza7K/lem1nk8r6Lrv0
	4NWdzEoaXDbVJgtlexqMFDbd1S9PjoeQVKbSNchgK3sNGMr8GsL90ifODdd11/kecJcI
	GTE9JiOW3XxhTeTCZrkYS+7D9M9E9cz2wgNSHLtSW5d+GvVjKm9ik1V4Il3IlgjMCl/W
	tqAw==
Received: by 10.216.228.232 with SMTP id f82mr8135485weq.211.1338723985845;
	Sun, 03 Jun 2012 04:46:25 -0700 (PDT)
Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
 [94.192.233.223])	by mx.google.com with ESMTPS id
 gb9sm12130779wib.8.2012.06.03.04.46.24	(version=TLSv1/SSLv3 cipher=OTHER);
	Sun, 03 Jun 2012 04:46:25 -0700 (PDT)
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [Patch v7 4/6] Update devel/schemata for --entire-thread=false
Date: Sun,  3 Jun 2012 12:46:10 +0100
Message-Id: <1338723972-13063-5-git-send-email-markwalters1009@gmail.com>
X-Mailer: git-send-email 1.7.9.1
In-Reply-To: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
References: <1338723972-13063-1-git-send-email-markwalters1009@gmail.com>
X-BeenThere: notmuch@notmuchmail.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: "Use and development of the notmuch mail system."
	<notmuch.notmuchmail.org>
List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
List-Archive: <http://notmuchmail.org/pipermail/notmuch>
List-Post: <mailto:notmuch@notmuchmail.org>
List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
	<mailto:notmuch-request@notmuchmail.org?subject=subscribe>
X-List-Received-Date: Sun, 03 Jun 2012 11:46:29 -0000

Also remove the Json --entire-thread item from devel/TODO.
---
 devel/TODO     |    2 --
 devel/schemata |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/devel/TODO b/devel/TODO
index 7b750af..eb757af 100644
--- a/devel/TODO
+++ b/devel/TODO
@@ -92,8 +92,6 @@ and email address in the From: line. We could also then easily support
 "notmuch compose --from <something>" to support getting at alternate
 email addresses.
 
-Fix the --format=json option to not imply --entire-thread.
-
 Implement "notmuch search --exclude-threads=<search-terms>" to allow
 for excluding muted threads, (and any other negative, thread-based
 filtering that the user wants to do).
diff --git a/devel/schemata b/devel/schemata
index 977cea7..8fcab8e 100644
--- a/devel/schemata
+++ b/devel/schemata
@@ -32,7 +32,7 @@ thread = [thread_node*]
 
 # A message and its replies (show_messages)
 thread_node = [
-    message?,                 # present if --entire-thread or matched
+    message?,                 # null if not matched and not --entire-thread
     [thread_node*]            # children of message
 ]
 
-- 
1.7.9.1