From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id eJ7iBtzowWKDawEAbAwnHQ (envelope-from ) for ; Sun, 03 Jul 2022 21:07:08 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id yPzeBtzowWLI8AAAauVa8A (envelope-from ) for ; Sun, 03 Jul 2022 21:07:08 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 88BF15601 for ; Sun, 3 Jul 2022 21:07:07 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id ACA565E226; Sun, 3 Jul 2022 19:07:04 +0000 (UTC) X-Greylist: delayed 516 seconds by postgrey-1.36 at yantan; Sun, 03 Jul 2022 19:07:01 UTC Received: from meesny.iki.fi (meesny.iki.fi [195.140.195.201]) by mail.notmuchmail.org (Postfix) with ESMTPS id 8459D5E01E for ; Sun, 3 Jul 2022 19:07:01 +0000 (UTC) Received: from c53 (gw1.nor.fi [185.218.193.67]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: too) by meesny.iki.fi (Postfix) with ESMTPSA id 15B75200C0; Sun, 3 Jul 2022 21:58:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1656874704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KXa5KGCRmtD6Tk5Ss0PYURq4DHpxTDxaW7X3S+8rQNQ=; b=vBTj/lhtML9pw5P/xuXyv+6NL5WH/hFoUZnt1Wyf5QEz4dWzL0Vqdj04pjIxGvAS3pC/5W SWSFOLwQL0UnPPiqK2iARpcFSjeRYkM6eCDtdFX3qn02Ns2iHZzIit4+x9pVUQgWL7690w W7gAG8BtAnqDyUQTqGd30V/6kpRUsLI= From: Tomi Ollila To: David Bremner , notmuch@notmuchmail.org Subject: Re: [PATCH] emacs: mark notmuch-query.el as obsolete In-Reply-To: <20220628115055.1816572-1-david@tethera.net> References: <20220628115055.1816572-1-david@tethera.net> User-Agent: Notmuch/0.36+55~gfb9633d (https://notmuchmail.org) Emacs/27.1 X-Face: HhBM'cA~ MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=iki.fi; s=meesny; t=1656874704; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=KXa5KGCRmtD6Tk5Ss0PYURq4DHpxTDxaW7X3S+8rQNQ=; b=l6K+iERqA+nZ2CfiIw57cMPTj9hJWz98WzY40u3VoFIm5wUox0fmojYGFyQBIjzg25t63l dnw3v/6ceLEjppJ92NOVxG/TAWZsuRbT+tH+kSEZoZ1kgKDwJ24oo+z46RgkHXbs8mA/NC J4ogvuJnELx+y/UgZUFVaW62fnCNu2s= ARC-Authentication-Results: i=1; ORIGINATING; auth=pass smtp.auth=too smtp.mailfrom=tomi.ollila@iki.fi ARC-Seal: i=1; s=meesny; d=iki.fi; t=1656874704; a=rsa-sha256; cv=none; b=E1bTVssaAk0sGTk2jhM8bMG5dRzWgBBZgj0j0AU62W6Z/3KMjpd16+7KyaAc8XjPIdzVz+ tHBjw33KIlwDW0Yxb+so3LR7ipm+cb30WxoiFp4BJGOjhIK/lypWEzfDALCdvDh3+8jPlZ XOu91JY37eBA76m0DdGpvTkXpDn0xUk= Message-ID-Hash: NJNWOKTGV5RZNFSGUDZPRE2QB6V52NPD X-Message-ID-Hash: NJNWOKTGV5RZNFSGUDZPRE2QB6V52NPD X-MailFrom: tomi.ollila@iki.fi X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656875228; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=qBcStIF3gn758cT+ZBfenx1wUngffavjGCJlb+MZOJ8=; b=k3GJYxOFBVRUPhsFbWg1Q//WfkNqtQ8WS/5IKo2agTW1GLcxlYw3rfAwHKE35Cq8heBfAD yOZQnHdYYvH1ywXQSwR+0iepREhga9KTrJpVBmZdTo5GWskCrVlzEuZxsCctwlh5GCacmc u9b1edm3M3x7smrTo7f7OeLpwCHEcO6MKn/45zMwAKEivQSf9eT6Z3EymhHyk0bCjjFFQ8 R8OHgMAYU/eJ8GdLwJN5jydDjM0uEQa55ndQU+ZbFA6ojyDqDn2fDSTnYW6ioJh/iIXJiR AG/kRpPTpkqwyYMHKGrFRPXiuhwXVlHeJHT//0gHK3+u0ylI0vFkBVnxtRszHQ== ARC-Seal: i=2; s=key1; d=yhetil.org; t=1656875228; a=rsa-sha256; cv=fail; b=e/xMFWjTz0ywMhS1dcYLVwWs6asdDM74kmClg/xjyGBlme195T8i6Eknd8n/MWT+EB+VNT bhRiBdzb9fUaBOWny/TTEy5NeFj4yAw/55nbE3Yzv5ZINRbOmSSrL+EmtZR25zdzfqSZAL xK4IOQZO+YT8Z7oLH1iYuQhCeIhRA1d+XkXGcxqO/OftpKdrIhGxoHye/pfaVOwe0avCRS Nh9q5h56vlxtH5H2Kp6+UQTICj3l6g/sY5F6q5dA3NS/20s5P7VGchInJfW7SaTBsQThMU mhhwK4MDYMUqXQXAS0TOkBudttWzilQwQ5/lqoMF9zUsZYkQ69QCRs4EO9Hp+w== ARC-Authentication-Results: i=2; aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=meesny header.b="vBTj/lht"; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: 2.73 Authentication-Results: aspmx1.migadu.com; dkim=fail ("body hash did not verify") header.d=iki.fi header.s=meesny header.b="vBTj/lht"; arc=reject ("signature check failed: fail, {[1] = sig:iki.fi:reject}"); dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 88BF15601 X-Spam-Score: 2.73 X-Migadu-Scanner: scn1.migadu.com X-TUID: LQst4YZobFVb On Tue, Jun 28 2022, David Bremner wrote: > The only functionality actually used by notmuch is the base function > notmuch-query-get-threads; the other functions in this file have > nothing to do with that (single) use. Move that function into > notmuch-lib.el and rename to reflect use. Deprecate the other > functions in notmuch-query.el. LGTM. Tomi > --- > emacs/notmuch-lib.el | 12 ++++++++++++ > emacs/notmuch-query.el | 23 ++++++++++------------- > emacs/notmuch-show.el | 3 +-- > emacs/notmuch-tree.el | 1 - > 4 files changed, 23 insertions(+), 16 deletions(-) > > diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el > index 1e631d0e..cc706924 100644 > --- a/emacs/notmuch-lib.el > +++ b/emacs/notmuch-lib.el > @@ -1029,6 +1029,18 @@ status." > > (defvar-local notmuch-show-process-crypto nil) > > +(defun notmuch--run-show (search-terms) > + "Return a list of threads of messages matching SEARCH-TERMS. > + > +A thread is a forest or list of trees. A tree is a two element > +list where the first element is a message, and the second element > +is a possibly empty forest of replies." > + (let ((args '("show" "--format=sexp" "--format-version=5"))) > + (when notmuch-show-process-crypto > + (setq args (append args '("--decrypt=true")))) > + (setq args (append args search-terms)) > + (apply #'notmuch-call-notmuch-sexp args))) > + > ;;; Generic Utilities > > (defun notmuch-interactive-region () > diff --git a/emacs/notmuch-query.el b/emacs/notmuch-query.el > index 5c7f4f8d..2a46144c 100644 > --- a/emacs/notmuch-query.el > +++ b/emacs/notmuch-query.el > @@ -25,17 +25,10 @@ > > ;;; Basic query function > > -(defun notmuch-query-get-threads (search-terms) > - "Return a list of threads of messages matching SEARCH-TERMS. > - > -A thread is a forest or list of trees. A tree is a two element > -list where the first element is a message, and the second element > -is a possibly empty forest of replies." > - (let ((args '("show" "--format=sexp" "--format-version=5"))) > - (when notmuch-show-process-crypto > - (setq args (append args '("--decrypt=true")))) > - (setq args (append args search-terms)) > - (apply #'notmuch-call-notmuch-sexp args))) > +(define-obsolete-function-alias > + 'notmuch-query-get-threads > + #'notmuch--run-show > + "notmuch 0.37") > > ;;; Mapping functions across collections of messages > > @@ -60,7 +53,7 @@ Flatten results to a list. See the function > (defun notmuch-query-map-tree (fn tree) > "Apply function FN to every message in TREE. > Flatten results to a list. See the function > -`notmuch-query-get-threads' for more information." > +`notmuch--run-show' for more information." > (cons (funcall fn (car tree)) > (notmuch-query-map-forest fn (cadr tree)))) > > @@ -70,7 +63,11 @@ Flatten results to a list. See the function > "Return a list of message-ids of messages that match SEARCH-TERMS." > (notmuch-query-map-threads > (lambda (msg) (plist-get msg :id)) > - (notmuch-query-get-threads search-terms))) > + (notmuch--run-show search-terms))) > + > +;;; Everything in this library is obsolete > +(dolist (fun '(map-aux map-threads map-forest map-tree get-message-ids)) > + (make-obsolete (intern (format "notmuch-query-%s" fun)) nil "notmuch 0.37")) > > (provide 'notmuch-query) > > diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el > index aded1ee7..0954d876 100644 > --- a/emacs/notmuch-show.el > +++ b/emacs/notmuch-show.el > @@ -32,7 +32,6 @@ > > (require 'notmuch-lib) > (require 'notmuch-tag) > -(require 'notmuch-query) > (require 'notmuch-wash) > (require 'notmuch-mua) > (require 'notmuch-crypto) > @@ -1366,7 +1365,7 @@ If no messages match the query return NIL." > (notmuch-show-previous-subject "")) > ;; Use results from the first query that returns some. > (while (and (not forest) queries) > - (setq forest (notmuch-query-get-threads > + (setq forest (notmuch--run-show > (append cli-args (list "'") (car queries) (list "'")))) > (when (and forest notmuch-show-single-message) > (setq forest (list (list (list forest))))) > diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el > index 303c6fad..8b246a2e 100644 > --- a/emacs/notmuch-tree.el > +++ b/emacs/notmuch-tree.el > @@ -27,7 +27,6 @@ > (require 'mail-parse) > > (require 'notmuch-lib) > -(require 'notmuch-query) > (require 'notmuch-show) > (require 'notmuch-tag) > (require 'notmuch-parser) > -- > 2.35.2 > > _______________________________________________ > notmuch mailing list -- notmuch@notmuchmail.org > To unsubscribe send an email to notmuch-leave@notmuchmail.org