199 |
|
|
200 |
(defun cvs-parse-table () |
(defun cvs-parse-table () |
201 |
"Table of message objects for `cvs-parse-process'." |
"Table of message objects for `cvs-parse-process'." |
202 |
(let (c file dir path type base-rev subtype) |
(let (c file dir path base-rev subtype) |
203 |
(cvs-or |
(cvs-or |
204 |
|
|
205 |
(cvs-parse-status) |
(cvs-parse-status) |
266 |
(and |
(and |
267 |
(cvs-match "New directory `\\(.*\\)' -- ignored$" (dir 1)) |
(cvs-match "New directory `\\(.*\\)' -- ignored$" (dir 1)) |
268 |
;; (cvs-parsed-fileinfo 'MESSAGE " " (file-name-as-directory dir)) |
;; (cvs-parsed-fileinfo 'MESSAGE " " (file-name-as-directory dir)) |
269 |
(cvs-parsed-fileinfo '(NEED-UPDATE . NEW-DIR) dir t)) |
;; These messages either correspond to a true new directory |
270 |
|
;; that an update will bring in, or to a directory that's empty |
271 |
|
;; on the current branch (either because it only exists in other |
272 |
|
;; branches, or because it's been removed). |
273 |
|
(if (ignore-errors |
274 |
|
(with-current-buffer |
275 |
|
(find-file-noselect (expand-file-name |
276 |
|
".cvsignore" (file-name-directory dir))) |
277 |
|
(goto-char (point-min)) |
278 |
|
(re-search-forward |
279 |
|
(concat "^" (regexp-quote (file-name-nondirectory dir)) "/$") |
280 |
|
nil t))) |
281 |
|
t ;The user requested to ignore those messages. |
282 |
|
(cvs-parsed-fileinfo '(NEED-UPDATE . NEW-DIR) dir t))) |
283 |
|
|
284 |
;; File removed, since it is removed (by third party) in repository. |
;; File removed, since it is removed (by third party) in repository. |
285 |
(and |
(and |
400 |
|
|
401 |
|
|
402 |
(defun cvs-parse-merge () |
(defun cvs-parse-merge () |
403 |
(let (path base-rev head-rev handled type) |
(let (path base-rev head-rev type) |
404 |
;; A merge (maybe with a conflict). |
;; A merge (maybe with a conflict). |
405 |
(and |
(and |
406 |
(cvs-match "RCS file: .*$") |
(cvs-match "RCS file: .*$") |