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#71538: 29.3; project-find-file stopped working for files in git submodules Date: Fri, 14 Jun 2024 04:08:52 +0300 Message-ID: <52427b8c-95a7-45b9-97b0-ad8af08db87b@gutov.dev> References: Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27715"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla Thunderbird To: =?UTF-8?Q?P=C3=A4r?= Bohrarper , 71538@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jun 14 03:10:21 2024 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 1sHvSO-0006wB-Fx for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 14 Jun 2024 03:10:21 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHvS8-00079Y-R9; Thu, 13 Jun 2024 21:10:04 -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 1sHvS6-000791-DQ for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 21:10:02 -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 1sHvS5-0002tE-Qx for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 21:10:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sHvS5-0005jT-KJ for bug-gnu-emacs@gnu.org; Thu, 13 Jun 2024 21:10:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 14 Jun 2024 01:10:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71538 X-GNU-PR-Package: emacs Original-Received: via spool by 71538-submit@debbugs.gnu.org id=B71538.171832734521954 (code B ref 71538); Fri, 14 Jun 2024 01:10:01 +0000 Original-Received: (at 71538) by debbugs.gnu.org; 14 Jun 2024 01:09:05 +0000 Original-Received: from localhost ([127.0.0.1]:39464 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHvRA-0005i2-Nl for submit@debbugs.gnu.org; Thu, 13 Jun 2024 21:09:05 -0400 Original-Received: from wfhigh4-smtp.messagingengine.com ([64.147.123.155]:58113) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sHvR7-0005hT-Oo for 71538@debbugs.gnu.org; Thu, 13 Jun 2024 21:09:03 -0400 Original-Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailfhigh.west.internal (Postfix) with ESMTP id 9626218000EF; Thu, 13 Jun 2024 21:08:55 -0400 (EDT) Original-Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Thu, 13 Jun 2024 21:08:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gutov.dev; h=cc :content-transfer-encoding:content-type:content-type:date:date :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:subject:subject:to:to; s=fm3; t=1718327335; x=1718413735; bh=0hec3VJ6uV1U46wPeRGIma6NZl6TEn16N3oMy0riNCU=; b= DhAp425Q/CDkLTcld5YcQZ1WIr+dSYYFGQIkrJZjh4u/Ja94N+5KhMMe3sskVtJk /bfXec3/n/czAXivh5yh5gaVjVe1aP/c2Y3U7RQaTUQS0uccNFs+A3TbVZCY0vy4 RnqiF+G3U1ZaEndIm/h7ttp1S4BjIzwGL0rnQ8VO+z1V1gbdNlxLgLKLhtsdY+Ol HGVDRRgx1BnoPnWTMIjFBoR1RJF8rW/oy5BMXD4+Dhh0xETVKLxgwhHR/GosoDZ5 YJe+X3NzbmD235l9IuqB/FSTq/F9YHFjJvzTWgu/z68Vpfyk2v5e+97ROUeWF54A kHOOEKKqSLWXTSF2iG9HUw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding: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:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1718327335; x= 1718413735; bh=0hec3VJ6uV1U46wPeRGIma6NZl6TEn16N3oMy0riNCU=; b=I B9l5wl6S/9RQdfC8iFBcS2+/0r1YGJGjcejI5YIGyew6hq/fZl76z/04ossiJqLJ KWvYPMaYWrl8LhZOFKgiWfXAI7NC9LuYHic2/CJlkQv38g+69rgKmN6UMybosYbq CDcWH7nMJ1+t8MZrBBNG8Q0b0n2eB29t3bhdK4WRVp85z25Z7kPIHKSEsICKdsKc 946yVdLmuT2EkSGzuETGHKEDlX9I5on17gAU5vpiDh9Rjfl5m8hoYtEGCgNlVVJC KCjiN7AkNATKnJfCzJerpzpsOdLG7B9QcMqNbXES3IfayppC7g+wWGpLMRxtGELC +avTdN7ovbHZIJp67CZTA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvledrfedukedggeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvfhfhjggtgfesthekredttddvjeenucfhrhhomhepffhmihht rhihucfiuhhtohhvuceoughmihhtrhihsehguhhtohhvrdguvghvqeenucggtffrrghtth gvrhhnpeehkeeftdevteekheehffektdffveefffeileelhffggeeuhfdtkeefueeviedu gfenucffohhmrghinhepghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepughmihhtrhihsehguhhtohhvrdguvghv X-ME-Proxy: Feedback-ID: i0e71465a:Fastmail Original-Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 13 Jun 2024 21:08:54 -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:287213 Archived-At: Hi! On 13/06/2024 17:55, Pär Bohrarper wrote: > Since > https://github.com/emacs-mirror/emacs/commit/370b216f08699bdd85b910868642df441c06306c > project-find-file will produce a list where files located in a git > submodule is listed relative to the submodule instead of relative to the > project root. The problem happens when recursing into submodules if > project--vc-merge-submodules-p is true. Thanks for the report. I managed to fix it locally by > concating the module name to the file in the recursive call: > >     (let ((sub-files-maybe-relative >    (project--vc-list-files >     (concat default-directory module) >     backend >     extra-ignores))) >       (if project-files-relative-names >   ;; If project--vc-list-files returns relative names, then concat the > submodule name >   (mapcar (lambda (file) (concat (file-name-as-directory module) file)) > sub-files-maybe-relative) >                          sub-files-maybe-relative)) > > I don't know if this is the correct approach though. It's okay, I've pushed your patch to master with minor alterations in commit 2dae603c414. Thank you. Do you install the newer versions of 'project' from ELPA or build Emacs from source?