Re: [Patch v7 06/14] notmuch-restore: move query handling for batch restore to parser

diff --git a/c2/5921e1ec89cefa37bb15d8e13bd0f3969e091c b/c2/5921e1ec89cefa37bb15d8e13bd0f3969e091c
new file mode 100644 (file)
index 0000000..2aee3b8
--- /dev/null
+++ b/c2/5921e1ec89cefa37bb15d8e13bd0f3969e091c
@@ -0,0 +1,80 @@
+Return-Path: <bremner@unb.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 E4891431FBC\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 10:18:32 -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 Na12Jy04G6hC for <notmuch@notmuchmail.org>;\r
+       Sat, 15 Dec 2012 10:18:31 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher AES256-SHA (256/256 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id F3600431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 15 Dec 2012 10:18:30 -0800 (PST)\r
+Received: from fctnnbsc30w-142167090129.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([142.167.90.129] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1TjwJg-0006dj-Vy; Sat, 15 Dec 2012 14:18:29 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@unb.ca>)\r
+       id 1TjwJb-0006gu-FN; Sat, 15 Dec 2012 14:18:23 -0400\r
+From: David Bremner <david@tethera.net>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v7 06/14] notmuch-restore: move query handling for batch\r
+       restore to parser\r
+In-Reply-To: <87wqwj8alx.fsf@qmul.ac.uk>\r
+References: <1355492062-7546-1-git-send-email-david@tethera.net>\r
+       <1355492062-7546-7-git-send-email-david@tethera.net>\r
+       <87wqwj8alx.fsf@qmul.ac.uk>\r
+User-Agent: Notmuch/0.14+163~g11a220a (http://notmuchmail.org) Emacs/24.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 15 Dec 2012 14:18:23 -0400\r
+Message-ID: <87hann5gcw.fsf@zancas.localnet>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+X-Spam_bar: -\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: Sat, 15 Dec 2012 18:18:33 -0000\r
+\r
+Mark Walters <markwalters1009@gmail.com> writes:\r
+\r
+>> +   if (hex_decode_inplace (tok) != HEX_SUCCESS) {\r
+>> +       ret = line_error (TAG_PARSE_INVALID, line_for_error,\r
+>> +                         "hex decoding of query %s failed", tok);\r
+>> +       goto DONE;\r
+>> +   }\r
+>> +   /* skip 'id:' */\r
+>> +   *query_string = tok + 3;\r
+>\r
+> This looks like it doesn't double_quote the query_string in this (the\r
+> TAG_FLAG_ID_ONLY) case. Is that deliberate?\r
+\r
+Yes, that's what I meant by \r
+\r
+,----\r
+| We also need this to avoid the query quoting for more\r
+| general queries (to be written) that will mess up raw message-ids.\r
+`----\r
+\r
+perhaps it deserves a comment in the code.\r