Name change in preparation for ripping out vc-dired.

5 files changed, 21 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1611fec08b1..12d862bcc47 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-02  Eric S. Raymond  <esr@snark.thyrsus.com>
+
+	* vc.el (vc-default-dired-state-info): Change name of primitive
+	to prettify-state-info, in preparation for ripping out dired mode.
+	* vc-bzr.el (vc-bzr-dired-state-info): Change name of primitive
+	to prettify-state-info, in preparation for ripping out dired mode.
+
 2008-05-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* vc-rcs.el (vc-rcs-state): Fix typos.
@@ -33,14 +40,14 @@
 	* vc.el (vc-default-dired-state): Change needs-patch state to
 	needs-update, since the name now shows up in dir-status listings
 	and was somewhat misleading.
-	* vc-cvs.el (vc-cvs-delete-file) Don't do a "cvs commit"
+	* vc-cvs.el (vc-cvs-delete-file): Don't do a "cvs commit"
 	immediately after removing the file.
 	* vc.el (vc-next-action): More informative messages when a fileset
 	is in a mixed state or files are missing.
 
 2008-05-01  Sam Steingold  <sds@gnu.org>
 
-	* vc.el (vc-delete-file): Check if the file has uncommitted changed.
+	* vc.el (vc-delete-file): Check if the file has uncommitted changes.
 
 2008-05-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index 65e8212c34f..15529e20f0c 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -647,13 +647,13 @@ Optional argument LOCALP is always ignored."
           (setq current-vc-state nil)
           (setq current-bzr-state nil)))))))
 
-(defun vc-bzr-dired-state-info (file)
-  "Bzr-specific version of `vc-dired-state-info'."
+(defun vc-bzr-prettify-state-info (file)
+  "Bzr-specific version of `vc-prettify-state-info'."
   (if (eq 'edited (vc-state file))
         (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) 
                                      'edited)) ")")
     ;; else fall back to default vc.el representation
-    (vc-default-dired-state-info 'Bzr file)))
+    (vc-default-prettify-state-info 'Bzr file)))
 
 ;; XXX: this needs testing, it's probably incomplete. 
 (defun vc-bzr-after-dir-status (update-function)
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 0c718cb8677..9c8ebfc9993 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -58,7 +58,7 @@
 ;; * checkout-model (file)			   OK
 ;; - workfile-unchanged-p (file)		   OK
 ;; - mode-line-string (file)			   OK
-;; - dired-state-info (file)			   OK
+;; - prettify-state-info (file)			   OK
 ;; STATE-CHANGING FUNCTIONS
 ;; * create-repo ()				   OK
 ;; * register (files &optional rev comment)	   OK
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 44ffa95a92f..59aba1cc2a7 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -50,7 +50,7 @@
 ;; * checkout-model (file)                     OK
 ;; - workfile-unchanged-p (file)               OK
 ;; - mode-line-string (file)                   NOT NEEDED
-;; - dired-state-info (file)                   OK
+;; - prettify-state-info (file)                OK
 ;; STATE-CHANGING FUNCTIONS
 ;; * register (files &optional rev comment)    OK
 ;; * create-repo ()                            OK
diff --git a/lisp/vc.el b/lisp/vc.el
index a56b281122b..ae575985f1a 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -254,10 +254,10 @@
 ;;   The default implementation deals well with all states that
 ;;   `vc-state' can return.
 ;;
-;; - dired-state-info (file)
+;; - prettify-state-info (file)
 ;;
 ;;   Translate the `vc-state' property of FILE into a string that can be
-;;   used in a vc-dired buffer.  The default implementation deals well
+;;   used in a human-readable buffer.  The default implementation deals well
 ;;   with all states that `vc-state' can return.
 ;;
 ;; STATE-CHANGING FUNCTIONS
@@ -674,6 +674,9 @@
 ;; - backends that care about vc-stay-local should try to take it into
 ;;   account for vc-dir.  Is this likely to be useful???
 ;;
+;; - vc-dir listing needs a footer generated when it's done to make it obvious
+;; that it has finished.
+;;
 ;;; Code:
 
 (require 'vc-hooks)
@@ -2678,7 +2681,7 @@ Called by dired after any portion of a vc-dired buffer has been read in."
 	    (forward-line 1)))
 	 ;; Either we're in non-terse mode or it's out of date
 	 ((not (and vc-dired-terse-mode (vc-up-to-date-p filename)))
-	  (vc-dired-reformat-line (vc-call dired-state-info filename))
+	  (vc-dired-reformat-line (vc-call prettify-state-info filename))
 	  (forward-line 1))
 	 ;; Remaining cases are under version control but uninteresting
 	 (t
@@ -4256,7 +4259,7 @@ to provide the `find-revision' operation instead."
 	    (insert-file-contents-literally tmpfile)))
       (delete-file tmpfile))))
 
-(defun vc-default-dired-state-info (backend file)
+(defun vc-default-prettify-state-info (backend file)
   (let* ((state (vc-state file))
 	(statestring
 	 (cond