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

In vc-git-log-incoming use the repository in the command "fetch" (bug#50340)

Browse source 
* lisp/vc/vc-git.el (vc-git-log-incoming): Use repository part
from non-nil remote-location in the command "fetch".

* lisp/vc/vc.el (vc-log-incoming, vc-log-outgoing): Mention in
docstrings and prompts that REMOTE-LOCATION can be a remote branch name.

* doc/emacs/maintaining.texi (VC Change Log): For commands
vc-log-incoming and vc-log-outgoing, use the term "remote location"
instead of "repository".
This commit is contained in:
Juri Linkov 2022-10-02 21:34:57 +03:00
parent d4f56e9666
commit c37fda9e31
3 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
doc/emacs/maintaining.texi
View file

@ -1041,13 +1041,14 @@ revision at point. A second @key{RET} hides it again.
(@code{vc-log-incoming}) command displays a log buffer showing the
changes that will be applied, the next time you run the version
control system's pull command to get new revisions from another
repository (@pxref{Pulling / Pushing}). This other repository is the default
remote location (@pxref{Pulling / Pushing}). This other remote location is the default
one from which changes are pulled, as defined by the version control
system; with a prefix argument, @code{vc-log-incoming} prompts for a
specific repository. Similarly, @kbd{C-x v O}
specific remote location. Similarly, @kbd{C-x v O}
(@code{vc-log-outgoing}) shows the changes that will be sent to
another repository, the next time you run the push command; with a
prefix argument, it prompts for a specific destination repository.
another remote location, the next time you run the push command; with a
prefix argument, it prompts for a specific destination that
in case of some version control system can be a branch name.
@cindex VC log buffer, commands in
@cindex vc-log buffer

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

@ -1322,7 +1322,12 @@ If LIMIT is a revision string, use it as an end-revision."
(defun vc-git-log-incoming (buffer remote-location)
(vc-setup-buffer buffer)
(vc-git-command nil 0 nil "fetch")
(vc-git-command nil 0 nil "fetch"
(unless (string= remote-location "")
;; `remote-location' is in format "repository/branch",
;; so remove everything except a repository name.
(replace-regexp-in-string
"/.*" "" remote-location)))
(vc-git-command
buffer 'async nil
"log"

10
lisp/vc/vc.el
View file

@ -2765,10 +2765,11 @@ with its diffs (if the underlying VCS supports that)."
;;;###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."
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 (empty for default): "))))
(list (read-string "Remote location/branch (empty for default): "))))
(let ((backend (vc-deduce-backend)))
(unless backend
(error "Buffer is not version controlled"))
@ -2778,10 +2779,11 @@ When called interactively with a prefix argument, prompt for REMOTE-LOCATION."
;;;###autoload
(defun vc-log-outgoing (&optional remote-location)
"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."
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 (empty for default): "))))
(list (read-string "Remote location/branch (empty for default): "))))
(let ((backend (vc-deduce-backend)))
(unless backend
(error "Buffer is not version controlled"))