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

Add optional remote-name argument to VC repository-url command

Browse source 
* lisp/vc/vc.el: Document new remote-name argument of VC
repository-url command.
* lisp/vc/vc-git.el (vc-git-repository-url): Add and use new arg.
* lisp/vc/vc-hg.el (vc-hg-repository-url): Add and use new arg.
* lisp/vc/vc-bzr.el (vc-bzr-repository-url): Add new arg but ignore
it.
* lisp/vc/vc-svn.el (vc-svn-repository-url): Add new arg but ignore
it.
This commit is contained in:
Tassilo Horn 2020-06-15 08:56:11 +02:00
parent 4f92cf14f3
commit 2e80328ba6
5 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1316,7 +1316,7 @@ stream. Standard error output is discarded."
vc-bzr-revision-keywords))
string pred)))))
(defun vc-bzr-repository-url (file-or-dir)
(defun vc-bzr-repository-url (file-or-dir &optional _remote-name)
(let ((default-directory (vc-bzr-root file-or-dir)))
(with-temp-buffer
(vc-bzr-command "info" (current-buffer) 0 nil)

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

@ -1083,10 +1083,11 @@ This prompts for a branch to merge from."
"DU" "AA" "UU"))
(push (expand-file-name file directory) files)))))))
(defun vc-git-repository-url (file-or-dir)
(defun vc-git-repository-url (file-or-dir &optional remote-name)
(let ((default-directory (vc-git-root file-or-dir)))
(with-temp-buffer
(vc-git-command (current-buffer) 0 nil "remote" "get-url" "origin")
(vc-git-command (current-buffer) 0 nil "remote" "get-url"
(or remote-name "origin"))
(buffer-substring-no-properties (point-min) (1- (point-max))))))
;; Everywhere but here, follows vc-git-command, which uses vc-do-command

5
lisp/vc/vc-hg.el
View file

@ -1525,11 +1525,12 @@ This function differs from vc-do-command in that it invokes
(defun vc-hg-root (file)
(vc-find-root file ".hg"))
(defun vc-hg-repository-url (file-or-dir)
(defun vc-hg-repository-url (file-or-dir &optional remote-name)
(let ((default-directory (vc-hg-root file-or-dir)))
(with-temp-buffer
(vc-hg-command (current-buffer) 0 nil
"config" "paths.default")
"config"
(concat "paths." (or remote-name "default")))
(buffer-substring-no-properties (point-min) (1- (point-max))))))
(provide 'vc-hg)

2
lisp/vc/vc-svn.el
View file

@ -818,7 +818,7 @@ Set file properties accordingly. If FILENAME is non-nil, return its status."
(setq loglines (buffer-substring-no-properties start (point-max)))))
vc-svn-revisions)))
(defun vc-svn-repository-url (file-or-dir)
(defun vc-svn-repository-url (file-or-dir &optional _remote-name)
(let ((default-directory (vc-svn-root file-or-dir)))
(with-temp-buffer
(vc-svn-command (current-buffer) 0 nil

7
lisp/vc/vc.el
View file

@ -554,9 +554,12 @@
;; the project that contains DIR.
;; FIXME: what should it do with non-text conflicts?
;;
;; - repository-url (file)
;; - repository-url (file-or-dir &optional remote-name)
;;
;; Returns the URL of the repository of the current checkout.
;; Returns the URL of the repository of the current checkout
;; containing FILE-OR-DIR. The optional REMOTE-NAME specifies the
;; remote (in Git parlance) whose URL is to be returned. It has
;; only a meaning for distributed VCS and is ignored otherwise.
;;; Changes from the pre-25.1 API:
;;