[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [lexbind] |
Date: |
Sat, 04 Sep 2004 05:41:25 -0400 |
Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.11.2.2 emacs/lisp/pcvs-parse.el:1.11.2.3
*** emacs/lisp/pcvs-parse.el:1.11.2.2 Tue Oct 14 23:51:20 2003
--- emacs/lisp/pcvs-parse.el Sat Sep 4 09:26:22 2004
***************
*** 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.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: pcl-cvs
--- 1,7 ----
;;; pcvs-parse.el --- the CVS output parser
! ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
! ;; 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
;; Author: Stefan Monnier <address@hidden>
;; Keywords: pcl-cvs
***************
*** 370,376 ****
;; 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$")
;; [add,status] followed by a more complete status description anyway
(and (cvs-match "nothing known about \\(.*\\)$" (path 1))
(cvs-parsed-fileinfo 'DEAD path 'trust))
--- 370,376 ----
;; 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$")
;; [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,503 ****
:head-rev head-rev))))
(defun cvs-parse-commit ()
! (let (path base-rev subtype)
(cvs-or
(and
! (cvs-match "\\(Checking in\\|Removing\\) \\(.*\\);$" (path 2))
! (cvs-match ".*,v <-- .*$")
(cvs-or
;; deletion
(cvs-match "new revision: delete; previous revision: \\([0-9.]*\\)$"
--- 492,505 ----
:head-rev head-rev))))
(defun cvs-parse-commit ()
! (let (path file base-rev subtype)
(cvs-or
(and
! (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,514 ****
;; update
(cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$"
(subtype 'COMMITTED) (base-rev 1)))
! (cvs-match "done$")
(progn
;; Try to remove the temp files used by VC.
(vc-delete-automatic-version-backups (expand-file-name path))
--- 510,516 ----
;; update
(cvs-match "new revision: \\([0-9.]*\\); previous revision: .*$"
(subtype 'COMMITTED) (base-rev 1)))
! (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,522 ****
;; 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
:base-rev base-rev)))
;; useless message added before the actual addition: ignored
--- 518,525 ----
;; 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)
! (or path file) (if path 'trust)
:base-rev base-rev)))
;; useless message added before the actual addition: ignored
***************
*** 525,529 ****
(provide 'pcvs-parse)
! ;;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6
;;; pcvs-parse.el ends here
--- 528,532 ----
(provide 'pcvs-parse)
! ;; arch-tag: 35418375-1a23-40a0-957d-96b0262f91d6
;;; pcvs-parse.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el [lexbind],
Miles Bader <=