-;;; pcvs-info.el --- Internal representation of a fileinfo entry
+;;; pcvs-info.el --- internal representation of a fileinfo entry
-;; Copyright (C) 1991-2000 Free Software Foundation, Inc.
+;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
;; Author: Stefan Monnier <monnier@cs.yale.edu>
;; Keywords: pcl-cvs
-;; Version: $Name: $
-;; Revision: $Id: pcl-cvs-info.el,v 1.28 2000/03/05 21:32:21 monnier Exp $
+;; Revision: $Id: pcvs-info.el,v 1.7 2001/07/16 07:46:48 pj Exp $
;; This file is part of GNU Emacs.
:group 'pcl-cvs
:type '(boolean))
-
;;;;
;;;; Faces for fontification
;;;;
(defface cvs-header-face
'((((class color) (background dark))
- (:foreground "lightyellow" :bold t))
+ (:foreground "lightyellow" :weight bold))
(((class color) (background light))
- (:foreground "blue4" :bold t))
- (t (:bold t)))
+ (:foreground "blue4" :weight bold))
+ (t (:weight bold)))
"PCL-CVS face used to highlight directory changes."
:group 'pcl-cvs)
(:foreground "red"))
(((class color) (background light))
(:foreground "red"))
- (t (:italic t)))
+ (t (:slant italic)))
"PCL-CVS face used to highlight unknown file status."
:group 'pcl-cvs)
(:foreground "orange"))
(((class color) (background light))
(:foreground "orange"))
- (t (:italic t)))
+ (t (:slant italic)))
"PCL-CVS face used to highlight status of files needing action."
:group 'pcl-cvs)
(defface cvs-marked-face
'((((class color) (background dark))
- (:foreground "green" :bold t))
+ (:foreground "green" :weight bold))
(((class color) (background light))
- (:foreground "green3" :bold t))
- (t (:bold t)))
+ (:foreground "green3" :weight bold))
+ (t (:weight bold)))
"PCL-CVS face used to highlight marked file indicator."
:group 'pcl-cvs)
(defface cvs-msg-face
- '((t (:italic t)))
+ '((t (:slant italic)))
"PCL-CVS face used to highlight CVS messages."
:group 'pcl-cvs)
+(defvar cvs-fi-up-to-date-face 'cvs-handled-face)
+(defvar cvs-fi-unknown-face 'cvs-unknown-face)
+(defvar cvs-fi-conflict-face 'font-lock-warning-face)
;; There is normally no need to alter the following variable, but if
;; your site has installed CVS in a non-standard way you might have
(defvar cvs-bakprefix ".#"
"The prefix that CVS prepends to files when rcsmerge'ing.")
-(easy-mmode-defmap cvs-filename-map
- '(([(mouse-2)] . cvs-mode-find-file))
- "Local keymap for text properties of file names"
- :inherit 'cvs-mode-map)
-
(easy-mmode-defmap cvs-status-map
'(([(mouse-2)] . cvs-mouse-toggle-mark))
- "Local keymap for text properties of status"
- :inherit 'cvs-mode-map)
-
-(easy-mmode-defmap cvs-dirname-map
- '(([(mouse-2)] . cvs-mode-find-file))
- "Local keymap for text properties of directory names"
- :inherit 'cvs-mode-map)
+ "Local keymap for text properties of status")
;; Constructor:
;; to display a text that should be in
;; full-log."
;; TEMP A temporary message that should be removed
- ;; HEADER A message that should stick at the top of the display
- ;; FOOTER A message that should stick at the bottom of the display
)
(defun cvs-create-fileinfo (type dir file msg &rest keys)
(cvs-check-fileinfo (apply #'-cvs-create-fileinfo type dir file msg keys)))
(if (string= dir "") "." (directory-file-name dir))
;; Here, I use `concat' rather than `expand-file-name' because I want
;; the resulting path to stay relative if `dir' is relative.
- ;; I could also use `expand-file-name' with `default-directory = ""'
(concat dir (cvs-fileinfo->file fileinfo)))))
(defun cvs-fileinfo->pp-name (fi)
;;;; Utility functions
;;;;
-;;----------
(defun cvs-applicable-p (fi-or-type func)
"Check if FUNC is applicable to FI-OR-TYPE.
If FUNC is nil, always return t.
(and (not (eq type 'MESSAGE))
(eq (car (memq func (cdr (assq type cvs-states)))) func))))
-;; (defun cvs-default-action (fileinfo)
-;; "Return some kind of \"default\" action to be performed."
-;; (second (assq (cvs-fileinfo->type fileinfo) cvs-states)))
-
-;; fileinfo pretty-printers:
-
(defun cvs-add-face (str face &optional keymap)
(when cvs-highlight
(add-text-properties 0 (length str)
(list* 'face face
(when keymap
- (list 'mouse-face 'highlight
- 'local-map keymap)))
+ (list* 'mouse-face 'highlight
+ (when (keymapp keymap)
+ (list 'keymap keymap)))))
str))
str)
-;;----------
(defun cvs-fileinfo-pp (fileinfo)
"Pretty print FILEINFO. Insert a printed representation in current buffer.
For use by the cookie package."
(case type
(DIRCHANGE (concat "In directory "
(cvs-add-face (cvs-fileinfo->full-path fileinfo)
- 'cvs-header-face cvs-dirname-map)
+ 'cvs-header-face t)
":"))
(MESSAGE
- (if (memq (cvs-fileinfo->subtype fileinfo) '(FOOTER HEADER))
- (cvs-fileinfo->full-log fileinfo)
- (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
- 'cvs-msg-face)))
+ (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo))
+ 'cvs-msg-face))
(t
(let* ((status (if (cvs-fileinfo->marked fileinfo)
(cvs-add-face "*" 'cvs-marked-face)
" "))
(file (cvs-add-face (cvs-fileinfo->pp-name fileinfo)
- 'cvs-filename-face cvs-filename-map))
+ 'cvs-filename-face t))
(base (or (cvs-fileinfo->base-rev fileinfo) ""))
(head (cvs-fileinfo->head-rev fileinfo))
(type
;;(MOD-CONFLICT "Not Removed")
(DEAD "")
(t (capitalize (symbol-name type)))))
- (face (case type
- (UP-TO-DATE 'cvs-handled-face)
- (UNKNOWN 'cvs-unknown-face)
- (t 'cvs-need-action-face))))
+ (face (let ((sym (intern
+ (concat "cvs-fi-"
+ (downcase (symbol-name type))
+ "-face"))))
+ (or (and (boundp sym) (symbol-value sym))
+ 'cvs-need-action-face))))
(cvs-add-face str face cvs-status-map)))
(side (or
;; maybe a subtype
;; or the head-rev
(when (and head (not (string= head base))) head)
;; or nothing
- ""))
- ;; (action (cvs-add-face (case (cvs-default-action fileinfo)
- ;; (commit "com")
- ;; (update "upd")
- ;; (undo "udo")
- ;; (t " "))
- ;; 'cvs-action-face
- ;; cvs-action-map))
- )
- (concat (cvs-string-fill side 11) " "
- status " "
- (cvs-string-fill type 11) " "
- ;; action " "
- (cvs-string-fill base 11) " "
- file)))))))
-;; it seems that `format' removes text-properties. Too bad!
-;; (format "%-11s %s %-11s %-11s %s"
-;; side status type base file)))))))
+ "")))
+ (format "%-11s %s %-11s %-11s %s"
+ side status type base file)))))))
(defun cvs-fileinfo-update (fi fi-new)
((memq type '(UP-TO-DATE NEED-UPDATE))
(setf (cvs-fileinfo->merge fi) nil)))))
-;;----------
(defun cvs-fileinfo< (a b)
"Compare fileinfo A with fileinfo B and return t if A is `less'.
The ordering defined by this function is such that directories are
(let ((subtypea (cvs-fileinfo->subtype a))
(subtypeb (cvs-fileinfo->subtype b)))
(cond
- ;; keep header and footer where they belong. Note: the order is important
- ((eq subtypeb 'HEADER) nil)
- ((eq subtypea 'HEADER) t)
- ((eq subtypea 'FOOTER) nil)
- ((eq subtypeb 'FOOTER) t)
-
;; Sort according to directories.
((string< (cvs-fileinfo->dir a) (cvs-fileinfo->dir b)) t)
((not (string= (cvs-fileinfo->dir a) (cvs-fileinfo->dir b))) nil)
;; All files are sorted by file name.
((string< (cvs-fileinfo->file a) (cvs-fileinfo->file b))))))
+;;;
+;;; Look at CVS/Entries to quickly find a first approximation of the status
+;;;
+
+(defun cvs-fileinfo-from-entries (dir &optional all)
+ "List of fileinfos for DIR, extracted from CVS/Entries.
+Unless ALL is optional, returns only the files that are not up-to-date.
+DIR can also be a file."
+ (let* ((singlefile
+ (cond
+ ((equal dir "") nil)
+ ((file-directory-p dir) (setq dir (file-name-as-directory dir)) nil)
+ (t (prog1 (file-name-nondirectory dir)
+ (setq dir (or (file-name-directory dir) ""))))))
+ (file (expand-file-name "CVS/Entries" dir))
+ (fis nil))
+ (if (not (file-readable-p file))
+ (push (cvs-create-fileinfo (if singlefile 'UNKNOWN 'DIRCHANGE)
+ dir (or singlefile ".") "") fis)
+ (with-temp-buffer
+ (insert-file-contents file)
+ (goto-char (point-min))
+ ;; Select the single file entry in case we're only interested in a file.
+ (cond
+ ((not singlefile)
+ (push (cvs-create-fileinfo 'DIRCHANGE dir "." "") fis))
+ ((re-search-forward
+ (concat "^[^/]*/" (regexp-quote singlefile) "/.*") nil t)
+ (setq all t)
+ (goto-char (match-beginning 0))
+ (narrow-to-region (point) (match-end 0)))
+ (t
+ (push (cvs-create-fileinfo 'UNKNOWN dir singlefile "") fis)
+ (narrow-to-region (point-min) (point-min))))
+ (while (looking-at "\\([^/]*\\)/\\([^/]*\\)/\\([^/]*\\)/\\([^/]*\\)/")
+ (if (/= (match-beginning 1) (match-end 1))
+ (setq fis (append (cvs-fileinfo-from-entries
+ (concat dir (file-name-as-directory
+ (match-string 2)))
+ all)
+ fis))
+ (let ((f (match-string 2))
+ (rev (match-string 3))
+ (date (match-string 4))
+ timestamp
+ (type 'MODIFIED)
+ (subtype nil))
+ (cond
+ ((equal (substring rev 0 1) "-")
+ (setq type 'REMOVED rev (substring rev 1)))
+ ((not (file-exists-p (concat dir f))) (setq type 'MISSING))
+ ((equal rev "0") (setq type 'ADDED rev nil))
+ ((equal date "Result of merge") (setq subtype 'MERGED))
+ ((let ((mtime (nth 5 (file-attributes (concat dir f))))
+ (system-time-locale "C"))
+ (equal (setq timestamp (format-time-string "%c" mtime 'utc))
+ date))
+ (setq type (if all 'UP-TO-DATE)))
+ ((equal date (concat "Result of merge+" timestamp))
+ (setq type 'CONFLICT)))
+ (when type
+ (push (cvs-create-fileinfo type dir f ""
+ :base-rev rev :subtype subtype)
+ fis))))
+ (forward-line 1))))
+ fis))
+
(provide 'pcvs-info)
-;;; pcl-cvs-info.el ends here
+;;; pcvs-info.el ends here
HCoop / bpt / emacs.git / blobdiff