Mercurial > emacs
diff lisp/vc-hg.el @ 99159:b0dce7f34dda
* 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.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Mon, 27 Oct 2008 07:21:43 +0000 |
parents | b3eefcc54430 |
children | 015fd0131c0b |
line wrap: on
line diff
--- 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