--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 C5EED431FB6\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 13:13:10 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 3VVO-cwvzUlA for <notmuch@notmuchmail.org>;\r
+ Sun, 16 Dec 2012 13:13:08 -0800 (PST)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 8B0CF431FAE\r
+ for <notmuch@notmuchmail.org>; Sun, 16 Dec 2012 13:13:08 -0800 (PST)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1TkLWD-0004UY-Kx; Sun, 16 Dec 2012 21:13:06 +0000\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.69)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1TkLWD-0001Gi-5z; Sun, 16 Dec 2012 21:13:05 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 0/5] add --format=text0 to notmuch search\r
+In-Reply-To: <cover.1355691124.git.jani@nikula.org>\r
+References: <cover.1355691124.git.jani@nikula.org>\r
+User-Agent: Notmuch/0.14+226~ge56ae2a (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 16 Dec 2012 21:13:08 +0000\r
+Message-ID: <87d2y9em57.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: ebaf31bafb9a55eaf407f92678b36c43 (of first 20000 bytes)\r
+X-SpamAssassin-Score: -1.8\r
+X-SpamAssassin-SpamBar: -\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored -1.8 points.\r
+ Summary of the scoring: \r
+ * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/,\r
+ * medium trust\r
+ * [138.37.6.40 listed in list.dnswl.org]\r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.5 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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: Sun, 16 Dec 2012 21:13:10 -0000\r
+\r
+On Sun, 16 Dec 2012, Jani Nikula <jani@nikula.org> wrote:\r
+> Hi all, v3 of id:cover.1355064714.git.jani@nikula.org\r
+>\r
+> Changes since v2:\r
+> * add new patch 1/5 to clarify sprinter documentation\r
+> * fix the test patch 4/5 according to id:8738z6wguj.fsf@qmul.ac.uk and\r
+> id:87y5gyvvv7.fsf@awakening.csail.mit.edu\r
+>\r
+> Diff to v2 at the end of the cover letter.\r
+\r
+LGTM +1\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+\r
+>\r
+>\r
+> BR,\r
+> Jani.\r
+>\r
+>\r
+> Jani Nikula (5):\r
+> sprinter: clarify separator documentation\r
+> sprinter: add text0 formatter for null character separated text\r
+> cli: add --format=text0 to notmuch search\r
+> test: notmuch search --format=text0\r
+> man: document notmuch search --format=text0\r
+>\r
+> man/man1/notmuch-search.1 | 26 ++++++++++++++++----------\r
+> notmuch-search.c | 16 ++++++++++++++--\r
+> sprinter-text.c | 22 ++++++++++++++++++++++\r
+> sprinter.h | 15 +++++++++++----\r
+> test/text | 33 +++++++++++++++++++++++++++++++++\r
+> 5 files changed, 96 insertions(+), 16 deletions(-)\r
+>\r
+> -- \r
+> 1.7.10.4\r
+>\r
+>\r
+>\r
+> diff --git a/sprinter.h b/sprinter.h\r
+> index f36b999..f859672 100644\r
+> --- a/sprinter.h\r
+> +++ b/sprinter.h\r
+> @@ -42,10 +42,11 @@ typedef struct sprinter {\r
+> */\r
+> void (*map_key) (struct sprinter *, const char *);\r
+> \r
+> - /* Insert a separator (usually extra whitespace) for improved\r
+> - * readability without affecting the abstract syntax of the\r
+> - * structure being printed.\r
+> - * For JSON, this could simply be a line break.\r
+> + /* Insert a separator (usually extra whitespace). For the text\r
+> + * printers, this is a syntactic separator. For the structured\r
+> + * printers, this is for improved readability without affecting\r
+> + * the abstract syntax of the structure being printed. For JSON,\r
+> + * this could simply be a line break.\r
+> */\r
+> void (*separator) (struct sprinter *);\r
+> \r
+> diff --git a/test/text b/test/text\r
+> index e003a66..b5ccefc 100755\r
+> --- a/test/text\r
+> +++ b/test/text\r
+> @@ -55,30 +55,34 @@ test_expect_equal "$output" \\r
+> add_email_corpus\r
+> \r
+> test_begin_subtest "Search message tags: text0"\r
+> -cat <<EOF > EXPECTED.$test_count\r
+> +cat <<EOF > EXPECTED\r
+> attachment inbox signed unread\r
+> EOF\r
+> -notmuch search --format=text0 --output=tags '*' | xargs -0 | notmuch_search_sanitize > OUTPUT.$test_count\r
+> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +notmuch search --format=text0 --output=tags '*' | xargs -0 | notmuch_search_sanitize > OUTPUT\r
+> +test_expect_equal_file EXPECTED OUTPUT\r
+> \r
+> +# Use tr(1) to convert --output=text0 to --output=text for\r
+> +# comparison. Also translate newlines to spaces to fail with more\r
+> +# noise if they are present as delimiters instead of null\r
+> +# characters. This assumes there are no newlines in the data.\r
+> test_begin_subtest "Compare text vs. text0 for threads"\r
+> -notmuch search --format=text --output=threads '*' | notmuch_search_sanitize > EXPECTED.$test_count\r
+> -notmuch search --format=text0 --output=threads '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count\r
+> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +notmuch search --format=text --output=threads '*' | notmuch_search_sanitize > EXPECTED\r
+> +notmuch search --format=text0 --output=threads '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT\r
+> +test_expect_equal_file EXPECTED OUTPUT\r
+> \r
+> test_begin_subtest "Compare text vs. text0 for messages"\r
+> -notmuch search --format=text --output=messages '*' | notmuch_search_sanitize > EXPECTED.$test_count\r
+> -notmuch search --format=text0 --output=messages '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count\r
+> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +notmuch search --format=text --output=messages '*' | notmuch_search_sanitize > EXPECTED\r
+> +notmuch search --format=text0 --output=messages '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT\r
+> +test_expect_equal_file EXPECTED OUTPUT\r
+> \r
+> test_begin_subtest "Compare text vs. text0 for files"\r
+> -notmuch search --format=text --output=files '*' | notmuch_search_sanitize > EXPECTED.$test_count\r
+> -notmuch search --format=text0 --output=files '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count\r
+> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +notmuch search --format=text --output=files '*' | notmuch_search_sanitize > EXPECTED\r
+> +notmuch search --format=text0 --output=files '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT\r
+> +test_expect_equal_file EXPECTED OUTPUT\r
+> \r
+> test_begin_subtest "Compare text vs. text0 for tags"\r
+> -notmuch search --format=text --output=tags '*' | notmuch_search_sanitize > EXPECTED.$test_count\r
+> -notmuch search --format=text0 --output=tags '*' | xargs -0 -L1 | notmuch_search_sanitize > OUTPUT.$test_count\r
+> -test_expect_equal_file EXPECTED.$test_count OUTPUT.$test_count\r
+> +notmuch search --format=text --output=tags '*' | notmuch_search_sanitize > EXPECTED\r
+> +notmuch search --format=text0 --output=tags '*' | tr "\n\0" " \n" | notmuch_search_sanitize > OUTPUT\r
+> +test_expect_equal_file EXPECTED OUTPUT\r
+> \r
+> test_done\r
projects / notmuch-archives.git / commitdiff