Mercurial > emacs
changeset 108919:6e9243fe4510
Improve VC create/retrieve tag/branch.
* lisp/vc.el (vc-create-tag): Do not read the directory name for VCs
with repository revision granularity. Adjust the tag/branch
prompt. Reset VC properties.
(vc-retrieve-tag): Do not read the directory name for VCs
with repository revision granularity. Reset VC properties.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Wed, 09 Jun 2010 00:47:14 -0700 |
| parents | 101e54738c96 |
| children | 838873812c0a |
| files | lisp/ChangeLog lisp/vc.el |
| diffstat | 2 files changed, 33 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jun 09 09:36:45 2010 +0200 +++ b/lisp/ChangeLog Wed Jun 09 00:47:14 2010 -0700 @@ -1,3 +1,12 @@ +2010-06-09 Dan Nicolaescu <dann@ics.uci.edu> + + Improve VC create/retrieve tag/branch. + * vc.el (vc-create-tag): Do not read the directory name for VCs + with repository revision granularity. Adjust the tag/branch + prompt. Reset VC properties. + (vc-retrieve-tag): Do not read the directory name for VCs + with repository revision granularity. Reset VC properties. + 2010-06-09 Julien Danjou <julien@danjou.info> * net/notifications.el: New file.
--- a/lisp/vc.el Wed Jun 09 09:36:45 2010 +0200 +++ b/lisp/vc.el Wed Jun 09 00:47:14 2010 -0700 @@ -580,9 +580,6 @@ ;; display the branch name in the mode-line. Replace ;; vc-cvs-sticky-tag with that. ;; -;; - vc-create-tag and vc-retrieve-tag should update the -;; buffers that might be visiting the affected files. -;; ;;;; Internal cleanups: ;; ;; - backends that care about vc-stay-local should try to take it into @@ -1896,14 +1893,22 @@ given, the tag is made as a new branch and the files are checked out in that new branch." (interactive - (list (read-file-name "Directory: " default-directory default-directory t) - (read-string "New tag name: ") - current-prefix-arg)) + (let ((granularity + (vc-call-backend (vc-responsible-backend default-directory) + 'revision-granularity))) + (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. + default-directory + (read-file-name "Directory: " default-directory default-directory t)) + (read-string (if current-prefix-arg "New branch name: " "New tag name: ")) + current-prefix-arg))) (message "Making %s... " (if branchp "branch" "tag")) (when (file-directory-p dir) (setq dir (file-name-as-directory dir))) (vc-call-backend (vc-responsible-backend dir) 'create-tag dir name branchp) - (vc-resynch-buffer dir t t) + (vc-resynch-buffer dir t t t) (message "Making %s... done" (if branchp "branch" "tag"))) ;;;###autoload @@ -1914,8 +1919,16 @@ locked files at or below DIR (but if NAME is empty, locked files are allowed and simply skipped)." (interactive - (list (read-file-name "Directory: " default-directory default-directory t) - (read-string "Tag name to retrieve (default latest revisions): "))) + (let ((granularity + (vc-call-backend (vc-responsible-backend default-directory) + 'revision-granularity))) + (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. + default-directory + (read-file-name "Directory: " default-directory default-directory t)) + (read-string "Tag name to retrieve (default latest revisions): ")))) (let ((update (yes-or-no-p "Update any affected buffers? ")) (msg (if (or (not name) (string= name "")) (format "Updating %s... " (abbreviate-file-name dir)) @@ -1924,9 +1937,10 @@ (message "%s" msg) (vc-call-backend (vc-responsible-backend dir) 'retrieve-tag dir name update) - (vc-resynch-buffer dir t t) + (vc-resynch-buffer dir t t t) (message "%s" (concat msg "done")))) + ;; Miscellaneous other entry points ;; FIXME: this should be a defcustom