procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use 'project--value-in-dir' for 'project-vc-include-untracked' too

Browse source 
* lisp/progmodes/project.el (project--vc-list-files): Use
'project--value-in-dir' for 'project-vc-include-untracked' too.
So that is can be reliably set through dir-locals.
This commit is contained in:
Dmitry Gutov 2022-12-09 23:21:10 +02:00
parent 594267395d
commit 33a8415eb7
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lisp/progmodes/project.el
View file

@ -609,13 +609,16 @@ project backend implementation of `project-external-roots'.")
(defvar vc-git-use-literal-pathspecs) (defvar vc-git-use-literal-pathspecs)
(pcase backend (pcase backend
(`Git (`Git
(let ((default-directory (expand-file-name (file-name-as-directory dir))) (let* ((default-directory (expand-file-name (file-name-as-directory dir)))
(args '("-z")) (args '("-z"))
(vc-git-use-literal-pathspecs nil) (vc-git-use-literal-pathspecs nil)
files) (include-untracked (project--value-in-dir
'project-vc-include-untracked
dir))
files)
(setq args (append args (setq args (append args
'("-c" "--exclude-standard") '("-c" "--exclude-standard")
(and project-vc-include-untracked '("-o")))) (and include-untracked '("-o"))))
(when extra-ignores (when extra-ignores
(setq args (append args (setq args (append args
(cons "--" (cons "--"
@ -666,10 +669,13 @@ project backend implementation of `project-external-roots'.")
;; XXX: Better solutions welcome, but this seems cheap enough. ;; XXX: Better solutions welcome, but this seems cheap enough.
(delete-consecutive-dups files))) (delete-consecutive-dups files)))
(`Hg (`Hg
(let ((default-directory (expand-file-name (file-name-as-directory dir))) (let* ((default-directory (expand-file-name (file-name-as-directory dir)))
(args (list (concat "-mcard" (and project-vc-include-untracked "u")) (include-untracked (project--value-in-dir
"--no-status" 'project-vc-include-untracked
"-0"))) dir))
(args (list (concat "-mcard" (and include-untracked "u"))
"--no-status"
"-0")))
(when extra-ignores (when extra-ignores
(setq args (nconc args (setq args (nconc args
(mapcan (mapcan