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

diff --git a/dc/913720dbc7e8e065947ba9678cf801926af032 b/dc/913720dbc7e8e065947ba9678cf801926af032
new file mode 100644 (file)
index 0000000..8fb08bd
--- /dev/null
+++ b/dc/913720dbc7e8e065947ba9678cf801926af032
@@ -0,0 +1,89 @@
+Return-Path: <bremner@tethera.net>\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 223B6431FBD\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 05:03:02 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 VVKV3+9pS0up for <notmuch@notmuchmail.org>;\r
+       Thu, 23 Jan 2014 05:02:56 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F3423431FAF\r
+       for <notmuch@notmuchmail.org>; Thu, 23 Jan 2014 05:02:55 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1W6Jvr-0006gi-Iy; Thu, 23 Jan 2014 09:02:55 -0400\r
+Received: (nullmailer pid 10511 invoked by uid 1000); Thu, 23 Jan 2014\r
+       13:02:52 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] notmuch dump: default to batch-tag format.\r
+Date: Thu, 23 Jan 2014 09:02:46 -0400\r
+Message-Id: <1390482167-10473-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <m24n4xo2r0.fsf@guru.guru-group.fi>\r
+References: <m24n4xo2r0.fsf@guru.guru-group.fi>\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 13:03:02 -0000\r
+\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