]> git.eshelyaron.com Git - emacs.git/commit
vc-checkin: Check whether the fileset or patches have changed
authorSean Whitton <spwhitton@spwhitton.name>
Sun, 6 Jul 2025 12:43:24 +0000 (13:43 +0100)
committerEshel Yaron <me@eshelyaron.com>
Thu, 24 Jul 2025 07:45:33 +0000 (09:45 +0200)
commit512fae2ade220c382106ab7a1bed7715dde06684
treec3c36a130d6cf0ce2a8bb51a66309ac6e58ba98c
parent16a91430b65ccd4cb65d4b3229eb825a92a886c3
vc-checkin: Check whether the fileset or patches have changed

* lisp/vc/vc-dispatcher.el (vc-finish-logentry): Delay popping
to vc-parent-buffer until after calling the log operation.
That way if the log operation exits early, the current buffer
remains *vc-log*.
(vc-dir-marked-files, dired-get-marked-files): Declare.
(vc-dispatcher--explicit-marks-p): New function.
* lisp/vc/vc.el (vc-checkin): Check the user isn't likely to be
surprised by what is included in the checkin.  Specifically,
check whether the fileset or patches implied by vc-parent-buffer
are unchanged.
* doc/emacs/maintaining.texi (VC With A Merging VCS): Explain
how the fileset or patch string is fixed once *vc-log* pops up.

(cherry picked from commit 7a0bfa3ee7fa447a0fe994ac8f64bcb5752cacb2)
doc/emacs/maintaining.texi
lisp/vc/vc-dispatcher.el
lisp/vc/vc.el