[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el |
Date: |
Fri, 04 Jul 2003 19:30:29 -0400 |
Index: emacs/lisp/pcvs-parse.el
diff -c emacs/lisp/pcvs-parse.el:1.18 emacs/lisp/pcvs-parse.el:1.19
*** emacs/lisp/pcvs-parse.el:1.18 Wed May 14 11:00:31 2003
--- emacs/lisp/pcvs-parse.el Fri Jul 4 19:30:29 2003
***************
*** 457,468 ****
(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 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 "$")
(cvs-or
(cvs-match " *Version:[ \t]*\\([0-9.]+\\).*$" (base-rev 1))
--- 457,468 ----
(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 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 ".*$" (type 'UNKNOWN)))
(cvs-match "$")
(cvs-or
(cvs-match " *Version:[ \t]*\\([0-9.]+\\).*$" (base-rev 1))
***************
*** 475,486 ****
(cvs-match " *Repository revision:[ \t]*\\([0-9.]+\\)[ \t]*\\(.*\\)$"
(head-rev 1))
(cvs-match " *Repository revision:.*"))
(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
t)
(cvs-match "$")
;; ignore the tags-listing in the case of `status -v'
(cvs-or (cvs-match " *Existing Tags:\n\\(\t.*\n\\)*$") t)
--- 475,489 ----
(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.
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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el,
Stefan Monnier <=