[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el

[Juanma Barranquero]

Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.13 emacs/lisp/pcvs-parse.el:1.14
*** emacs/lisp/pcvs-parse.el:1.13       Mon Sep  2 21:23:15 2002
--- emacs/lisp/pcvs-parse.el    Tue Feb  4 06:56:55 2003
***************
*** 5,11 ****
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.13 2002/09/03 01:23:15 monnier Exp $
  
  ;; This file is part of GNU Emacs.
  
--- 5,11 ----
  
  ;; Author: Stefan Monnier <address@hidden>
  ;; Keywords: pcl-cvs
! ;; Revision: $Id: pcvs-parse.el,v 1.14 2003/02/04 11:56:55 lektu Exp $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 202,208 ****
    "Table of message objects for `cvs-parse-process'."
    (let (c file dir path type base-rev subtype)
      (cvs-or
!      
       (cvs-parse-status)
       (cvs-parse-merge)
       (cvs-parse-commit)
--- 202,208 ----
    "Table of message objects for `cvs-parse-process'."
    (let (c file dir path type base-rev subtype)
      (cvs-or
! 
       (cvs-parse-status)
       (cvs-parse-merge)
       (cvs-parse-commit)
***************
*** 211,217 ****
       ;; such duplicate info and luckily the second info is the one we want.
       ;; (and (cvs-match "M \\(.*\\)$" (path 1))
       ;;      (cvs-parse-merge path))
!      
       ;; Normal file state indicator.
       (and
        (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2))
--- 211,217 ----
       ;; such duplicate info and luckily the second info is the one we want.
       ;; (and (cvs-match "M \\(.*\\)$" (path 1))
       ;;      (cvs-parse-merge path))
! 
       ;; Normal file state indicator.
       (and
        (cvs-match "\\([MARCUPNJ?]\\) \\(.*\\)$" (c 1) (path 2))
***************
*** 311,317 ****
                                 'MISSING
                               '(UP-TO-DATE . UPDATED))
                             path))
!      
         ;; Mode conflicts (rather than contents)
         (and
        (cvs-match "conflict: ")
--- 311,317 ----
                                 'MISSING
                               '(UP-TO-DATE . UPDATED))
                             path))
! 
         ;; Mode conflicts (rather than contents)
         (and
        (cvs-match "conflict: ")
***************
*** 333,339 ****
         (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$"
                    (file 1)))
        (cvs-parsed-fileinfo 'MESSAGE file))
!      
         ;; File unknown.
         (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 
1))
            (cvs-parsed-fileinfo 'UNKNOWN path))
--- 333,339 ----
         (cvs-match "sticky tag .* for file `\\(.*\\)' is not a branch$"
                    (file 1)))
        (cvs-parsed-fileinfo 'MESSAGE file))
! 
         ;; File unknown.
         (and (cvs-match "use `.+ add' to create an entry for \\(.*\\)$" (path 
1))
            (cvs-parsed-fileinfo 'UNKNOWN path))
***************
*** 351,357 ****
             'MESSAGE "" " "
             "*** Add (setq cvs-execute-single-dir t) to your .emacs ***
        See the FAQ file or the variable's documentation for more info."))
!        
         ;; Cvs waits for a lock.  Ignored: already handled by the process 
filter
         (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$")
         ;; File you removed still exists.  Ignore (will be noted as removed).
--- 351,357 ----
             'MESSAGE "" " "
             "*** Add (setq cvs-execute-single-dir t) to your .emacs ***
        See the FAQ file or the variable's documentation for more info."))
! 
         ;; Cvs waits for a lock.  Ignored: already handled by the process 
filter
         (cvs-match "\\[..:..:..\\] \\(waiting for\\|obtained\\) .*lock in .*$")
         ;; File you removed still exists.  Ignore (will be noted as removed).
***************
*** 368,374 ****
         (cvs-match "Rebuilding administrative file database$")
         ;; ???
         (cvs-match "--> Using per-directory sticky tag `.*'")
!      
         ;; CVS is running a *info program.
         (and
        (cvs-match "Executing.*$")
--- 368,374 ----
         (cvs-match "Rebuilding administrative file database$")
         ;; ???
         (cvs-match "--> Using per-directory sticky tag `.*'")
! 
         ;; CVS is running a *info program.
         (and
        (cvs-match "Executing.*$")
***************
*** 380,386 ****
       (and
        (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$")
        (cvs-parsed-fileinfo 'MESSAGE ""))
!      
       ;; sadly you can't do much with these since the path is in the repository
       (cvs-match "Directory .* added to the repository$")
       )))
--- 380,386 ----
       (and
        (cvs-match "cvs[.ex]* \\[[a-z]+ aborted\\]:.*$")
        (cvs-parsed-fileinfo 'MESSAGE ""))
! 
       ;; sadly you can't do much with these since the path is in the repository
       (cvs-match "Directory .* added to the repository$")
       )))
***************
*** 502,508 ****
        ;; 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
       (cvs-match "RCS file: .*\ndone$"))))
  
--- 502,508 ----
        ;; 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
       (cvs-match "RCS file: .*\ndone$"))))