diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-08-19 22:29:06 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2004-08-19 22:29:06 +0000 |
| commit | 9ca77988f7d78f85878823c8e6e8e9a5e3f00aef (patch) | |
| tree | 8549488cf215115b9a9390ef8a9d04f610761965 /lisp/pcvs-parse.el | |
| parent | 7fc5d1860858a24c6856ce122d94a984b8c1a393 (diff) | |
| download | emacs-9ca77988f7d78f85878823c8e6e8e9a5e3f00aef.tar.gz | |
(cvs-parse-table, cvs-parse-commit): Try to adapt to
the newer format of some messages in cvs-1.12.1.
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index c1726ee84c7..84dbf218581 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -1,7 +1,7 @@ ;;; pcvs-parse.el --- the CVS output parser -;; Copyright (C) 1991,92,93,94,95,96,97,98,99,2000,02,2003 -;; Free Software Foundation, Inc. +;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, +;; 2000, 2002, 2003, 2004 Free Software Foundation, Inc. ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs @@ -370,7 +370,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; File you removed still exists. Ignore (will be noted as removed). (cvs-match ".* should be removed and is still there$") ;; just a note - (cvs-match "use '.+ commit' to \\sw+ th\\sw+ files? permanently$") + (cvs-match "use ['`].+ commit' to \\sw+ th\\sw+ files? permanently$") ;; [add,status] followed by a more complete status description anyway (and (cvs-match "nothing known about \\(.*\\)$" (path 1)) (cvs-parsed-fileinfo 'DEAD path 'trust)) @@ -492,12 +492,14 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." :head-rev head-rev)))) (defun cvs-parse-commit () - (let (path base-rev subtype) + (let (path file base-rev subtype) (cvs-or (and - (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2)) - (cvs-match ".*,v <-- .*$") + (cvs-or + (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2)) + t) + (cvs-match ".*,v <-- \\(.*\\)$" (file 1)) (cvs-or ;; deletion (cvs-match "new revision: delete; previous revision: \\([0-9.]*\\)$" @@ -508,7 +510,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; update (cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$" (subtype 'COMMITTED) (base-rev 1))) - (cvs-match "done$") + (cvs-or (cvs-match "done$") t) (progn ;; Try to remove the temp files used by VC. (vc-delete-automatic-version-backups (expand-file-name path)) @@ -516,7 +518,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; because `cvs commit' might begin by a series of Examining messages ;; so the processing of the actual checkin messages might begin with ;; a `current-dir' set to something different from "" - (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) path 'trust + (cvs-parsed-fileinfo (cons 'UP-TO-DATE subtype) + (or path file) (if path 'trust) :base-rev base-rev))) ;; useless message added before the actual addition: ignored @@ -525,5 +528,5 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (provide 'pcvs-parse) -;;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6 +;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6 ;;; pcvs-parse.el ends here |