From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Thu, 17 Apr 2008 00:31:56 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: emacs-pretest-23.0.90~6248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5e83c39a795ecadc7194e5c0a361cbd50f8a39e;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 61d93ebfeec..d976213f187 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -951,45 +951,6 @@ state."
   (vc-exec-after
    `(vc-cvs-after-dir-status (quote ,update-function))))
 
-(defun vc-cvs-after-dir-status (update-function)
-  ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack.
-  ;; It needs a lot of testing.
-  (let ((result nil)
-	(translation '((?? . unregistered)
-		       (?A . added)
-		       (?C . conflict)
-		       (?M . edited)
-		       (?P . needs-merge)
-		       (?R . removed)
-		       (?U . needs-patch))))
-    (goto-char (point-min))
-    (while (not (eobp))
-      (if (looking-at "^[ACMPRU?] \\(.*\\)$")
-	  (push (list (match-string 1) 
-		      (cdr (assoc (char-after) translation))) 
-		result)
-	(cond
-	 ((looking-at "cvs update: warning: \\(.*\\) was lost")
-	  ;; Format is:
-	  ;; cvs update: warning: FILENAME was lost
-	  ;; U FILENAME
-	  (push (list (match-string 1) 'missing) result)
-	  ;; Skip the "U" line
-	  (forward-line 1))
-	 ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored")
-	  (push (list (match-string 1) 'unregistered) result))))
-      (forward-line 1))
-    (funcall update-function result)))
-
-(defun vc-cvs-dir-status (dir update-function)
-  "Create a list of conses (file . state) for DIR."
-  (vc-cvs-command (current-buffer) 'async
-		  (file-relative-name dir)
-		  "-f" "-n" "update" "-d" "-P")
-  (vc-exec-after
-   `(vc-cvs-after-dir-status (quote ,update-function))))
-
-
 (defun vc-cvs-get-entries (dir)
   "Insert the CVS/Entries file from below DIR into the current buffer.
 This function ensures that the correct coding system is used for that,