procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/vc/vc-bzr.el (vc-bzr--pushpull): Return buffer's process.

Browse source 
* lisp/vc/vc-git.el (vc-git--pushpull): Add comment.

* lisp/vc/vc.el (vc-pull-and-push): Expand docstring about
prerequisites for backend to support this command (bug#60569).
This commit is contained in:
Juri Linkov 2023-01-24 20:24:15 +02:00
parent deee3a9262
commit e31a562396
4 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/NEWS
View file

@ -2080,7 +2080,7 @@ This is in addition to the old keybindings 'C-c C-n' and 'C-c C-p'.
--- ---
*** New command 'vc-pull-and-push'. *** New command 'vc-pull-and-push'.
This commands first does a "pull" command, and if that is successful, This commands first does a "pull" command, and if that is successful,
does a "push" command afterwards. does a "push" command afterwards. Currently supported in Git and Bzr.
+++ +++
*** 'C-x v b' prefix key is used now for branch commands. *** 'C-x v b' prefix key is used now for branch commands.

4
lisp/vc/vc-bzr.el
View file

@ -381,7 +381,9 @@ If PROMPT is non-nil, prompt for the Bzr command to run."
(setq-local compile-command (setq-local compile-command
(concat vc-bzr-program " " command " " (concat vc-bzr-program " " command " "
(if args (mapconcat #'identity args " ") ""))))) (if args (mapconcat #'identity args " ") "")))))
(vc-set-async-update buf)))) (vc-set-async-update buf)
;; Return the process for `vc-pull-and-push'
(get-buffer-process buf))))
(defun vc-bzr-pull (prompt) (defun vc-bzr-pull (prompt)
"Pull changes into the current Bzr branch. "Pull changes into the current Bzr branch.

1
lisp/vc/vc-git.el
View file

@ -1168,6 +1168,7 @@ If PROMPT is non-nil, prompt for the Git command to run."
(lambda (_name-of-mode) buffer) (lambda (_name-of-mode) buffer)
nil)))) nil))))
(vc-set-async-update buffer) (vc-set-async-update buffer)
;; Return the process for `vc-pull-and-push'
proc)) proc))
(defun vc-git-pull (prompt) (defun vc-git-pull (prompt)

3
lisp/vc/vc.el
View file

@ -3064,7 +3064,8 @@ On a distributed version control system, this runs a \"pull\"
operation on the current branch, prompting for the precise operation on the current branch, prompting for the precise
command if required. Optional prefix ARG non-nil forces a prompt command if required. Optional prefix ARG non-nil forces a prompt
for the VCS command to run. If this is successful, a \"push\" for the VCS command to run. If this is successful, a \"push\"
operation will then be done. operation will then be done. This is supported only in backends
where the pull operation returns a process.
On a non-distributed version control system, this signals an error. On a non-distributed version control system, this signals an error.
It also signals an error in a Bazaar bound branch." It also signals an error in a Bazaar bound branch."