1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00

; vc-dir-clean-files: Improve docstring and message (bug#79914).

Co-authored-by: Kristoffer Balintona <krisbalintona@gmail.com>
This commit is contained in:
Eli Zaretskii 2025-11-30 17:10:36 +00:00 committed by Sean Whitton
parent 8a6b84dbcb
commit 4c292b6f70

View file

@ -879,9 +879,11 @@ that share the same state."
(vc-dir-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file))) (vc-dir-at-event e (vc-dir-mark-unmark 'vc-dir-toggle-mark-file)))
(defun vc-dir-clean-files () (defun vc-dir-clean-files ()
"Delete the marked files, or the current file if no marks. "Delete marked files from repository, or the current file if no marks.
The files will not be marked as deleted in the version control This command cleans unregistered files from the repository.
system; see `vc-dir-delete-file'." (To delete files that are registered, use `vc-dir-delete-file' instead.)
It is therefore an error to use this command to delete files that are
tracked by a VCS."
(interactive) (interactive)
(let* ((files (or (vc-dir-marked-files) (let* ((files (or (vc-dir-marked-files)
(list (vc-dir-current-file)))) (list (vc-dir-current-file))))
@ -891,8 +893,8 @@ system; see `vc-dir-delete-file'."
'unregistered))) 'unregistered)))
files))) files)))
(when tracked (when tracked
(user-error (ngettext "Trying to clean tracked file: %s" (user-error (ngettext "Cannot clean tracked file: %s"
"Trying to clean tracked files: %s" "Cannot clean tracked files: %s"
(length tracked)) (length tracked))
(mapconcat #'file-name-nondirectory tracked ", "))) (mapconcat #'file-name-nondirectory tracked ", ")))
(map-y-or-n-p "Delete %s? " #'delete-file files) (map-y-or-n-p "Delete %s? " #'delete-file files)