# HG changeset patch # User Dan Nicolaescu # Date 1208392316 0 # Node ID 13dd1e5786bf2de51de3fb6a4ad4b817e91061d2 # Parent 5b10e56469734224150271cc71679f62a0a5326f *** empty log message *** diff -r 5b10e5646973 -r 13dd1e5786bf lisp/vc-cvs.el --- a/lisp/vc-cvs.el Wed Apr 16 19:53:06 2008 +0000 +++ b/lisp/vc-cvs.el Thu Apr 17 00:31:56 2008 +0000 @@ -951,45 +951,6 @@ (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,