Re: [PATCH 1/2] cli: make --entire-thread=false work for format=json.

diff --git a/d6/ce39fdb05ce2f6f2b4b9e39fb72f4b77cba2eb b/d6/ce39fdb05ce2f6f2b4b9e39fb72f4b77cba2eb
new file mode 100644 (file)
index 0000000..0bddb87
--- /dev/null
+++ b/d6/ce39fdb05ce2f6f2b4b9e39fb72f4b77cba2eb
@@ -0,0 +1,97 @@
+Return-Path: <awg@xvx.ca>\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 110EC431FAF\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:19:11 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[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 37Op8aS+FQvV for <notmuch@notmuchmail.org>;\r
+       Tue, 10 Apr 2012 10:19:10 -0700 (PDT)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6025C431FAE\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:19:10 -0700 (PDT)\r
+Received: by lban1 with SMTP id n1so29267lba.26\r
+       for <notmuch@notmuchmail.org>; Tue, 10 Apr 2012 10:19:07 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=mime-version:sender:x-originating-ip:in-reply-to:references:date\r
+       :x-google-sender-auth:message-id:subject:from:to:cc:content-type\r
+       :content-transfer-encoding:x-gm-message-state;\r
+       bh=RmK15CgDOaxHQUxV0R6lktB+/EI9jc3Pht79iQChkBQ=;\r
+       b=ChyU1bnPkccHX2Ut14W7oezqKx1Q+eVkJu21mLMTWkLlrpqUrPKCbXzylxFYTbQPey\r
+       tBL3L0EyUdsginHjHBWDXgR6T0jwSiQUjMmwf+nlEq2+QpSJB7mp7FpAOuY9pjN71C0/\r
+       9rD6k56+QSO19H24N9CalRJqH3HVeD8gfOKk4rG2YIDV7g1DsX7wZAGRPCsyfcMNP5Zy\r
+       B+LjOBl+XBEzLIbT0E0U92sXjsyOZrI0PK5WvIcGKonB0PN9UUocHPsTeUz2PE5YZjOT\r
+       /a99EtTSflXHaS/WL8zV2VnW88nzdPL3F56jiP6O2GoFiNxcPNh0R4Viwyh9GhBJx1fp\r
+       nc1Q==\r
+MIME-Version: 1.0\r
+Received: by 10.152.129.137 with SMTP id nw9mr15497086lab.48.1334078347148;\r
+       Tue, 10 Apr 2012 10:19:07 -0700 (PDT)\r
+Sender: awg@xvx.ca\r
+Received: by 10.112.97.14 with HTTP; Tue, 10 Apr 2012 10:19:07 -0700 (PDT)\r
+X-Originating-IP: [128.221.197.57]\r
+In-Reply-To: <1334077496-9172-2-git-send-email-markwalters1009@gmail.com>\r
+References: <1334077496-9172-1-git-send-email-markwalters1009@gmail.com>\r
+       <1334077496-9172-2-git-send-email-markwalters1009@gmail.com>\r
+Date: Tue, 10 Apr 2012 11:19:07 -0600\r
+X-Google-Sender-Auth: miHml0up6etN5Qa3Wty8sH66Ur8\r
+Message-ID:\r
+ <CAMoJFUuXmLQR+awJnPKg8ZJAKbHbPAmSrEUVoFj_=dZ76WiKzw@mail.gmail.com>\r
+Subject: Re: [PATCH 1/2] cli: make --entire-thread=false work for format=json.\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: Mark Walters <markwalters1009@gmail.com>\r
+Content-Type: text/plain; charset=ISO-8859-1\r
+Content-Transfer-Encoding: quoted-printable\r
+X-Gm-Message-State:\r
+ ALoCoQmgf5OsmTko++xAXGX/AgSYPyMdsIMmBG3Sg0uXqX/tCqW47k0OQBO9Zy/0MOZXtV7qpWpi\r
+Cc: notmuch@notmuchmail.org\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: Tue, 10 Apr 2012 17:19:11 -0000\r
+\r
+Hi Mark,\r
+\r
+This looks good to me, but I haven't tested it. It's probably worth\r
+adding a test for the new functionality.\r
+\r
+One style issue below, which is a matter of taste and I'll defer to\r
+others if they disagree:\r
+\r
+On Tue, Apr 10, 2012 at 11:04, Mark Walters <markwalters1009@gmail.com> wro=\r
+te:\r
+> @@ -895,10 +905,11 @@ show_messages (void *ctx,\r
+> =A0 =A0 =A0 =A0 =A0 =A0if (status && !res)\r
+> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0res =3D status;\r
+> =A0 =A0 =A0 =A0 =A0 =A0next_indent =3D indent + 1;\r
+> + =A0 =A0 =A0 } else\r
+> + =A0 =A0 =A0 =A0 =A0 status =3D show_null_message (format);\r
+\r
+I accept, but don't particularly like, the notmuch style of omitting\r
+braces where they aren't required. However, an else with a brace on\r
+only one side just looks weird. If they're like this everywhere else\r
+then I guess it's best to be consistent, but to me it's a lot more\r
+readable as } else {.\r
+\r
+As I said above, I'll defer to others' judgement here, just thought it\r
+was worth pointing out.\r
+\r
+-- Adam\r