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

project.el: Extract backend->marker association for a defvar

Browse source 
* lisp/progmodes/project.el (project-vc-backend-markers-alist):
Extract from 'project-try-vc'.
(project-try-vc): Update accordingly (bug#61577).
This commit is contained in:
Dmitry Gutov 2023-02-18 00:50:29 +02:00
parent 0a5615669a
commit 18e96ed7c8
1 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

28
lisp/progmodes/project.el
View file

@ -494,6 +494,22 @@ files related to the current buffer.
The directory names should be absolute. Used in the VC-aware The directory names should be absolute. Used in the VC-aware
project backend implementation of `project-external-roots'.") project backend implementation of `project-external-roots'.")
(defvar project-vc-backend-markers-alist
`((Git . ".git")
(Hg . ".hg")
(Bzr . ".bzr")
;; See the comment above `vc-svn-admin-directory' for why we're
;; duplicating the definition.
(SVN . ,(if (and (memq system-type '(cygwin windows-nt ms-dos))
(getenv "SVN_ASP_DOT_NET_HACK"))
"_svn"
".svn"))
(DARCS . "_darcs")
(Fossil . ".fslckout"))
"Associative list assigning root markers to VC backend symbols.
See `project-vc-extra-root-markers' for the marker value format.")
(defun project-try-vc (dir) (defun project-try-vc (dir)
(defvar vc-svn-admin-directory) (defvar vc-svn-admin-directory)
(require 'vc-svn) (require 'vc-svn)
@ -501,17 +517,11 @@ project backend implementation of `project-external-roots'.")
;; `project-vc-merge-submodules' or `project-vc-extra-root-markers' ;; `project-vc-merge-submodules' or `project-vc-extra-root-markers'
;; changes. ;; changes.
(or (vc-file-getprop dir 'project-vc) (or (vc-file-getprop dir 'project-vc)
(let* ((backend-markers-alist `((Git . ".git") (let* ((backend-markers
(Hg . ".hg")
(Bzr . ".bzr")
(SVN . ,vc-svn-admin-directory)
(DARCS . "_darcs")
(Fossil . ".fslckout")))
(backend-markers
(delete (delete
nil nil
(mapcar (mapcar
(lambda (b) (assoc-default b backend-markers-alist)) (lambda (b) (assoc-default b project-vc-backend-markers-alist))
vc-handled-backends))) vc-handled-backends)))
(marker-re (marker-re
(concat (concat
@ -537,7 +547,7 @@ project backend implementation of `project-external-roots'.")
(backend (backend
(cl-find-if (cl-find-if
(lambda (b) (lambda (b)
(member (assoc-default b backend-markers-alist) (member (assoc-default b project-vc-backend-markers-alist)
last-matches)) last-matches))
vc-handled-backends)) vc-handled-backends))
project) project)