aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-04-17 00:31:56 +0000
committerDan Nicolaescu2008-04-17 00:31:56 +0000
commita5e83c39a795ecadc7194e5c0a361cbd50f8a39e (patch)
tree3a84148e3fa6b75107072dcd9cc5621b23bcef03
parenta51f4969027895470f93bc988a2bda3c7dee5ff1 (diff)
downloademacs-a5e83c39a795ecadc7194e5c0a361cbd50f8a39e.tar.gz
emacs-a5e83c39a795ecadc7194e5c0a361cbd50f8a39e.zip
*** empty log message ***
-rw-r--r--lisp/vc-cvs.el39
1 files changed, 0 insertions, 39 deletions
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."
951 (vc-exec-after 951 (vc-exec-after
952 `(vc-cvs-after-dir-status (quote ,update-function)))) 952 `(vc-cvs-after-dir-status (quote ,update-function))))
953 953
954(defun vc-cvs-after-dir-status (update-function)
955 ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack.
956 ;; It needs a lot of testing.
957 (let ((result nil)
958 (translation '((?? . unregistered)
959 (?A . added)
960 (?C . conflict)
961 (?M . edited)
962 (?P . needs-merge)
963 (?R . removed)
964 (?U . needs-patch))))
965 (goto-char (point-min))
966 (while (not (eobp))
967 (if (looking-at "^[ACMPRU?] \\(.*\\)$")
968 (push (list (match-string 1)
969 (cdr (assoc (char-after) translation)))
970 result)
971 (cond
972 ((looking-at "cvs update: warning: \\(.*\\) was lost")
973 ;; Format is:
974 ;; cvs update: warning: FILENAME was lost
975 ;; U FILENAME
976 (push (list (match-string 1) 'missing) result)
977 ;; Skip the "U" line
978 (forward-line 1))
979 ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored")
980 (push (list (match-string 1) 'unregistered) result))))
981 (forward-line 1))
982 (funcall update-function result)))
983
984(defun vc-cvs-dir-status (dir update-function)
985 "Create a list of conses (file . state) for DIR."
986 (vc-cvs-command (current-buffer) 'async
987 (file-relative-name dir)
988 "-f" "-n" "update" "-d" "-P")
989 (vc-exec-after
990 `(vc-cvs-after-dir-status (quote ,update-function))))
991
992
993(defun vc-cvs-get-entries (dir) 954(defun vc-cvs-get-entries (dir)
994 "Insert the CVS/Entries file from below DIR into the current buffer. 955 "Insert the CVS/Entries file from below DIR into the current buffer.
995This function ensures that the correct coding system is used for that, 956This function ensures that the correct coding system is used for that,