Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix vc-default-checkin-patch for vc-async-checkin non-nil

Browse source 
* lisp/vc/vc.el (vc-default-checkin-patch): Fix for
vc-async-checkin non-nil (bug#80746).
This commit is contained in:
Sean Whitton 2026-04-05 16:24:52 +01:00
parent 3289886f84
commit bd4b876e9b
1 changed files with 36 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
lisp/vc/vc.el
View file

@ -2612,40 +2612,42 @@ proceed anyway?")))
(make-directory (file-name-directory (expand-file-name f tmpdir)) t)
(copy-file (expand-file-name f)
(expand-file-name f tmpdir)))
(unwind-protect
(progn
(vc-revert-files backend
(mapcar (lambda (f)
(with-current-buffer (find-file-noselect f)
buffer-file-name))
files))
(with-temp-buffer
;; Trying to support CVS too. Assuming that vc-diff
;; there will usually have diff root in default-directory.
(when (vc-find-backend-function backend 'root)
(setq-local default-directory
(vc-call-backend backend 'root (car files))))
(unless (eq 0
(call-process-region patch-string
nil
"patch"
nil
t
nil
"-p1"
"-r" null-device
"--posix"
"--remove-empty-files"
"-i" "-"))
(user-error "Patch failed: %s" (buffer-string))))
(vc-call-backend backend 'checkin files comment))
(dolist (f files)
(copy-file (expand-file-name f tmpdir)
(expand-file-name f)
t)
(with-current-buffer (get-file-buffer f)
(revert-buffer t t t)))
(delete-directory tmpdir t))))
(cl-flet ((do-it ()
(vc-revert-files backend
(mapcar (lambda (f)
(with-current-buffer
(find-file-noselect f)
buffer-file-name))
files))
(with-temp-buffer
;; Try to support CVS too. Assume that vc-diff there
;; will usually have diff root in `default-directory'.
(when (vc-find-backend-function backend 'root)
(setq-local default-directory
(vc-call-backend backend 'root (car files))))
(unless (zerop (call-process-region patch-string nil "patch"
nil t nil
"-p1"
"-r" null-device
"--posix"
"--remove-empty-files"
"-i" "-"))
(user-error "Patch failed: %s" (buffer-string))))
(vc-call-backend backend 'checkin files comment))
(cleanup ()
(dolist (f files)
(copy-file (expand-file-name f tmpdir)
(expand-file-name f)
t)
(with-current-buffer (get-file-buffer f)
(revert-buffer t t t)))
(delete-directory tmpdir t)))
(if (and vc-async-checkin
(vc-call-backend backend 'async-checkins))
(let ((ret (do-it)))
(when (eq (car-safe ret) 'async)
(vc-exec-after #'cleanup nil (cadr ret))))
(unwind-protect (do-it) (cleanup))))))
;;; Additional entry points for examining version histories