# HG changeset patch # User Dan Nicolaescu # Date 1225092103 0 # Node ID b0dce7f34dda4902a8b7a195fafe0bfe78670e41 # Parent d1d986962044f268ac5bf7ec872d2ff1597d8000 * vc.el: Rename VC methods that were missed when vc-status was renamed to vc-dir. * vc-svn.el (vc-svn-dir-extra-headers): Rename from vc-svn-status-extra-headers. * vc-hg.el (vc-hg-dir-printer): Rename from vc-hg-status-printer. (vc-hg-dir-extra-header): Rename from vc-hg-status-extra-headers. * vc-git.el (vc-git-dir-printer): Rename from vc-dir-status-printer. (vc-git-dir-extra-headers): Rename from vc-git-status-extra-headers. * vc-dir.el (vc-dir-mode): Use vc-dir-printer instead of vc-dir-status-printer. (vc-dir-headers): Use `dir-extra-headers' instead of `status-extra-headers' (vc-dir-printer): Rename from vc-dir-status-printer. (vc-default-dir-extra-headers): Rename from vc-default-status-extra-headers. * vc-cvs.el (vc-cvs-dir-extra-headers): Rename from vc-cvs-status-extra-headers. diff -r d1d986962044 -r b0dce7f34dda lisp/ChangeLog --- a/lisp/ChangeLog Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/ChangeLog Mon Oct 27 07:21:43 2008 +0000 @@ -1,5 +1,23 @@ 2008-10-27 Dan Nicolaescu + * vc.el: Rename VC methods that were missed when vc-status was + renamed to vc-dir. + * vc-svn.el (vc-svn-dir-extra-headers): Rename from + vc-svn-status-extra-headers. + * vc-hg.el (vc-hg-dir-printer): Rename from vc-hg-status-printer. + (vc-hg-dir-extra-header): Rename from vc-hg-status-extra-headers. + * vc-git.el (vc-git-dir-printer): Rename from vc-dir-status-printer. + (vc-git-dir-extra-headers): Rename from vc-git-status-extra-headers. + * vc-dir.el (vc-dir-mode): Use vc-dir-printer instead of + vc-dir-status-printer. + (vc-dir-headers): Use `dir-extra-headers' instead of + `status-extra-headers' + (vc-dir-printer): Rename from vc-dir-status-printer. + (vc-default-dir-extra-headers): Rename from + vc-default-status-extra-headers. + * vc-cvs.el (vc-cvs-dir-extra-headers): Rename from + vc-cvs-status-extra-headers. + * startup.el (server-name): Pacify byte compiler. (command-line): If --daemon=SERVER_NAME was used, set server-name before calling server-start. diff -r d1d986962044 -r b0dce7f34dda lisp/vc-cvs.el --- a/lisp/vc-cvs.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc-cvs.el Mon Oct 27 07:21:43 2008 +0000 @@ -985,7 +985,7 @@ (buffer-substring (point) (point-max))) (file-error nil))) -(defun vc-cvs-status-extra-headers (dir) +(defun vc-cvs-dir-extra-headers (dir) "Extract and represent per-directory properties of a CVS working copy." (let ((repo (condition-case nil diff -r d1d986962044 -r b0dce7f34dda lisp/vc-dir.el --- a/lisp/vc-dir.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc-dir.el Mon Oct 27 07:21:43 2008 +0000 @@ -83,7 +83,7 @@ ;; Used to keep the cursor on the file name column. (beginning-of-line) (unless (eolp) - ;; Must be in sync with vc-default-status-printer. + ;; Must be in sync with vc-default-dir-printer. (forward-char 25))) (defun vc-dir-prepare-status-buffer (bname dir backend &optional create-new) @@ -913,7 +913,7 @@ (let ((buffer-read-only nil)) (erase-buffer) (set (make-local-variable 'vc-dir-process-buffer) nil) - (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-status-printer)) + (set (make-local-variable 'vc-ewoc) (ewoc-create #'vc-dir-printer)) (set (make-local-variable 'revert-buffer-function) 'vc-dir-revert-buffer-function) (set (make-local-variable 'list-buffers-directory) @@ -926,14 +926,14 @@ (defun vc-dir-headers (backend dir) "Display the headers in the *VC dir* buffer. -It calls the `status-extra-headers' backend method to display backend +It calls the `dir-extra-headers' backend method to display backend specific headers." (concat (propertize "VC backend : " 'face 'font-lock-type-face) (propertize (format "%s\n" backend) 'face 'font-lock-variable-name-face) (propertize "Working dir: " 'face 'font-lock-type-face) (propertize (format "%s\n" dir) 'face 'font-lock-variable-name-face) - (vc-call-backend backend 'status-extra-headers dir) + (vc-call-backend backend 'dir-extra-headers dir) "\n")) (defun vc-dir-refresh-files (files default-state) @@ -1068,8 +1068,8 @@ (ewoc-delete vc-ewoc crt)) (setq crt prev))))) -(defun vc-dir-status-printer (fileentry) - (vc-call-backend vc-dir-backend 'status-printer fileentry)) +(defun vc-dir-printer (fileentry) + (vc-call-backend vc-dir-backend 'dir-printer fileentry)) (defun vc-dir-deduce-fileset (&optional state-model-only-files) (let ((marked (vc-dir-marked-files)) @@ -1131,7 +1131,7 @@ (let ((use-vc-backend backend)) (vc-dir-mode)))) -(defun vc-default-status-extra-headers (backend dir) +(defun vc-default-dir-extra-headers (backend dir) ;; Be loud by default to remind people to add code to display ;; backend specific headers. ;; XXX: change this to return nil before the release. @@ -1140,7 +1140,7 @@ (propertize "Please add backend specific headers here. It's easy!" 'face 'font-lock-warning-face))) -(defun vc-default-status-printer (backend fileentry) +(defun vc-default-dir-printer (backend fileentry) "Pretty print FILEENTRY." ;; If you change the layout here, change vc-dir-move-to-goal-column. (let* ((isdir (vc-dir-fileinfo->directory fileentry)) diff -r d1d986962044 -r b0dce7f34dda lisp/vc-git.el --- a/lisp/vc-git.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc-git.el Mon Oct 27 07:21:43 2008 +0000 @@ -266,7 +266,7 @@ (if (eq 0 (logand ?\111 old-perm)) "+x" "-x")) 'face 'font-lock-type-face)) -(defun vc-git-status-printer (info) +(defun vc-git-dir-printer (info) "Pretty-printer for the vc-dir-fileinfo structure." (let* ((isdir (vc-dir-fileinfo->directory info)) (state (if isdir "" (vc-dir-fileinfo->state info))) @@ -380,7 +380,7 @@ "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." (vc-git-dir-status-goto-stage 'update-index files update-function)) -(defun vc-git-status-extra-headers (dir) +(defun vc-git-dir-extra-headers (dir) (let ((str (with-output-to-string (with-current-buffer standard-output (vc-git--out-ok "symbolic-ref" "HEAD"))))) diff -r d1d986962044 -r b0dce7f34dda lisp/vc-hg.el --- a/lisp/vc-hg.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc-hg.el Mon Oct 27 07:21:43 2008 +0000 @@ -44,8 +44,8 @@ ;; - state-heuristic (file) NOT NEEDED ;; - dir-status (dir update-function) OK ;; - dir-status-files (dir files ds uf) OK -;; - status-extra-headers (dir) OK -;; - status-printer (fileinfo) OK +;; - dir-extra-headers (dir) OK +;; - dir-printer (fileinfo) OK ;; * working-revision (file) OK ;; - latest-on-branch-p (file) ?? ;; * checkout-model (files) OK @@ -429,12 +429,12 @@ rename-state ;; rename or copy state extra-name) ;; original name for copies and rename targets, new name for -(declare-function vc-default-status-printer "vc-dir" (backend fileentry)) +(declare-function vc-default-dir-printer "vc-dir" (backend fileentry)) -(defun vc-hg-status-printer (info) +(defun vc-hg-dir-printer (info) "Pretty-printer for the vc-dir-fileinfo structure." (let ((extra (vc-dir-fileinfo->extra info))) - (vc-default-status-printer 'Hg info) + (vc-default-dir-printer 'Hg info) (when extra (insert (propertize (format " (%s %s)" @@ -507,7 +507,7 @@ (vc-exec-after `(vc-hg-after-dir-status (quote ,update-function)))) -(defun vc-hg-status-extra-header (name &rest commands) +(defun vc-hg-dir-extra-header (name &rest commands) (concat (propertize name 'face 'font-lock-type-face) (propertize (with-temp-buffer @@ -515,16 +515,16 @@ (buffer-substring-no-properties (point-min) (1- (point-max)))) 'face 'font-lock-variable-name-face))) -(defun vc-hg-status-extra-headers (dir) +(defun vc-hg-dir-extra-headers (dir) "Generate extra status headers for a Mercurial tree." (let ((default-directory dir)) (concat - (vc-hg-status-extra-header "Root : " "root") "\n" - (vc-hg-status-extra-header "Branch : " "id" "-b") "\n" - (vc-hg-status-extra-header "Tags : " "id" "-t") ; "\n" + (vc-hg-dir-extra-header "Root : " "root") "\n" + (vc-hg-dir-extra-header "Branch : " "id" "-b") "\n" + (vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n" ;; these change after each commit - ;; (vc-hg-status-extra-header "Local num : " "id" "-n") "\n" - ;; (vc-hg-status-extra-header "Global id : " "id" "-i") + ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n" + ;; (vc-hg-dir-extra-header "Global id : " "id" "-i") ))) ;; FIXME: this adds another top level menu, instead figure out how to diff -r d1d986962044 -r b0dce7f34dda lisp/vc-svn.el --- a/lisp/vc-svn.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc-svn.el Mon Oct 27 07:21:43 2008 +0000 @@ -192,7 +192,7 @@ (vc-exec-after `(vc-svn-after-dir-status (quote ,callback)))) -(defun vc-svn-status-extra-headers (dir) +(defun vc-svn-dir-extra-headers (dir) "Generate extra status headers for a Subversion working copy." (vc-svn-command "*vc*" 0 nil "info") (let ((repo diff -r d1d986962044 -r b0dce7f34dda lisp/vc.el --- a/lisp/vc.el Mon Oct 27 07:02:30 2008 +0000 +++ b/lisp/vc.el Mon Oct 27 07:21:43 2008 +0000 @@ -159,8 +159,8 @@ ;; and then do a (funcall UPDATE-FUNCTION RESULT nil) ;; when all the results have been computed. ;; To provide more backend specific functionality for `vc-dir' -;; the following functions might be needed: `status-extra-headers', -;; `status-printer', `extra-status-menu' and `dir-status-files'. +;; the following functions might be needed: `dir-extra-headers', +;; `dir-printer', `extra-dir-menu' and `dir-status-files'. ;; ;; - dir-status-files (dir files default-state update-function) ;; @@ -170,11 +170,11 @@ ;; files. If not provided, the default is to consider that the files ;; are in DEFAULT-STATE. ;; -;; - status-extra-headers (dir) +;; - dir-extra-headers (dir) ;; ;; Return a string that will be added to the *vc-dir* buffer header. ;; -;; - status-printer (fileinfo) +;; - dir-printer (fileinfo) ;; ;; Pretty print the `vc-dir-fileinfo' FILEINFO. ;; If a backend needs to show more information than the default FILE @@ -527,7 +527,7 @@ ;; to your backend and which does not map to any of the VC generic ;; concepts. ;; -;; - extra-status-menu () +;; - extra-dir-menu () ;; ;; Return a menu keymap, the items in the keymap will appear at the ;; end of the VC Status menu. The goal is to allow backends to