From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#66806: 30.0.50; [PATCH] 'project-find-regexp' passes Git submodules to the search program Date: Sun, 29 Oct 2023 23:41:30 +0200 Message-ID: <7136cdaa-25ea-17f7-396c-e217d845e837@gutov.dev> References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------os10heuQi9iOgbWx03nDw2dB" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9834"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 To: Jim Porter , 66806@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Oct 29 22:42:57 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qxDYe-0002Ma-51 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Oct 2023 22:42:56 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxDYG-0007RF-FK; Sun, 29 Oct 2023 17:42:32 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qxDYE-0007Ql-Qn for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2023 17:42:31 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qxDYE-0002yv-IV for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2023 17:42:30 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxDYk-0004Y4-9a for bug-gnu-emacs@gnu.org; Sun, 29 Oct 2023 17:43:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Oct 2023 21:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66806 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 66806-submit@debbugs.gnu.org id=B66806.169861573517415 (code B ref 66806); Sun, 29 Oct 2023 21:43:02 +0000 Original-Received: (at 66806) by debbugs.gnu.org; 29 Oct 2023 21:42:15 +0000 Original-Received: from localhost ([127.0.0.1]:43515 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDXz-0004Wp-2g for submit@debbugs.gnu.org; Sun, 29 Oct 2023 17:42:15 -0400 Original-Received: from out5-smtp.messagingengine.com ([66.111.4.29]:52369) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxDXw-0004WY-LZ for 66806@debbugs.gnu.org; Sun, 29 Oct 2023 17:42:13 -0400 Original-Received: from compute7.internal (compute7.nyi.internal [10.202.2.48]) by mailout.nyi.internal (Postfix) with ESMTP id 84B945C0062; Sun, 29 Oct 2023 17:41:33 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute7.internal (MEProxy); Sun, 29 Oct 2023 17:41:33 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm2; t=1698615693; x=1698702093; bh=G+ ad9i+2f/220J2rOEZZ0C9GDJE1sefG9twqPnhz+dc=; b=KqqhL10LlIHHmlpLZ2 PH5t9rl5ugyhn6kXJKeJLCxxLFq7EfiUXLCmwiejcYlasUNBv49UaQzJjek/Xe9f mhxglPmD87EXf9spwhe6uWoG01h662o0qXbRTSC7tA25+dUuSstdvZiZg7MQUGCc pHyPSk7IT1d+eWZeWFZG1fva9DWZ6keOMNEPfKsjJC690UVNnSvENW/QV64LfCj1 1aY7hdTDWsCU/jjUqjflFH61AVdbU8WqRUUJ51HZZqXBEUrevCJSseD0SqWnHjDa mEj37AocM8NNFYpMqJqI2iugaiYft8f7fMBj2Hr49l05i8h0dG1+yoeOdgdPzX/i 1nOg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1698615693; x=1698702093; bh=G+ad9i+2f/220 J2rOEZZ0C9GDJE1sefG9twqPnhz+dc=; b=ugatVJRNYbr0NdD7cfn+2y0CVDvZG dXTBNDiRDrM2iB9pHQJvmjyp95dh6+uHUiHilNoSmjnyT7ymW1LfByEJY+wElwBC YCmpSqL/LAhdBiXqKsciMUIFY00LLPjKl2oF8FmzYyjfkxfOIrEviw+o1QJ54YD1 g1ofg5m5b0tMX0meKUXBxexPC+xQhS20BaDxrkOAvhCPWE0HY+g/M3L2+WcrY87k reEmOePqetv7Vk+LV0AocO0n7NNn9ZbcPXYR9F/VyTAGv0YkNubnYkxqIqaJJ3FC kS2L6tv2GZbsL++xt5CFvYp7lKRAkHvy3KyJkTMYldOhhzflmQ2iwtMRA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrleekgdduheduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtkfffgggfuffvfhfhjgesmhdtre ertdefjeenucfhrhhomhepffhmihhtrhihucfiuhhtohhvuceoughmihhtrhihsehguhht ohhvrdguvghvqeenucggtffrrghtthgvrhhnpedtjeegteeifffhjeffgfffieeiteetvd etgfeuueeiveejtdeguedvheegfeehvdenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpegumhhithhrhiesghhuthhovhdruggvvh X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Sun, 29 Oct 2023 17:41:32 -0400 (EDT) Content-Language: en-US In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:273527 Archived-At: This is a multi-part message in MIME format. --------------os10heuQi9iOgbWx03nDw2dB Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Hi Jim, On 29/10/2023 07:36, Jim Porter wrote: > By default, this is just a theoretical problem, but if you customize > 'xref-search-program-alist' and 'xref-search-program' to include some > other program, this can cause real issues. For example, I tried to add > "ag" to this list[1], and unfortunately, it just doesn't work in this > case. The results for submodules get duplicated, and there's no way I > can see with ag to search only the specified *files*, ignoring any > directories. (Looking at the definition for ripgrep, I'm guessing the > "-g '!*/'" is the trick for that program, but nothing similar works for > ag.) > > Attached are two possible patches for this: a minimal version that just > fixes 'project-find-regexp', and a maximal version that fixes this in > general, and should theoretically speed up 'project-search' and > 'project-query-replace-regexp' since they no longer need to call > 'file-regular-p' on every file. I kept this unfortunate situation around because every obvious fix brought non-negligible performance regressions: the version with file-regular-p slowed one of my examples (Mozilla's repo) by 370%. Your cl-set-difference version slowed it down by 10-14% -- better, but still something that seemed worse on balance when I tried this before, so I preferred to work around it in command implementations: the "-s" or "--no-messages" flags xref-search-program-alist. And that's not to mention usage over Tramp (which would be affected by the +1 process call that you mentioned as well, but that seems unavoidable). Anyway, after recent experience micro-optimizing list operations, I came up with this version where the impact seems minimal. WDYT? --------------os10heuQi9iOgbWx03nDw2dB Content-Type: text/x-patch; charset=UTF-8; name="project-no-submodules.diff" Content-Disposition: attachment; filename="project-no-submodules.diff" Content-Transfer-Encoding: base64 ZGlmZiAtLWdpdCBhL2xpc3AvcHJvZ21vZGVzL3Byb2plY3QuZWwgYi9saXNwL3Byb2dtb2Rl cy9wcm9qZWN0LmVsCmluZGV4IGZkYTEwODFlYjYyLi5lM2U3NjU0ZTY4NyAxMDA2NDQKLS0t IGEvbGlzcC9wcm9nbW9kZXMvcHJvamVjdC5lbAorKysgYi9saXNwL3Byb2dtb2Rlcy9wcm9q ZWN0LmVsCkBAIC02NDcsNiArNjQ3LDcgQEAgcHJvamVjdC0tdmMtbGlzdC1maWxlcwogICAg ICAgICAgICAgKGluY2x1ZGUtdW50cmFja2VkIChwcm9qZWN0LS12YWx1ZS1pbi1kaXIKICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3Byb2plY3QtdmMtaW5jbHVkZS11bnRy YWNrZWQKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlyKSkKKyAgICAgICAg ICAgIChzdWJtb2R1bGVzIChwcm9qZWN0LS1naXQtc3VibW9kdWxlcykpCiAgICAgICAgICAg ICBmaWxlcykKICAgICAgICAoc2V0cSBhcmdzIChhcHBlbmQgYXJncwogICAgICAgICAgICAg ICAgICAgICAgICAgICAnKCItYyIgIi0tZXhjbHVkZS1zdGFuZGFyZCIpCkBAIC02ODAsMTMg KzY4MSwyNCBAQCBwcm9qZWN0LS12Yy1saXN0LWZpbGVzCiAgICAgICAgKHNldHEgZmlsZXMK ICAgICAgICAgICAgICAobWFwY2FyCiAgICAgICAgICAgICAgIChsYW1iZGEgKGZpbGUpIChj b25jYXQgZGVmYXVsdC1kaXJlY3RvcnkgZmlsZSkpCi0gICAgICAgICAgICAgIChzcGxpdC1z dHJpbmcKLSAgICAgICAgICAgICAgIChhcHBseSAjJ3ZjLWdpdC0tcnVuLWNvbW1hbmQtc3Ry aW5nIG5pbCAibHMtZmlsZXMiIGFyZ3MpCi0gICAgICAgICAgICAgICAiXDAiIHQpKSkKKyAg ICAgICAgICAgICAgKGxldCogKChmaWxlcworICAgICAgICAgICAgICAgICAgICAgIChzcGxp dC1zdHJpbmcKKyAgICAgICAgICAgICAgICAgICAgICAgKGFwcGx5ICMndmMtZ2l0LS1ydW4t Y29tbWFuZC1zdHJpbmcgbmlsICJscy1maWxlcyIgYXJncykKKyAgICAgICAgICAgICAgICAg ICAgICAgIlwwIiB0KSkKKyAgICAgICAgICAgICAgICAgICAgIHJlZikKKyAgICAgICAgICAg ICAgICAod2hlbiBzdWJtb2R1bGVzCisgICAgICAgICAgICAgICAgICA7OyBIYW5kLW9wdGlt aXplZCB2ZXJzaW9uIG9mIG5zZXQtZGlmZmVyZW5jZS4KKyAgICAgICAgICAgICAgICAgICh3 aGlsZSAobWVtYmVyIChjYXIgZmlsZXMpIHN1Ym1vZHVsZXMpCisgICAgICAgICAgICAgICAg ICAgIChzZXRxIGZpbGVzIChjZHIgZmlsZXMpKSkKKyAgICAgICAgICAgICAgICAgIChzZXRx IHJlZiBmaWxlcykKKyAgICAgICAgICAgICAgICAgICh3aGlsZSByZWYKKyAgICAgICAgICAg ICAgICAgICAgKGlmIChtZW1iZXIgKGNhZHIgcmVmKSBzdWJtb2R1bGVzKQorICAgICAgICAg ICAgICAgICAgICAgICAgKHNldGNkciByZWYgKGNkZHIgcmVmKSkKKyAgICAgICAgICAgICAg ICAgICAgICAoc2V0cSByZWYgKGNkciByZWYpKSkpKQorICAgICAgICAgICAgICAgIGZpbGVz KSkpCiAgICAgICAgKHdoZW4gKHByb2plY3QtLXZjLW1lcmdlLXN1Ym1vZHVsZXMtcCBkZWZh dWx0LWRpcmVjdG9yeSkKICAgICAgICAgIDs7IFVuZm9ydHVuYXRlbHksICdscy1maWxlcyAt LXJlY3Vyc2Utc3VibW9kdWxlcycgY29uZmxpY3RzIHdpdGggJy1vJy4KLSAgICAgICAgIChs ZXQqICgoc3VibW9kdWxlcyAocHJvamVjdC0tZ2l0LXN1Ym1vZHVsZXMpKQotICAgICAgICAg ICAgICAgIChzdWItZmlsZXMKKyAgICAgICAgIChsZXQgKChzdWItZmlsZXMKICAgICAgICAg ICAgICAgICAgKG1hcGNhcgogICAgICAgICAgICAgICAgICAgKGxhbWJkYSAobW9kdWxlKQog ICAgICAgICAgICAgICAgICAgICAod2hlbiAoZmlsZS1kaXJlY3RvcnktcCBtb2R1bGUpCg== --------------os10heuQi9iOgbWx03nDw2dB--