mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

vc-next-action: On mixed state sets, treat missing files as removed

Browse source 
* lisp/vc/vc.el (vc-only-files-state-and-model, vc-next-action):
Add the 'missing' state to the set of compatible states for
mixed state actions.  This means you can commit removals of
files without first moving them to the 'removed' state.
This commit is contained in:
Sean Whitton 2025-06-08 11:25:17 +01:00
parent 9b4fec7a97
commit 988110fb6d
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/vc/vc.el
View file

@ -1374,12 +1374,12 @@ BACKEND is the VC backend responsible for FILES."
(setq states (mapcar #'car states-alist))
(cond ((length= states 1)
(setq state (car states)))
((cl-subsetp states '(added removed edited))
((cl-subsetp states '(added missing removed edited))
(setq state 'edited))
;; Special, but common case:
;; checking in both changes and new files at once.
((and (cl-subsetp states '(added removed edited unregistered))
((and (cl-subsetp states '(added missing removed edited unregistered))
(y-or-n-p "Some files are unregistered; register them first?"))
(vc-register (list backend
(cdr (assq 'unregistered states-alist))))
@ -1387,7 +1387,7 @@ BACKEND is the VC backend responsible for FILES."
(t
(let* ((pred (lambda (elt)
(memq (car elt) '(added removed edited))))
(memq (car elt) '(added missing removed edited))))
(compat-alist (cl-remove-if-not pred states-alist))
(other-alist (cl-remove-if pred states-alist))
(first (car (or compat-alist other-alist)))
@ -1526,7 +1526,7 @@ from which to check out the file(s)."
;; do nothing
(message "Fileset is up-to-date"))))
;; Files have local changes
((memq state '(added removed edited))
((memq state '(added missing removed edited))
(let ((ready-for-commit files))
;; CVS, SVN and bzr don't care about read-only (bug#9781).
;; RCS does, SCCS might (someone should check...).