diff options
| author | André Spiegel <spiegel@gnu.org> | 2001-11-30 13:47:39 +0000 |
|---|---|---|
| committer | André Spiegel <spiegel@gnu.org> | 2001-11-30 13:47:39 +0000 |
| commit | 44f663a4de54884c89be1af9e9b677a33259703d (patch) | |
| tree | e994d3819ade95addb5ed67eaafaf539dde360a1 /lisp/vc-cvs.el | |
| parent | 5db6e80eebfcf7d2f4ad124c27e2ecf39062c70f (diff) | |
| download | emacs-44f663a4de54884c89be1af9e9b677a33259703d.tar.gz | |
(vc-cvs-parse-status): Store file state in property, don't just return
it.
Diffstat (limited to 'lisp/vc-cvs.el')
| -rw-r--r-- | lisp/vc-cvs.el | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index 5bd79df3db2..9f8a82d432b 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.26 2001/10/22 07:57:00 spiegel Exp $ +;; $Id: vc-cvs.el,v 1.27 2001/11/25 23:52:51 monnier Exp $ ;; This file is part of GNU Emacs. @@ -693,19 +693,21 @@ essential information." (setq status (match-string 1))) (if (and full (re-search-forward - "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\ + "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\ \[\t ]+\\([0-9.]+\\)" nil t)) (vc-file-setprop file 'vc-latest-version (match-string 2))) - (cond - ((string-match "Up-to-date" status) - (vc-file-setprop file 'vc-checkout-time - (nth 5 (file-attributes file))) - 'up-to-date) - ((string-match "Locally Modified" status) 'edited) - ((string-match "Needs Merge" status) 'needs-merge) - ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch) - (t 'edited))))))) + (vc-file-setprop + file 'vc-state + (cond + ((string-match "Up-to-date" status) + (vc-file-setprop file 'vc-checkout-time + (nth 5 (file-attributes file))) + 'up-to-date) + ((string-match "Locally Modified" status) 'edited) + ((string-match "Needs Merge" status) 'needs-merge) + ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch) + (t 'edited)))))))) (defun vc-cvs-dir-state-heuristic (dir) "Find the CVS state of all files in DIR, using only local information." |