Mercurial > emacs
comparison lisp/vc-cvs.el @ 95591:fff438dcde9e
(vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
| author | Sam Steingold <sds@gnu.org> |
|---|---|
| date | Thu, 05 Jun 2008 18:52:48 +0000 |
| parents | 75b22805a854 |
| children | 52ec5c5888db |
comparison
equal
deleted
inserted
replaced
| 95590:9a4b27c8feec | 95591:fff438dcde9e |
|---|---|
| 194 (let ((dirname (or (file-name-directory file) "")) | 194 (let ((dirname (or (file-name-directory file) "")) |
| 195 (basename (file-name-nondirectory file)) | 195 (basename (file-name-nondirectory file)) |
| 196 ;; make sure that the file name is searched case-sensitively | 196 ;; make sure that the file name is searched case-sensitively |
| 197 (case-fold-search nil)) | 197 (case-fold-search nil)) |
| 198 (if (file-readable-p (expand-file-name "CVS/Entries" dirname)) | 198 (if (file-readable-p (expand-file-name "CVS/Entries" dirname)) |
| 199 (with-temp-buffer | 199 (or (string= basename "") |
| 200 (vc-cvs-get-entries dirname) | 200 (with-temp-buffer |
| 201 (goto-char (point-min)) | 201 (vc-cvs-get-entries dirname) |
| 202 (cond | 202 (goto-char (point-min)) |
| 203 ((re-search-forward | 203 (cond ((re-search-forward |
| 204 (concat "^/" (regexp-quote basename) "/[^/]") nil t) | 204 (concat "^/" (regexp-quote basename) "/[^/]") nil t) |
| 205 (beginning-of-line) | 205 (beginning-of-line) |
| 206 (vc-cvs-parse-entry file) | 206 (vc-cvs-parse-entry file) |
| 207 t) | 207 t) |
| 208 (t nil))) | 208 (t nil)))) |
| 209 nil))) | 209 nil))) |
| 210 | 210 |
| 211 (defun vc-cvs-state (file) | 211 (defun vc-cvs-state (file) |
| 212 "CVS-specific version of `vc-state'." | 212 "CVS-specific version of `vc-state'." |
| 213 (if (vc-stay-local-p file) | 213 (if (vc-stay-local-p file) |