From: Dmitry Kurochkin Date: Sun, 29 Jan 2012 22:54:32 +0000 (+0400) Subject: Re: [PATCH 1/6] emacs: move tag format validation to `notmuch-tag' function X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0ca77dbf06b56f4a2be86155a93f3710837a6413;p=notmuch-archives.git Re: [PATCH 1/6] emacs: move tag format validation to `notmuch-tag' function --- diff --git a/c0/712f53473e39900ebf3f9db55470237e505b1c b/c0/712f53473e39900ebf3f9db55470237e505b1c new file mode 100644 index 000000000..c4c95a24b --- /dev/null +++ b/c0/712f53473e39900ebf3f9db55470237e505b1c @@ -0,0 +1,128 @@ +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 7E1CA429E49 + for ; Sun, 29 Jan 2012 14:55:48 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.799 +X-Spam-Level: +X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7] 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 Ce2ORFEyS5gc for ; + Sun, 29 Jan 2012 14:55:48 -0800 (PST) +Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com + [209.85.214.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id BCA1F431E64 + for ; Sun, 29 Jan 2012 14:55:47 -0800 (PST) +Received: by bke11 with SMTP id 11so864948bke.26 + for ; Sun, 29 Jan 2012 14:55:43 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; + h=from:to:cc:subject:in-reply-to:references:user-agent:date + :message-id:mime-version:content-type; + bh=oSGkgX0ZZFqN78HpgiDOmXBegxIko5DOVA40Fdfzdk4=; + b=kbfZRMD68rEBnpS4Yt3boc9jFyoOYjaI07TLysjApuCZSHWqpVMsEKwsd8VZ9U9SIx + J8QtJ7W0h0kizIzFZ+bQoaPbD5/sswdBfMec3QpnjLKZ8wpR6yYS7kz5YTnWNIpyxk/a + 8PMl6WtpHPAxT7LGhgNe6hn80EaNs7XYEZXx8= +Received: by 10.204.156.5 with SMTP id u5mr7574879bkw.84.1327877743660; + Sun, 29 Jan 2012 14:55:43 -0800 (PST) +Received: from localhost ([91.144.186.21]) + by mx.google.com with ESMTPS id ev5sm33296240bkb.4.2012.01.29.14.55.41 + (version=TLSv1/SSLv3 cipher=OTHER); + Sun, 29 Jan 2012 14:55:42 -0800 (PST) +From: Dmitry Kurochkin +To: Austin Clements +Subject: Re: [PATCH 1/6] emacs: move tag format validation to `notmuch-tag' + function +In-Reply-To: <20120129213427.GF17991@mit.edu> +References: <1327725684-5887-1-git-send-email-dmitry.kurochkin@gmail.com> + <20120129213427.GF17991@mit.edu> +User-Agent: Notmuch/0.11+134~g7ddba9d (http://notmuchmail.org) Emacs/23.3.1 + (x86_64-pc-linux-gnu) +Date: Mon, 30 Jan 2012 02:54:32 +0400 +Message-ID: <87fwey86hj.fsf@gmail.com> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +Cc: notmuch@notmuchmail.org +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: Sun, 29 Jan 2012 22:55:48 -0000 + +Hi Austin. + +On Sun, 29 Jan 2012 16:34:27 -0500, Austin Clements wrote: +> One philosophical nit below, but not enough to hold this up. +> +> Quoth Dmitry Kurochkin on Jan 28 at 8:41 am: +> > Before the change, tag format validation was done in +> > `notmuch-search-operate-all' function only. The patch moves it down +> > to `notmuch-tag', so that all users of that function get input +> > validation. +> > --- +> > emacs/notmuch.el | 12 ++++++------ +> > 1 files changed, 6 insertions(+), 6 deletions(-) +> > +> > diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> > index 72f78ed..84d7d0a 100644 +> > --- a/emacs/notmuch.el +> > +++ b/emacs/notmuch.el +> > @@ -522,6 +522,12 @@ Note: Other code should always use this function alter tags of +> > messages instead of running (notmuch-call-notmuch-process \"tag\" ..) +> > directly, so that hooks specified in notmuch-before-tag-hook and +> > notmuch-after-tag-hook will be run." +> > + ;; Perform some validation +> > + (when (null tags) (error "No tags given")) +> +> Since this is a non-interactive function and hence is meant to be +> invoked programmatically, I would expect it to accept zero tags. +> Unlike the following check, this is a UI-level check and thus, I +> believe, belongs in interactive functions (even if that requires a +> little duplication). +> + +Agreed. Though I would hate to add the same check to each tag +operation. Perhaps this check can go to +`notmuch-select-tags-with-completion'? + +This is not the main patch in the series. So I think I would prefer not +to make v2 because of this issue. If we come up with a good (i.e. no +duplication) solution, I will prepare a separate patch for it. + +Regards, + Dmitry + +> > + (mapc (lambda (tag) +> > + (unless (string-match-p "^[-+][-+_.[:word:]]+$" tag) +> > + (error "Tag must be of the form `+this_tag' or `-that_tag'"))) +> > + tags) +> > (run-hooks 'notmuch-before-tag-hook) +> > (apply 'notmuch-call-notmuch-process +> > (append (list "tag") tags (list "--" query))) +> > @@ -890,12 +896,6 @@ characters as well as `_.+-'. +> > (interactive (notmuch-select-tags-with-completion +> > "Operations (+add -drop): notmuch tag " +> > '("+" "-"))) +> > - ;; Perform some validation +> > - (when (null actions) (error "No operations given")) +> > - (mapc (lambda (action) +> > - (unless (string-match-p "^[-+][-+_.[:word:]]+$" action) +> > - (error "Action must be of the form `+this_tag' or `-that_tag'"))) +> > - actions) +> > (apply 'notmuch-tag notmuch-search-query-string actions)) +> > +> > (defun notmuch-search-buffer-title (query)