From f5ee04277135ebaa67579dbbff430101627943a2 Mon Sep 17 00:00:00 2001 From: Dmitry Gutov Date: Mon, 20 Feb 2017 00:10:24 +0200 Subject: [PATCH] Use revision-completion-table in vc-retrieve-tag * lisp/vc/vc.el (vc-retrieve-tag): Use the revision-completion-table command for completion (bug#25710). --- lisp/vc/vc.el | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index 64e88de60eb..0c8492d021e 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2163,18 +2163,22 @@ If locking is used for the files in DIR, then there must not be any locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped)." (interactive - (let ((granularity - (vc-call-backend (vc-responsible-backend default-directory) - 'revision-granularity))) + (let* ((granularity + (vc-call-backend (vc-responsible-backend default-directory) + 'revision-granularity)) + (dir + (if (eq granularity 'repository) + ;; For VC's that do not work at file level, it's pointless + ;; to ask for a directory, branches are created at repository level. + ;; XXX: Either we call expand-file-name here, or use + ;; file-in-directory-p inside vc-resynch-buffers-in-directory. + (expand-file-name (vc-root-dir)) + (read-directory-name "Directory: " default-directory nil t)))) (list - (if (eq granularity 'repository) - ;; For VC's that do not work at file level, it's pointless - ;; to ask for a directory, branches are created at repository level. - ;; XXX: Either we call expand-file-name here, or use - ;; file-in-directory-p inside vc-resynch-buffers-in-directory. - (expand-file-name (vc-root-dir)) - (read-directory-name "Directory: " default-directory default-directory t)) - (read-string "Tag name to retrieve (default latest revisions): ")))) + dir + (vc-read-revision "Tag name to retrieve (default latest revisions): " + (list dir) + (vc-responsible-backend dir))))) (let ((update (yes-or-no-p "Update any affected buffers? ")) (msg (if (or (not name) (string= name "")) (format "Updating %s... " (abbreviate-file-name dir)) -- 2.39.5