Re: [PATCH 1/2] notmuch dump: default to batch-tag format.

diff --git a/56/dbb978f07eae3702fd244bd66938550395cdae b/56/dbb978f07eae3702fd244bd66938550395cdae
new file mode 100644 (file)
index 0000000..63c0d95
--- /dev/null
+++ b/56/dbb978f07eae3702fd244bd66938550395cdae
@@ -0,0 +1,124 @@
+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 11647431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 13:53:59 -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 qUkGPRBR3X2d for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Jan 2014 13:53:52 -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 5BC01431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 13:53:52 -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 1W6SDZ-0006Yp-35; Thu, 23 Jan 2014 21:53:47 +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.71)\r
+       (envelope-from <m.walters@qmul.ac.uk>)\r
+       id 1W6SCf-0004gj-Gp; Thu, 23 Jan 2014 21:52:49 +0000\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 1/2] notmuch dump: default to batch-tag format.\r
+In-Reply-To: <1390482167-10473-1-git-send-email-david@tethera.net>\r
+References: <m24n4xo2r0.fsf@guru.guru-group.fi>\r
+       <1390482167-10473-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.15.2+484~gfb59956 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Thu, 23 Jan 2014 21:51:23 +0000\r
+Message-ID: <87y5269xk4.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-Geographic: According to ripencc,\r
+       this message was delivered by a machine in Britain (UK) (GB).\r
+X-QM-SPAM-Info: Sender has good ham record.  :)\r
+X-QM-Body-MD5: d89f5f375a1458f1b760d4e7d018e8dd (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\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 0.0 points. Summary of the scoring: \r
+       * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+       provider *      (markwalters1009[at]gmail.com)\r
+       *  0.0 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: Thu, 23 Jan 2014 21:53:59 -0000\r
+\r
+\r
+This series LGTM +1\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+On Thu, 23 Jan 2014, David Bremner <david@tethera.net> wrote:\r
+> Although we didn't formally deprecate the old format, the new one has\r
+> been available for a year.\r
+> ---\r
+>  NEWS           | 10 ++++++++++\r
+>  notmuch-dump.c |  2 +-\r
+>  2 files changed, 11 insertions(+), 1 deletion(-)\r
+>\r
+> diff --git a/NEWS b/NEWS\r
+> index 28788d8..65679eb 100644\r
+> --- a/NEWS\r
+> +++ b/NEWS\r
+> @@ -1,3 +1,13 @@\r
+> +Notmuch 0.18 (UNRELEASED)\r
+> +=========================\r
+> +\r
+> +Command-Line Interface\r
+> +----------------------\r
+> +\r
+> +`notmuch dump` now defaults to `batch-tag` format.\r
+> +\r
+> +  The old format is still available with `--format=sup`.\r
+> +\r
+>  Notmuch 0.17 (2013-12-30)\r
+>  =========================\r
+>  \r
+> diff --git a/notmuch-dump.c b/notmuch-dump.c\r
+> index f8edda7..158142f 100644\r
+> --- a/notmuch-dump.c\r
+> +++ b/notmuch-dump.c\r
+> @@ -40,7 +40,7 @@ notmuch_dump_command (notmuch_config_t *config, int argc, char *argv[])\r
+>      char *output_file_name = NULL;\r
+>      int opt_index;\r
+>  \r
+> -    int output_format = DUMP_FORMAT_SUP;\r
+> +    int output_format = DUMP_FORMAT_BATCH_TAG;\r
+>  \r
+>      notmuch_opt_desc_t options[] = {\r
+>      { NOTMUCH_OPT_KEYWORD, &output_format, "format", 'f',\r
+> -- \r
+> 1.8.5.2\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r