emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v


From: Dan Nicolaescu
Subject: [Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v
Date: Thu, 17 Apr 2008 00:31:57 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/17 00:31:56

Index: vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -b -r1.120 -r1.121
--- vc-cvs.el   15 Apr 2008 07:26:36 -0000      1.120
+++ vc-cvs.el   17 Apr 2008 00:31:56 -0000      1.121
@@ -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,




reply via email to

[Prev in Thread] Current Thread [Next in Thread]