From: Dmitry Gutov <dmitry@gutov.dev>
To: Spencer Baugh <sbaugh@janestreet.com>, 69188@debbugs.gnu.org
Subject: bug#69188: 30.0.50; project-files + project-find-file is slow in large repositories
Date: Wed, 17 Apr 2024 02:48:44 +0300 [thread overview]
Message-ID: <4e8e8f14-26be-4a50-b47b-a0373ce19b9a@gutov.dev> (raw)
In-Reply-To: <1b566e9e-eca5-4746-8e31-4155d35ce7a8@gutov.dev>
[-- Attachment #1: Type: text/plain, Size: 812 bytes --]
On 13/04/2024 05:34, Dmitry Gutov wrote:
> Both options are relatively clunky, and the second one might also fail
> to work when DIRS is non-nil (or would have to fall back to absolute
> names anyway), so I'm leaning toward the first one. It might also allow
> certain code to be written supporting both relative and absolute names
> (e.g. a process call both binds default-directory to root and keeps the
> file names as-is -- the relative ones would be interpreted as such, the
> rest just as they are interpreted now).
Here's how that change can look.
The patch should demonstrate both the performance improvements for
project-find-file and project-find-regexp, and some awkwardness in the
implementation, chiefly due to backward compatibility.
Guess more tests will be required, at the very least.
[-- Attachment #2: project-files-relative-names.diff --]
[-- Type: text/x-patch, Size: 6189 bytes --]
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 000a05804a8..567a25e0906 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -323,6 +323,12 @@ project--file-completion-table
(cl-defmethod project-root ((project (head transient)))
(cdr project))
+(defvar project-files-relative-names nil
+ "When non-nil, `project-files' is allowed to return relative names.
+The names will be relative to the project root. And this can only
+happen when all returned files are in the same directory. Meaning, the
+DIRS argument has to be nil or have only one element.")
+
(cl-defgeneric project-files (project &optional dirs)
"Return a list of files in directories DIRS in PROJECT.
DIRS is a list of absolute directories; it should be some
@@ -380,8 +386,10 @@ project--files-in-directory
res)
(setq pt (point)))))
(project--remote-file-names
- (mapcar (lambda (s) (concat dfn s))
- (sort res #'string<)))))
+ (if project-files-relative-names
+ (sort res #'string<)
+ (mapcar (lambda (s) (concat dfn s))
+ (sort res #'string<))))))
(defun project--remote-file-names (local-files)
"Return LOCAL-FILES as if they were on the system of `default-directory'.
@@ -689,7 +697,9 @@ project--vc-list-files
(mapcar
(lambda (file)
(unless (member file submodules)
- (concat default-directory file)))
+ (if project-files-relative-names
+ file
+ (concat default-directory file))))
(split-string
(apply #'vc-git--run-command-string nil "ls-files" args)
"\0" t))))
@@ -716,7 +726,8 @@ project--vc-list-files
dir))
(args (list (concat "-mcard" (and include-untracked "u"))
"--no-status"
- "-0")))
+ "-0"))
+ files)
(when extra-ignores
(setq args (nconc args
(mapcan
@@ -725,9 +736,12 @@ project--vc-list-files
extra-ignores))))
(with-temp-buffer
(apply #'vc-hg-command t 0 "." "status" args)
- (mapcar
- (lambda (s) (concat default-directory s))
- (split-string (buffer-string) "\0" t)))))))
+ (setq files (split-string (buffer-string) "\0" t))
+ (unless project-files-relative-names
+ (setq files (mapcar
+ (lambda (s) (concat default-directory s))
+ files)))
+ files)))))
(defun project--vc-merge-submodules-p (dir)
(project--value-in-dir
@@ -970,6 +984,7 @@ project-find-regexp
(let* ((caller-dir default-directory)
(pr (project-current t))
(default-directory (project-root pr))
+ (project-files-relative-names t)
(files
(if (not current-prefix-arg)
(project-files pr)
@@ -1000,6 +1015,8 @@ project-or-external-find-regexp
(require 'xref)
(let* ((pr (project-current t))
(default-directory (project-root pr))
+ ;; TODO: Make use of `project-files-relative-names' by
+ ;; searching each root separately (maybe in parallel, too).
(files
(project-files pr (cons
(project-root pr)
@@ -1054,7 +1071,8 @@ project-find-file
(interactive "P")
(let* ((pr (project-current t))
(root (project-root pr))
- (dirs (list root)))
+ (dirs (list root))
+ (project-files-relative-names t))
(project-find-file-in
(or (thing-at-point 'filename)
(and buffer-file-name (project--find-default-from buffer-file-name pr)))
@@ -1130,7 +1148,12 @@ project--read-file-cpd-relative
(if (> (length common-prefix) 0)
(file-name-directory common-prefix))))
(cpd-length (length common-parent-directory))
- (prompt (if (zerop cpd-length)
+ (common-parent-directory (if (file-name-absolute-p (car all-files))
+ common-parent-directory
+ (concat default-directory common-parent-directory)))
+ (prompt (if (and (zerop cpd-length)
+ all-files
+ (file-name-absolute-p (car all-files)))
prompt
(concat prompt (format " in %s" common-parent-directory))))
(included-cpd (when (member common-parent-directory all-files)
@@ -1168,6 +1191,7 @@ project--read-file-absolute
all-files &optional predicate
hist mb-default)
(project--completing-read-strict prompt
+ ;; FIXME: Map relative names to absolute?
(project--file-completion-table all-files)
predicate
hist mb-default))
@@ -1215,6 +1239,7 @@ project-find-file-in
dirs)
(project-files project dirs)))
(completion-ignore-case read-file-name-completion-ignore-case)
+ (default-directory (project-root project))
(file (project--read-file-name
project "Find file"
all-files nil 'file-name-history
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 755c3db04fd..29fc6cd560f 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1922,7 +1922,8 @@ xref-matches-in-files
(hits nil)
;; Support for remote files. The assumption is that, if the
;; first file is remote, they all are, and on the same host.
- (dir (file-name-directory (car files)))
+ (dir (or (file-name-directory (car files))
+ default-directory))
(remote-id (file-remote-p dir))
;; The 'auto' default would be fine too, but ripgrep can't handle
;; the options we pass in that case.
next prev parent reply other threads:[~2024-04-16 23:48 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-15 22:55 bug#69188: 30.0.50; project-files + project-find-file is slow in large repositories Spencer Baugh
2024-02-18 18:56 ` bug#69233: " Eli Zaretskii
2024-02-18 19:42 ` Dmitry Gutov
2024-02-18 19:45 ` Eli Zaretskii
2024-02-18 20:11 ` Dmitry Gutov
2024-02-18 20:18 ` Eli Zaretskii
2024-02-23 21:34 ` bug#69233: bug#69188: " Spencer Baugh
2024-04-13 2:34 ` Dmitry Gutov
2024-04-16 23:48 ` Dmitry Gutov [this message]
2024-04-29 20:27 ` bug#69188: bug#69233: " Spencer Baugh
2024-05-05 0:29 ` Dmitry Gutov
2024-04-29 21:04 ` Spencer Baugh
2024-05-05 3:32 ` Dmitry Gutov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4e8e8f14-26be-4a50-b47b-a0373ce19b9a@gutov.dev \
--to=dmitry@gutov.dev \
--cc=69188@debbugs.gnu.org \
--cc=sbaugh@janestreet.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).