aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-03-23 18:15:35 +0000
committerDan Nicolaescu2008-03-23 18:15:35 +0000
commit4e3837816acdfdad1bb4ee2b0ab0e1f99251a639 (patch)
tree60752ce59ec4890c83202fd1d6aa3f0de403f12e
parentd39730b89520fe99363728c744f345446197ee00 (diff)
downloademacs-4e3837816acdfdad1bb4ee2b0ab0e1f99251a639.tar.gz
emacs-4e3837816acdfdad1bb4ee2b0ab0e1f99251a639.zip
(vc-cvs-parse-status): Note there are problems with
subdirectories.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/vc-cvs.el6
2 files changed, 9 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 18cf78e04cb..6c0c3fec8b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12008-03-23 Dan Nicolaescu <dann@ics.uci.edu> 12008-03-23 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-cvs.el (vc-cvs-parse-status): Note there are problems with
4 subdirectories.
5
3 * vc.el (vc-status-prepare-status-buffer): Fix thinko. 6 * vc.el (vc-status-prepare-status-buffer): Fix thinko.
4 (vc-status-menu-map): Add binding for 7 (vc-status-menu-map): Add binding for
5 vc-status-kill-dir-status-process. Add :enable for vc-status-refresh. 8 vc-status-kill-dir-status-process. Add :enable for vc-status-refresh.
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 98051b65430..a3a8b198956 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -812,6 +812,12 @@ For an empty string, nil is returned (invalid CVS root)."
812 ;; Normalize CVS root record 812 ;; Normalize CVS root record
813 (list method user host root))))) 813 (list method user host root)))))
814 814
815;; XXX: This does not work correctly for subdirectories. "cvs status"
816;; information is context sensitive, it contains lines like:
817;; cvs status: Examining DIRNAME
818;; and the file entries after that don't show the full path.
819;; Because of this vc-dired only shows changed files at the top level
820;; for CVS.
815(defun vc-cvs-parse-status (&optional full) 821(defun vc-cvs-parse-status (&optional full)
816 "Parse output of \"cvs status\" command in the current buffer. 822 "Parse output of \"cvs status\" command in the current buffer.
817Set file properties accordingly. Unless FULL is t, parse only 823Set file properties accordingly. Unless FULL is t, parse only