mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-03-06 14:02:07 -08:00
Code Issues Projects Releases Wiki Activity

Factor out some common code from VC incoming/outgoing functions

Browse source 
* lisp/vc/vc.el (vc--maybe-read-remote-location)
(vc--incoming-revision): New functions, factored out.
(vc-log-incoming, vc-default-log-incoming, vc-log-outgoing)
(vc-default-log-outgoing): Use them.
This commit is contained in:
Sean Whitton 2025-07-03 20:21:29 +01:00
parent f1fe815b43
commit 8c6d549f6f
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lisp/vc/vc.el
View file

@ -3294,24 +3294,27 @@ The command prompts for the branch whose change log to show."
(list rootdir) branch t
(when (> vc-log-show-limit 0) vc-log-show-limit))))
(defun vc--maybe-read-remote-location ()
(and current-prefix-arg
(list (read-string "Remote location/branch (empty for default): "))))
(defun vc--incoming-revision (backend remote-location)
(or (vc-call-backend backend 'incoming-revision remote-location)
(user-error "No incoming revision -- local-only branch?")))
;;;###autoload
(defun vc-log-incoming (&optional remote-location)
"Show log of changes that will be received with pull from REMOTE-LOCATION.
When called interactively with a prefix argument, prompt for REMOTE-LOCATION.
In some version control systems REMOTE-LOCATION can be a remote branch name."
(interactive
(when current-prefix-arg
(list (read-string "Remote location/branch (empty for default): "))))
(interactive (vc--maybe-read-remote-location))
(vc--with-backend-in-rootdir "VC root-log"
(vc-incoming-outgoing-internal backend (or remote-location "")
"*vc-incoming*" 'log-incoming)))
(defun vc-default-log-incoming (_backend buffer remote-location)
(vc--with-backend-in-rootdir ""
(let ((incoming (or (vc-call-backend backend
'incoming-revision
remote-location)
(user-error "No incoming revision -- local-only branch?"))))
(let ((incoming (vc--incoming-revision backend remote-location)))
(vc-call-backend backend 'print-log (list rootdir) buffer t
incoming
(vc-call-backend backend 'mergebase incoming)))))
@ -3321,19 +3324,14 @@ In some version control systems REMOTE-LOCATION can be a remote branch name."
"Show log of changes that will be sent with a push operation to REMOTE-LOCATION.
When called interactively with a prefix argument, prompt for REMOTE-LOCATION.
In some version control systems REMOTE-LOCATION can be a remote branch name."
(interactive
(when current-prefix-arg
(list (read-string "Remote location/branch (empty for default): "))))
(interactive (vc--maybe-read-remote-location))
(vc--with-backend-in-rootdir "VC root-log"
(vc-incoming-outgoing-internal backend (or remote-location "")
"*vc-outgoing*" 'log-outgoing)))
(defun vc-default-log-outgoing (_backend buffer remote-location)
(vc--with-backend-in-rootdir ""
(let ((incoming (or (vc-call-backend backend
'incoming-revision
remote-location)
(user-error "No incoming revision -- local-only branch?"))))
(let ((incoming (vc--incoming-revision backend remote-location)))
(vc-call-backend backend 'print-log (list rootdir) buffer t
""
(vc-call-backend backend 'mergebase incoming)))))