mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2026-09-10 07:46:51 -04:00
VC revert: When un-adding, clear vc-backend property
* lisp/vc/vc.el (vc-revert-file, vc-revert-files): When un-adding, clear vc-backend property (bug#81291).
This commit is contained in:
parent
c8a86c1561
commit
070a3a356f
|
|
@ -4987,11 +4987,11 @@ If FILE is a directory, revert all files inside that directory."
|
|||
(vc-responsible-backend file)
|
||||
(vc-backend file))
|
||||
'revert file backup-file))
|
||||
`((vc-state . ,(if (eq (vc-state file) 'added)
|
||||
'unregistered
|
||||
'up-to-date))
|
||||
(vc-checkout-time
|
||||
. ,(file-attribute-modification-time (file-attributes file)))))
|
||||
(let ((state (vc-state file)))
|
||||
`(,@(and (eq state 'added) '((vc-backend . nil)))
|
||||
(vc-state . ,(if (eq state 'added) 'unregistered 'up-to-date))
|
||||
(vc-checkout-time
|
||||
. ,(file-attribute-modification-time (file-attributes file))))))
|
||||
(vc-resynch-buffer file t t))
|
||||
|
||||
(defun vc-revert-files (backend files)
|
||||
|
|
@ -5007,7 +5007,7 @@ For entries in FILES that are directories, revert all files inside them."
|
|||
;; Use `vc-file-getprop' directly here because we may be
|
||||
;; handling very many files and do not want to hit the disk.
|
||||
`(,@(pcase (vc-file-getprop file 'vc-state)
|
||||
('added '((vc-state . unregistered)))
|
||||
('added '((vc-backend . nil) (vc-state . unregistered)))
|
||||
;; If we have no known state for the file somehow, leave
|
||||
;; it that way.
|
||||
('nil nil)
|
||||
|
|
|
|||
Loading…
Reference in a new issue