>From b8e5b8463f15a53e5fb6ddac5447005d4133606b Mon Sep 17 00:00:00 2001 From: Ashwin Kafle Date: Wed, 15 Dec 2021 23:49:47 +0545 Subject: [PATCH] Option for vc-delete-file to keep file on disk Add a prefix argument on vc-delete-file to keep affected file on disk and keep the current buffer intact. This option relies on the backends to not delete files themselves. * doc/emacs/vc1-xtra.texi: Document the change. * lisp/vc/vc-git.el (vc-git-delete-file): Make git leave files on disk. * lisp/vc/vc.el (vc-delete-file): Change vc-delete-file to accept optional prefix argument. --- doc/emacs/vc1-xtra.texi | 3 ++- etc/NEWS | 4 ++++ lisp/vc/vc-git.el | 4 ++-- lisp/vc/vc.el | 18 ++++++++++++------ 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/doc/emacs/vc1-xtra.texi b/doc/emacs/vc1-xtra.texi index 4cd00cba6c..99e5eef7c1 100644 --- a/doc/emacs/vc1-xtra.texi +++ b/doc/emacs/vc1-xtra.texi @@ -122,7 +122,8 @@ VC Delete/Rename If you wish to delete a version-controlled file, use the command @kbd{M-x vc-delete-file}. This prompts for the file name, and deletes it via the version control system. The file is removed from the -working tree, and in the VC Directory buffer +working tree, and in the VC Directory buffer. If you give a prefix argument, +the file is not deleted from disk. @iftex (@pxref{VC Directory Mode,,, emacs, the Emacs Manual}), @end iftex diff --git a/etc/NEWS b/etc/NEWS index 8d83b2a7e3..af358aaedb 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -372,6 +372,10 @@ info node. This command only works for the Emacs and Emacs Lisp manuals. ** vc +*** 'C-x v x' accepts a prefix argument to keep file on disk. +Previously 'C-x v x' always deleted the selected file. Now if you give it +prefix argument, it will keep the buffer and file on disk intact. +Currently this is only implemented for vc-git. --- *** 'C-x v v' on an unregistered file will now use the most specific backend. Previously, if you had an SVN-covered "~/" directory, and a Git-covered diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 5c6a39aec9..69ef216529 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1569,8 +1569,8 @@ vc-git-next-revision (or (vc-git-symbolic-commit next-rev) next-rev))) (defun vc-git-delete-file (file) - (vc-git-command nil 0 (vc-git--literal-pathspec file) "rm" "-f" "--")) - + (vc-git-command nil 0 (vc-git--literal-pathspec file) "rm" "-f" "--cached" "--")) +) (defun vc-git-rename-file (old new) (vc-git-command nil 0 (list old new) "mv" "-f" "--")) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 64f752f248..a4d390fea8 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2970,14 +2970,17 @@ vc-transfer-file (vc-checkin file new-backend comment (stringp comment))))) ;;;###autoload -(defun vc-delete-file (file) +(defun vc-delete-file (file &optional keep-file) "Delete file and mark it as such in the version control system. If called interactively, read FILE, defaulting to the current -buffer's file name if it's under version control." +buffer's file name if it's under version control. +If a prefix argument is given (optional argument KEEP-FILE) then +don't delete the file from the disk." (interactive (list (read-file-name "VC delete file: " nil (when (vc-backend buffer-file-name) buffer-file-name) - t))) + t) + current-prefix-arg)) (setq file (expand-file-name file)) (let ((buf (get-file-buffer file)) (backend (vc-backend file))) @@ -2999,19 +3002,22 @@ vc-delete-file (unless (or (file-directory-p file) (null make-backup-files) (not (file-exists-p file))) (with-current-buffer (or buf (find-file-noselect file)) - (let ((backup-inhibited nil)) + (let ((backup-inhibited nil) + ;; If you don't set this, then for some reason, the file is never brought back. + (backup-by-copying t)) (backup-buffer)))) ;; Bind `default-directory' so that the command that the backend ;; runs to remove the file is invoked in the correct context. (let ((default-directory (file-name-directory file))) (vc-call-backend backend 'delete-file file)) ;; If the backend hasn't deleted the file itself, let's do it for him. - (when (file-exists-p file) (delete-file file)) + (when (and (file-exists-p file) (null keep-file)) + (delete-file file)) ;; Forget what VC knew about the file. (vc-file-clearprops file) ;; Make sure the buffer is deleted and the *vc-dir* buffers are ;; updated after this. - (vc-resynch-buffer file nil t))) + (vc-resynch-buffer file keep-file t))) ;;;###autoload (defun vc-rename-file (old new) -- 2.34.1