diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-07-04 23:30:29 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2003-07-04 23:30:29 +0000 |
| commit | 36317f13f88ac56f0fac612d28e89f4da01e94ac (patch) | |
| tree | b27a09cc0e9fad015983996902bd7b58f342d096 | |
| parent | c60c12be4c53b4065a6eebbede5e36b812183018 (diff) | |
| download | emacs-36317f13f88ac56f0fac612d28e89f4da01e94ac.tar.gz | |
(cvs-parse-status): Ignore extra fields from CVSNT.
| -rw-r--r-- | lisp/pcvs-parse.el | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index b8dbe815388..9ba3814c91c 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -457,12 +457,12 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE))) (cvs-match "File had conflicts on merge$" (type 'MODIFIED)) (cvs-match ".*[Cc]onflict.*$" (type 'CONFLICT)) - (cvs-match "Locally Added$" (type 'ADDED)) + (cvs-match "Locally Added$" (type 'ADDED)) (cvs-match "Locally Removed$" (type 'REMOVED)) (cvs-match "Locally Modified$" (type 'MODIFIED)) (cvs-match "Needs Merge$" (type 'NEED-MERGE)) (cvs-match "Entry Invalid" (type '(NEED-MERGE . REMOVED))) - (cvs-match "Unknown$" (type 'UNKNOWN))) + (cvs-match ".*$" (type 'UNKNOWN))) (cvs-match "$") (cvs-or (cvs-match " *Version:[ \t]*\\([0-9.]+\\).*$" (base-rev 1)) @@ -475,12 +475,15 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$" (head-rev 1)) (cvs-match " *Repository revision:.*")) + (cvs-or (cvs-match " *Expansion option:.*") t) ;Optional CVSNT thingie. + (cvs-or (cvs-match " *Commit Identifier:.*") t) ;Optional CVSNT thingie. (cvs-or - (and;;sometimes those fields are missing - (cvs-match " *Sticky Tag:[ \t]*\\(.*\\)$") ; FIXME: use it - (cvs-match " *Sticky Date:[ \t]*\\(.*\\)$") ; FIXME: use it - (cvs-match " *Sticky Options:[ \t]*\\(.*\\)$")) ; FIXME: use it + (and ;; Sometimes those fields are missing. + (cvs-match " *Sticky Tag:[ \t]*\\(.*\\)$") ; FIXME: use it. + (cvs-match " *Sticky Date:[ \t]*\\(.*\\)$") ; FIXME: use it. + (cvs-match " *Sticky Options:[ \t]*\\(.*\\)$")) ; FIXME: use it. t) + (cvs-or (cvs-match " *Merge From:.*") t) ;Optional CVSNT thingie. (cvs-match "$") ;; ignore the tags-listing in the case of `status -v' (cvs-or (cvs-match " *Existing Tags:\n\\(\t.*\n\\)*$") t) |