From 5a3e51aa4c6fed5bfb3c840d54b9a29ed3081345 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 22 Jun 2013 07:55:41 +0100 Subject: [PATCH] Re: [PATCH v6 03/12] cli: add insert command --- e2/8572e12a9b792c10b0cd463646e7bdcfbde421 | 104 ++++++++++++++++++++++ 1 file changed, 104 insertions(+) create mode 100644 e2/8572e12a9b792c10b0cd463646e7bdcfbde421 diff --git a/e2/8572e12a9b792c10b0cd463646e7bdcfbde421 b/e2/8572e12a9b792c10b0cd463646e7bdcfbde421 new file mode 100644 index 000000000..939328a01 --- /dev/null +++ b/e2/8572e12a9b792c10b0cd463646e7bdcfbde421 @@ -0,0 +1,104 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 0A5E8431FB6 + for ; Fri, 21 Jun 2013 23:55:53 -0700 (PDT) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -1.098 +X-Spam-Level: +X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5 + tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001, + NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id kjbPcFNVr4ao for ; + Fri, 21 Jun 2013 23:55:45 -0700 (PDT) +Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 897FA431FAE + for ; Fri, 21 Jun 2013 23:55:45 -0700 (PDT) +Received: from smtp.qmul.ac.uk ([138.37.6.40]) + by mail2.qmul.ac.uk with esmtp (Exim 4.71) + (envelope-from ) + id 1UqHjb-00029j-Rv; Sat, 22 Jun 2013 07:55:44 +0100 +Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost) + by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71) + (envelope-from ) + id 1UqHjb-0000su-IW; Sat, 22 Jun 2013 07:55:43 +0100 +From: Mark Walters +To: Peter Wang , notmuch@notmuchmail.org +Subject: Re: [PATCH v6 03/12] cli: add insert command +In-Reply-To: <1371880008-18312-4-git-send-email-novalazy@gmail.com> +References: <1371880008-18312-1-git-send-email-novalazy@gmail.com> + <1371880008-18312-4-git-send-email-novalazy@gmail.com> +User-Agent: Notmuch/0.15.2+171~ge2f30a2 (http://notmuchmail.org) Emacs/23.4.1 + (x86_64-pc-linux-gnu) +Date: Sat, 22 Jun 2013 07:55:41 +0100 +Message-ID: <87k3lmvdle.fsf@qmul.ac.uk> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Sender-Host-Address: 93.97.24.31 +X-QM-SPAM-Info: Sender has good ham record. :) +X-QM-Body-MD5: 7b0e8650e2d46bceb40e822df89c2d6c (of first 20000 bytes) +X-SpamAssassin-Score: -0.0 +X-SpamAssassin-SpamBar: / +X-SpamAssassin-Report: The QM spam filters have analysed this message to + determine if it is + spam. We require at least 5.0 points to mark a message as spam. + This message scored -0.0 points. + Summary of the scoring: + * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail + provider * (markwalters1009[at]gmail.com) + * -0.0 AWL AWL: From: address is in the auto white-list +X-QM-Scan-Virus: ClamAV says the message is clean +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Sat, 22 Jun 2013 06:55:53 -0000 + + +I haven't yet read the new notmuch-insert.c file but there is a small +conflict here: + +> diff --git a/notmuch.c b/notmuch.c +> index 45a73ce..cf5bf95 100644 +> --- a/notmuch.c +> +++ b/notmuch.c +> @@ -44,6 +44,9 @@ static command_t commands[] = { +> "Interactively setup notmuch for first use." }, +> { "new", notmuch_new_command, FALSE, +> "Find and import new messages to the notmuch database." }, +> + { "insert", notmuch_insert_command, FALSE, +> + "[options...] [--] [+|- ...] < message", +> + "Add a new message into the maildir and notmuch database." }, + +Jani removed the options string from the command struct +(id:1369480153-15190-1-git-send-email-jani@nikula.org) +so the "[options...] " line should be removed. + +Best wishes + +Mark + +> { "search", notmuch_search_command, FALSE, +> "Search for messages matching the given search terms." }, +> { "show", notmuch_show_command, FALSE, +> -- +> 1.7.12.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2