From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Spencer Baugh Newsgroups: gmane.emacs.bugs Subject: bug#64088: [PATCH] Make project-root for vc projects return an absolute path Date: Thu, 15 Jun 2023 16:48:05 -0400 Message-ID: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11456"; mail-complaints-to="usenet@ciao.gmane.io" To: 64088@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jun 15 22:49:18 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 1q9tuA-0002mh-EJ for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 15 Jun 2023 22:49:18 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q9tu0-00084j-L6; Thu, 15 Jun 2023 16:49:09 -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 1q9ttv-00084L-9n for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 16:49:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q9ttv-0000Gx-15 for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 16:49:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q9ttu-0002Dv-M3 for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 16:49:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Spencer Baugh Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 15 Jun 2023 20:49:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64088 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16868620938384 (code B ref -1); Thu, 15 Jun 2023 20:49:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 15 Jun 2023 20:48:13 +0000 Original-Received: from localhost ([127.0.0.1]:48029 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9tt7-0002B7-27 for submit@debbugs.gnu.org; Thu, 15 Jun 2023 16:48:13 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:37506) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9tt4-0002Al-Gc for submit@debbugs.gnu.org; Thu, 15 Jun 2023 16:48:11 -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 1q9tt4-0007sI-9h for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 16:48:10 -0400 Original-Received: from mxout5.mail.janestreet.com ([64.215.233.18]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9tt1-0000Bj-DF for bug-gnu-emacs@gnu.org; Thu, 15 Jun 2023 16:48:10 -0400 Received-SPF: pass client-ip=64.215.233.18; envelope-from=sbaugh@janestreet.com; helo=mxout5.mail.janestreet.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:263435 Archived-At: --=-=-= Content-Type: text/plain Tags: patch Before this, if a vc project was in the user's home directory, project-root would be "~/some/path". This violates the spec of project-root, which requires an absolute path. One concrete bug caused by this is that (project-forget-project "~/some/path") would work but (project-forget-project "/home/user/some/path") would not. I ran into this while trying to use file-notify to automatically discover and forget projects. file-notify returns truly absolute paths, so I ran into the aforementioned concrete bug. In GNU Emacs 29.0.90 (build 8, x86_64-pc-linux-gnu, X toolkit, cairo version 1.15.12, Xaw scroll bars) of 2023-06-04 built on igm-qws-u22796a Repository revision: 11d76029db5f0d9e016f247aac24dd430b729c2a Repository branch: emacs-29 Windowing system distributor 'The X.Org Foundation', version 11.0.12011000 System Description: CentOS Linux 7 (Core) Configured using: 'configure --with-x-toolkit=lucid --with-gif=ifavailable' --=-=-= Content-Type: text/patch Content-Disposition: attachment; filename=0001-Make-project-root-for-vc-projects-return-an-absolute.patch >From 2c3ed85f857759458130a7b707d9b6f4d2c1ef20 Mon Sep 17 00:00:00 2001 From: Spencer Baugh Date: Thu, 15 Jun 2023 16:45:48 -0400 Subject: [PATCH] Make project-root for vc projects return an absolute path Before this, if a vc project was in the user's home directory, project-root would be "~/some/path". This violates the spec of project-root, which requires an absolute path. One concrete bug caused by this is that (project-forget-project "~/some/path") would work but (project-forget-project "/home/user/some/path") would not. * lisp/progmodes/project.el (project-try-vc): Expand root directory before returning project. --- lisp/progmodes/project.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 2cffc1c0669..72cdb94bce4 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -689,7 +689,7 @@ project-try-vc (let* ((parent (file-name-directory (directory-file-name root)))) (setq root (vc-call-backend 'Git 'root parent)))) (when root - (setq project (list 'vc backend root)) + (setq project (list 'vc backend (expand-file-name root))) ;; FIXME: Cache for a shorter time. (vc-file-setprop dir 'project-vc project) project)))) -- 2.39.3 --=-=-=--