diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-03-22 02:57:23 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2000-03-22 02:57:23 +0000 |
| commit | cb3430a1f76f18e76cd3436e02346222895bd657 (patch) | |
| tree | cc02efe53d5d3a73c122e164a03b9e1d59722841 /lisp/pcvs-parse.el | |
| parent | ff1a0d8e5b71fa7a031eb464d6c750fea8e67ad8 (diff) | |
| download | emacs-cb3430a1f76f18e76cd3436e02346222895bd657.tar.gz | |
* pcvs.el: Add a minimal leading commentary.
(cvs-make-cvs-buffer): Change the header part by removing the startup
message and adding a `Module' entry. Also replace the FOOTER and
HEADER special fileinfos with the new support in ewoc for updating
its own footer and header.
(cvs-update-header): Update to use the header/footer of the ewoc.
(cvs-mode): Use define-derived-mode and set truncate-lines to t.
(cvs-is-within-p): New function.
(cvs-mode-run): Take advantage of `save-some-buffers's new ability
to only examine some subset of the buffers.
* pcvs-info.el (cvs-fileinfo-pp): Use the new property-preserving
`format' instead of our own ad-hoc functions.
Remove HEADER and FOOTER cases, now handled in the EWOC.
(cvs-fileinfo<): Remove HEADER and FOOTER cases.
* pcvs-parse.el (cvs-parse-run-table): Change message for unknown
output to avoid scaring the user.
(cvs-parse-table): Catch message for non-up-to-date commits.
* pcvs-defs.el (cvs-startup-message): Remove.
(cvs-global-menu): New autoloaded menu.
* pcvs-util.el (cvs-string-fill): Remove.
* emacs-lisp/ewoc.el (ewoc--create-special-node): Remove.
(ewoc--refresh-node): Don't take the whole EWOC but only the relevant
PP part of it and also make it work for footers and headers.
(ewoc-create): Drop POS and BUFFER arguments.
Use the DLL's dummy node to store the end-of-footer position.
(ewoc-map, ewoc-invalidate): Update call to ewoc--refresh-node.
(ewoc-refresh): Remove unused `header' variable.
(ewoc-(get|set)-hf): New functions.
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index b65f8d2eb60..818506b6916 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -5,7 +5,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs ;; Version: $Name: $ -;; Revision: $Id: pcl-cvs-parse.el,v 1.41 2000/03/05 21:32:21 monnier Exp $ +;; Revision: $Id: pcvs-parse.el,v 1.1 2000/03/11 03:42:29 monnier Exp $ ;; This file is part of GNU Emacs. @@ -154,7 +154,7 @@ Match RE and if successful, execute MATCHES." (and (cvs-match ".*$") (cvs-create-fileinfo 'MESSAGE cvs-current-dir " " - (concat " Parser Error: '" (cvs-parse-msg) "'") + (concat " Unknown msg: '" (cvs-parse-msg) "'") :subtype 'ERROR))))) @@ -318,6 +318,10 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 1)) (cvs-parsed-fileinfo 'UNKNOWN path)) + ;; [commit] + (and (cvs-match "Up-to-date check failed for `\\(.+\\)'$" (file 1)) + (cvs-parsed-fileinfo 'NEED-MERGE file)) + ;; We use cvs-execute-multi-dir but cvs can't handle it ;; Probably because the cvs-client can but the cvs-server can't (and (cvs-match ".* files with '?/'? in their name.*$") |