(vc-dir-recompute-file-state): Add workaround for CVS.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48ff34133371bf4178b61f9f62fa158f3c89f85e..93129d566006975b611faf8feea6bc9b007f8e0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * vc-dir.el (vc-dir-recompute-file-state): Add workaround for CVS.      
+
 2008-07-21  Chong Yidong  <cyd@stupidchicken.com>
 
        * menu-bar.el (menu-bar-line-wrapping-menu): Use Visual Line mode

diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 69117c8f2f3ab858f738c0b4ccb9f8044e0fff6c..1069f40e2ea0415929b3d1dfb2fe4b9b2509061d 100644 (file)
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -772,6 +772,11 @@ If it is a file, return the corresponding cons for the file itself."
 
 (defun vc-dir-recompute-file-state (fname def-dir)
   (let* ((file-short (file-relative-name fname def-dir))
+        (remove-me-when-CVS-works
+         (when (eq vc-dir-backend 'CVS)
+           ;; FIXME: Warning: UGLY HACK.  The CVS backend caches the state
+           ;; info, this forces the backend to update it.
+           (vc-call-backend vc-dir-backend 'registered fname))
         (state (vc-call-backend vc-dir-backend 'state fname))
         (extra (vc-call-backend vc-dir-backend
                                 'status-fileinfo-extra fname)))