Re: [PATCH v6 03/12] cli: add insert command

diff --git a/e2/8572e12a9b792c10b0cd463646e7bdcfbde421 b/e2/8572e12a9b792c10b0cd463646e7bdcfbde421
new file mode 100644 (file)
index 0000000..939328a
--- /dev/null
+++ b/e2/8572e12a9b792c10b0cd463646e7bdcfbde421
@@ -0,0 +1,104 @@
+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 0A5E8431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Jun 2013 23:55:53 -0700 (PDT)\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 kjbPcFNVr4ao for <notmuch@notmuchmail.org>;\r
+       Fri, 21 Jun 2013 23:55:45 -0700 (PDT)\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 897FA431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 21 Jun 2013 23:55:45 -0700 (PDT)\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 1UqHjb-00029j-Rv; Sat, 22 Jun 2013 07:55:44 +0100\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 1UqHjb-0000su-IW; Sat, 22 Jun 2013 07:55:43 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v6 03/12] cli: add insert command\r
+In-Reply-To: <1371880008-18312-4-git-send-email-novalazy@gmail.com>\r
+References: <1371880008-18312-1-git-send-email-novalazy@gmail.com>\r
+       <1371880008-18312-4-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.15.2+171~ge2f30a2 (http://notmuchmail.org) Emacs/23.4.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Sat, 22 Jun 2013 07:55:41 +0100\r
+Message-ID: <87k3lmvdle.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: 7b0e8650e2d46bceb40e822df89c2d6c (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.\r
+       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: Sat, 22 Jun 2013 06:55:53 -0000\r
+\r
+\r
+I haven't yet read the new notmuch-insert.c file but there is a small\r
+conflict here:\r
+\r
+> diff --git a/notmuch.c b/notmuch.c\r
+> index 45a73ce..cf5bf95 100644\r
+> --- a/notmuch.c\r
+> +++ b/notmuch.c\r
+> @@ -44,6 +44,9 @@ static command_t commands[] = {\r
+>        "Interactively setup notmuch for first use." },\r
+>      { "new", notmuch_new_command, FALSE,\r
+>        "Find and import new messages to the notmuch database." },\r
+> +    { "insert", notmuch_insert_command, FALSE,\r
+> +      "[options...] [--] [+<tag>|-<tag> ...] < message",\r
+> +      "Add a new message into the maildir and notmuch database." },\r
+\r
+Jani removed the options string from the command struct\r
+(id:1369480153-15190-1-git-send-email-jani@nikula.org)\r
+so the "[options...] " line should be removed.\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+>      { "search", notmuch_search_command, FALSE,\r
+>        "Search for messages matching the given search terms." },\r
+>      { "show", notmuch_show_command, FALSE,\r
+> -- \r
+> 1.7.12.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r