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

Revert feature added in bfd96e995d using project directories in vc (bug#41821)

Browse source
This commit is contained in:
Juri Linkov 2020-07-02 01:08:18 +03:00
parent aa6c35e95f
commit c70a3a4163
4 changed files with 3 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/NEWS
View file

@ -197,10 +197,6 @@ The relevant commands are those that don't change the VC state.
The non-file buffers which can use VC commands are those that have The non-file buffers which can use VC commands are those that have
their 'default-directory' under VC. their 'default-directory' under VC.
*** 'M-n' now works in minibuffer prompts of VC commands.
Typing 'M-n' in the minibuffer that prompts for a VC directory in VC
commands now retrieves directories of previously used VC projects.
*** New command 'vc-dir-root' uses the root directory without asking. *** New command 'vc-dir-root' uses the root directory without asking.
*** New commands 'vc-dir-mark-registered-files' (bound to '* r') and *** New commands 'vc-dir-mark-registered-files' (bound to '* r') and

2
lisp/vc/vc-dir.el
View file

@ -1366,7 +1366,7 @@ These are the commands available for use in the file status buffer:
;; Otherwise if you do C-x v d -> C-x C-f -> C-x v d ;; Otherwise if you do C-x v d -> C-x C-f -> C-x v d
;; you may get a new *vc-dir* buffer, different from the original ;; you may get a new *vc-dir* buffer, different from the original
(file-truename (read-directory-name "VC status for directory: " (file-truename (read-directory-name "VC status for directory: "
(vc-root-dir) (vc-known-roots) t (vc-root-dir) nil t
nil)) nil))
(if current-prefix-arg (if current-prefix-arg
(intern (intern

5
lisp/vc/vc-hooks.el
View file

@ -299,11 +299,6 @@ non-nil if FILE exists and its contents were successfully inserted."
(set-buffer-modified-p nil) (set-buffer-modified-p nil)
t)) t))
(declare-function project-try-vc "project")
(defun vc-known-roots ()
"Return a list of known vc roots."
(seq-filter #'project-try-vc (project-known-project-roots)))
(defun vc-find-root (file witness) (defun vc-find-root (file witness)
"Find the root of a checked out project. "Find the root of a checked out project.
The function walks up the directory tree from FILE looking for WITNESS. The function walks up the directory tree from FILE looking for WITNESS.

6
lisp/vc/vc.el
View file

@ -2001,8 +2001,7 @@ saving the buffer."
rootdir working-revision) rootdir working-revision)
(if backend (if backend
(setq rootdir (vc-call-backend backend 'root default-directory)) (setq rootdir (vc-call-backend backend 'root default-directory))
(setq rootdir (read-directory-name "Directory for VC root-diff: " (setq rootdir (read-directory-name "Directory for VC root-diff: "))
nil (vc-known-roots)))
(setq backend (vc-responsible-backend rootdir)) (setq backend (vc-responsible-backend rootdir))
(if backend (if backend
(setq default-directory rootdir) (setq default-directory rootdir)
@ -2546,8 +2545,7 @@ with its diffs (if the underlying VCS supports that)."
rootdir) rootdir)
(if backend (if backend
(setq rootdir (vc-call-backend backend 'root default-directory)) (setq rootdir (vc-call-backend backend 'root default-directory))
(setq rootdir (read-directory-name "Directory for VC revision log: " (setq rootdir (read-directory-name "Directory for VC revision log: "))
nil (vc-known-roots)))
(setq backend (vc-responsible-backend rootdir)) (setq backend (vc-responsible-backend rootdir))
(unless backend (unless backend
(error "Directory is not version controlled"))) (error "Directory is not version controlled")))