[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 33a8415eb7e: Use 'project--value-in-dir' for 'project-vc-includ
From: |
Dmitry Gutov |
Subject: |
emacs-29 33a8415eb7e: Use 'project--value-in-dir' for 'project-vc-include-untracked' too |
Date: |
Fri, 9 Dec 2022 16:22:28 -0500 (EST) |
branch: emacs-29
commit 33a8415eb7e2f5baebffc529a422fb17dc3fd09e
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>
Use 'project--value-in-dir' for 'project-vc-include-untracked' too
* 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.
---
lisp/progmodes/project.el | 24 +++++++++++++++---------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 342ee239c7e..016dfdd5b4d 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -609,13 +609,16 @@ project backend implementation of
`project-external-roots'.")
(defvar vc-git-use-literal-pathspecs)
(pcase backend
(`Git
- (let ((default-directory (expand-file-name (file-name-as-directory dir)))
- (args '("-z"))
- (vc-git-use-literal-pathspecs nil)
- files)
+ (let* ((default-directory (expand-file-name (file-name-as-directory dir)))
+ (args '("-z"))
+ (vc-git-use-literal-pathspecs nil)
+ (include-untracked (project--value-in-dir
+ 'project-vc-include-untracked
+ dir))
+ files)
(setq args (append args
'("-c" "--exclude-standard")
- (and project-vc-include-untracked '("-o"))))
+ (and include-untracked '("-o"))))
(when extra-ignores
(setq args (append args
(cons "--"
@@ -666,10 +669,13 @@ project backend implementation of
`project-external-roots'.")
;; XXX: Better solutions welcome, but this seems cheap enough.
(delete-consecutive-dups files)))
(`Hg
- (let ((default-directory (expand-file-name (file-name-as-directory dir)))
- (args (list (concat "-mcard" (and project-vc-include-untracked "u"))
- "--no-status"
- "-0")))
+ (let* ((default-directory (expand-file-name (file-name-as-directory dir)))
+ (include-untracked (project--value-in-dir
+ 'project-vc-include-untracked
+ dir))
+ (args (list (concat "-mcard" (and include-untracked "u"))
+ "--no-status"
+ "-0")))
(when extra-ignores
(setq args (nconc args
(mapcan
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 33a8415eb7e: Use 'project--value-in-dir' for 'project-vc-include-untracked' too,
Dmitry Gutov <=