Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-24 13:57:36 +00:00
Code Issues Projects Releases Packages Wiki Activity

(vc-cvs-state-heuristic, vc-cvs-parse-status): Try and

Browse source 
return `unregistered' when applicable.
This commit is contained in:
Stefan Monnier 2008-05-30 16:21:49 +00:00
parent 8f39c96dec
commit 47dd5958df
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,5 +1,8 @@
2008-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-cvs.el (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
return `unregistered' when applicable.
* emacs-lisp/checkdoc.el (checkdoc-this-string-valid-engine):
Don't encourage naming variables with "-flag".
@ -295,7 +298,7 @@
* vc.el (vc-delete-file): Don't try to resynch the buffer.
2008-05-23 Paul R <paul.r.ml@gmail.com>
2008-05-23 Paul Rivier <paul.r.ml@gmail.com>
* textmodes/reftex-vars.el (reftex-extra-bindings-prefix): New var.
* textmodes/reftex.el (reftex-extra-bindings-map): New var.

7
lisp/vc-cvs.el
View file

@ -231,6 +231,7 @@ See also variable `vc-cvs-sticky-date-format-string'."
(cond
((equal checkout-time lastmod) 'up-to-date)
((string= (vc-working-revision file) "0") 'added)
((null checkout-time) 'unregistered)
(t 'edited))))
(defun vc-cvs-working-revision (file)
@ -800,9 +801,8 @@ state."
((re-search-forward "\\=\\([^ \t]+\\)" nil t)
(setq file (expand-file-name (match-string 1)))
(vc-file-setprop file 'vc-backend 'CVS)
(if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t))
(setq status "Unknown")
(setq status (match-string 1)))
(setq status(if (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t)
(match-string 1) "Unknown"))
(when (and full
(re-search-forward
"\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
@ -823,6 +823,7 @@ state."
((string-match "Locally Added" status) 'added)
((string-match "Locally Removed" status) 'removed)
((string-match "File had conflicts " status) 'conflict)
((string-match "Unknown" status) 'unregistered)
(t 'edited))))))))
(defun vc-cvs-after-dir-status (update-function)