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 896C6431FBC
	for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:23 -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 kswcQbygLR-f for <notmuch@notmuchmail.org>;
	Tue, 24 Apr 2012 02:11:22 -0700 (PDT)
Received: from mail-wi0-f179.google.com (mail-wi0-f179.google.com
	[209.85.212.179]) (using TLSv1 with cipher RC4-SHA (128/128 bits))
	(No client certificate requested)
	by olra.theworths.org (Postfix) with ESMTPS id 7B372431FC0
	for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:16 -0700 (PDT)
Received: by wibhn6 with SMTP id hn6so347315wib.2
	for <notmuch@notmuchmail.org>; Tue, 24 Apr 2012 02:11:15 -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=N/JtSGgsgglhuf7m4xW0C0bcySjIMTJAd96xIlMLfZ6q13amjPx3r0y23NxKklE9dc
	reD2ElIsNn37QrOIWxf6hIr7ivKomBRRRB+aBRDq0Q2LorNSoXbLGqmnCS0VzClRs0d9
	nwicnj0tA/FuhvWCFS7G4mEyreIDdGGLq/GfAq91/YWSOpmEqL2viN3Ek1Wvh7YEgOkl
	es7VoI5+oLFKPaZbKPvkVexY84uATHAK0zf3ouwYboY5579jJZGYENzCnv7Yi5Qb+Jga
	3hPszkNAJ1oyL6HA6QuIY3QoTEH/sOTHOQBgFI5LuFUsizlPBpe66f5tVvWGiphQ04by
	Fq/g==
Received: by 10.216.137.100 with SMTP id x78mr12350273wei.72.1335258675120;
	Tue, 24 Apr 2012 02:11:15 -0700 (PDT)
Received: from localhost (94-192-233-223.zone6.bethere.co.uk.
 [94.192.233.223])	by mx.google.com with ESMTPS id
 e6sm28689384wix.8.2012.04.24.02.11.10	(version=TLSv1/SSLv3 cipher=OTHER);
	Tue, 24 Apr 2012 02:11:14 -0700 (PDT)
From: Mark Walters <markwalters1009@gmail.com>
To: notmuch@notmuchmail.org
Subject: [PATCH v4 3/4] Update devel/schemata for --entire-thread=false
Date: Tue, 24 Apr 2012 10:11:14 +0100
Message-Id: <1335258675-29439-4-git-send-email-markwalters1009@gmail.com>
X-Mailer: git-send-email 1.7.9.1
In-Reply-To: <1335258675-29439-1-git-send-email-markwalters1009@gmail.com>
References: <1335258675-29439-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: Tue, 24 Apr 2012 09:11:23 -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