1 ;;; cvs-status.el --- Major mode for browsing `cvs status' output
3 ;; Copyright (C) 1999, 2000 Free Software Foundation, Inc.
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
6 ;; Keywords: pcl-cvs cvs status tree
8 ;; Revision: $Id: cvs-status.el,v 1.8 2000/11/06 07:01:10 monnier Exp $
10 ;; This file is part of GNU Emacs.
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation; either version 2, or (at your option)
17 ;; GNU Emacs is distributed in the hope that it will be useful,
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 ;; GNU General Public License for more details.
22 ;; You should have received a copy of the GNU General Public License
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25 ;; Boston, MA 02111-1307, USA.
31 ;; - Somehow allow cvs-status-tree to work on-the-fly
35 (eval-when-compile (require 'cl
))
40 (defgroup cvs-status nil
41 "Major mode for browsing `cvs status' output."
43 :prefix
"cvs-status-")
45 (easy-mmode-defmap cvs-status-mode-map
48 ("N" . cvs-status-next
)
49 ("P" . cvs-status-prev
)
50 ("\M-n" . cvs-status-next
)
51 ("\M-p" . cvs-status-prev
)
52 ("t" . cvs-status-cvstrees
)
53 ("T" . cvs-status-trees
))
56 :inherit
'cvs-mode-map
)
58 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
59 ;; "Menu for `cvs-status-mode'."
61 ;; ["Show Tag Trees" cvs-status-tree t]
64 (defvar cvs-status-mode-hook nil
65 "Hook run at the end of `cvs-status-mode'.")
67 (defconst cvs-status-tags-leader-re
"^ Existing Tags:$")
68 (defconst cvs-status-entry-leader-re
69 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
70 (defconst cvs-status-dir-re
"^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
71 (defconst cvs-status-rev-re
"[0-9][.0-9]*\\.[.0-9]*[0-9]")
72 (defconst cvs-status-tag-re
"[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
74 (defconst cvs-status-font-lock-keywords
75 `((,cvs-status-entry-leader-re
76 (1 'cvs-filename-face
)
77 (2 'cvs-need-action-face
))
78 (,cvs-status-tags-leader-re
80 (save-excursion (re-search-forward "^\n" nil
'move
) (point))
81 (progn (re-search-backward cvs-status-tags-leader-re nil t
)
83 (0 font-lock-comment-face
))
85 (save-excursion (re-search-forward "^\n" nil
'move
) (point))
86 (progn (re-search-backward cvs-status-tags-leader-re nil t
)
88 (1 font-lock-function-name-face
)))))
89 (defconst cvs-status-font-lock-defaults
90 '(cvs-status-font-lock-keywords t nil nil nil
(font-lock-multiline . t
)))
93 (put 'cvs-status-mode
'mode-class
'special
)
95 (define-derived-mode cvs-status-mode fundamental-mode
"CVS-Status"
96 "Mode used for cvs status output."
97 (set (make-local-variable 'font-lock-defaults
) cvs-status-font-lock-defaults
)
98 (set (make-local-variable 'cvs-minor-wrap-function
) 'cvs-status-minor-wrap
))
100 ;; Define cvs-status-next and cvs-status-prev
101 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re
"entry")
103 (defun cvs-status-current-file ()
106 (or (re-search-backward cvs-status-entry-leader-re nil t
)
107 (re-search-forward cvs-status-entry-leader-re
))
108 (let* ((file (match-string 1))
109 (cvsdir (and (re-search-backward cvs-status-dir-re nil t
)
111 (pcldir (and (re-search-backward cvs-pcl-cvs-dirchange-re nil t
)
114 (let ((default-directory ""))
115 (when pcldir
(setq dir
(expand-file-name pcldir dir
)))
116 (when cvsdir
(setq dir
(expand-file-name cvsdir dir
)))
117 (expand-file-name file dir
)))))
119 (defun cvs-status-current-tag ()
122 (col (current-column))
123 (start (progn (re-search-backward cvs-status-tags-leader-re nil t
) (point)))
124 (end (progn (re-search-forward "^$" nil t
) (point))))
125 (when (and (< start pt
) (> end pt
))
128 (let ((tag nil
) (dist pt
) (end (point)))
130 (while (re-search-forward cvs-status-tag-re end t
)
131 (let* ((cole (current-column))
132 (colb (save-excursion
133 (goto-char (match-beginning 1)) (current-column)))
134 (ndist (min (abs (- cole col
)) (abs (- colb col
)))))
137 (setq tag
(match-string 1)))))
140 (defun cvs-status-minor-wrap (buf f
)
141 (let ((data (with-current-buffer buf
143 (cons (cvs-status-current-file)
144 (cvs-status-current-tag))
148 (cons (cvs-status-current-file)
149 (cvs-status-current-tag))))))))
150 (let ((cvs-branch-prefix (cdar data
))
151 (cvs-secondary-branch-prefix (and (cdar data
) (cddr data
)))
152 (cvs-minor-current-files
154 (when (and (cadr data
) (not (equal (caar data
) (cadr data
))))
155 (list (cadr data
)))))
156 ;; FIXME: I need to force because the fileinfos are UNKNOWN
157 (cvs-force-command "/F"))
161 ;; Tagelt, tag element
166 (:constructor cvs-tag-make
167 (vlist &optional name type
))
168 (:conc-name cvs-tag-
>))
173 (defsubst cvs-status-vl-to-str
(vl) (mapconcat 'number-to-string vl
"."))
175 (defun cvs-tag->string
(tag)
176 (if (stringp tag
) tag
177 (let ((name (cvs-tag->name tag
))
178 (vl (cvs-tag->vlist tag
)))
179 (if (null name
) (cvs-status-vl-to-str vl
)
180 (let ((rev (if vl
(concat " (" (cvs-status-vl-to-str vl
) ")") "")))
181 (if (consp name
) (mapcar (lambda (name) (concat name rev
)) name
)
182 (concat name rev
)))))))
184 (defun cvs-tag-compare-1 (vl1 vl2
)
186 ((and (null vl1
) (null vl2
)) 'equal
)
189 (t (let ((v1 (car vl1
))
194 (t (cvs-tag-compare-1 (cdr vl1
) (cdr vl2
))))))))
196 (defsubst cvs-tag-compare
(tag1 tag2
)
197 (cvs-tag-compare-1 (cvs-tag->vlist tag1
) (cvs-tag->vlist tag2
)))
199 (defun cvs-tag-merge (tag1 tag2
)
200 "Merge TAG1 and TAG2 into one."
201 (let ((type1 (cvs-tag->type tag1
))
202 (type2 (cvs-tag->type tag2
))
203 (name1 (cvs-tag->name tag1
))
204 (name2 (cvs-tag->name tag2
)))
205 (unless (equal (cvs-tag->vlist tag1
) (cvs-tag->vlist tag2
))
206 (setf (cvs-tag->vlist tag1
) nil
))
208 (unless (or (not type2
) (equal type1 type2
))
209 (setf (cvs-tag->type tag1
) nil
))
210 (setf (cvs-tag->type tag1
) type2
))
212 (setf (cvs-tag->name tag1
) (cvs-append name1 name2
))
213 (setf (cvs-tag->name tag1
) name2
))
216 (defun cvs-tree-print (tags printer column
)
217 "Print the tree of TAGS where each tag's string is given by PRINTER.
218 PRINTER should accept both a tag (in which case it should return a string)
219 or a string (in which case it should simply return its argument).
220 A tag cannot be a CONS. The return value can also be a list of strings,
221 if several nodes where merged into one.
222 The tree will be printed no closer than column COLUMN."
224 (let* ((eol (save-excursion (end-of-line) (current-column)))
225 (column (max (+ eol
2) column
)))
226 (if (null tags
) column
227 ;;(move-to-column-force column)
228 (let* ((rev (cvs-car tags
))
229 (name (funcall printer
(cvs-car rev
)))
230 (rest (append (cvs-cdr name
) (cvs-cdr tags
)))
233 (or (= (forward-line 1) 0) (insert "\n"))
234 (cvs-tree-print rest printer column
))))
235 (assert (>= prefix column
))
236 (move-to-column prefix t
)
238 (insert (cvs-car name
))
239 (dolist (br (cvs-cdr rev
))
240 (let* ((column (current-column))
241 (brrev (funcall printer
(cvs-car br
)))
242 (brlength (length (cvs-car brrev
)))
243 (brfill (concat (make-string (/ brlength
2) ?
) "|"))
247 (cvs-tree-print (cvs-append brrev brfill
(cvs-cdr br
))
248 printer
(current-column)))))
249 (delete-region (save-excursion (move-to-column prefix
) (point))
251 (insert " " (make-string (- prefix column
2) ?-
) " ")
255 (defun cvs-tree-merge (tree1 tree2
)
256 "Merge tags trees TREE1 and TREE2 into one.
257 BEWARE: because of stability issues, this is not a symetric operation."
258 (assert (and (listp tree1
) (listp tree2
)))
263 (let* ((rev1 (car tree1
))
264 (tag1 (cvs-car rev1
))
265 (vl1 (cvs-tag->vlist tag1
))
268 (tag2 (cvs-car rev2
))
269 (vl2 (cvs-tag->vlist tag2
))
273 (case (cvs-tag-compare tag1 tag2
)
274 (more1 (list* rev2
(cvs-tree-merge tree1
(cdr tree2
))))
275 (more2 (list* rev1
(cvs-tree-merge (cdr tree1
) tree2
)))
277 (cons (cons (cvs-tag-merge tag1 tag2
)
278 (cvs-tree-merge (cvs-cdr rev1
) (cvs-cdr rev2
)))
279 (cvs-tree-merge (cdr tree1
) (cdr tree2
))))))
282 (list (cons (cvs-tag-make (cvs-butlast vl1
)) tree1
)) tree2
))
285 tree1
(list (cons (cvs-tag-make (cvs-butlast vl2
)) tree2
)))))))))
287 (defun cvs-tag-make-tag (tag)
288 (let ((vl (mapcar 'string-to-number
(split-string (nth 2 tag
) "\\."))))
289 (cvs-tag-make vl
(nth 0 tag
) (intern (nth 1 tag
)))))
291 (defun cvs-tags->tree
(tags)
292 "Make a tree out of a list of TAGS."
296 (let ((tag (cvs-tag-make-tag tag
)))
297 (list (if (not (eq (cvs-tag->type tag
) 'branch
)) tag
298 (list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag
)))
304 (push (cvs-tree-merge (pop tags
) (pop tags
)) tl
))
305 (setq tags
(nreverse tl
))))
308 (defun cvs-status-get-tags ()
309 "Look for a list of tags, read them in and delete them.
310 Returns NIL if there was an empty list of tags and T if there wasn't
311 even a list. Else, return the list of tags where each element of
312 the list is a three-string list TAG, KIND, REV."
314 (if (not (re-search-forward cvs-status-tags-leader-re nil t
)) t
318 (case-fold-search t
))
320 (looking-at "\\s-+no\\s-+tags")
322 (progn ; normal listing
323 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
324 (push (list (match-string 1) (match-string 2) (match-string 3)) tags
)
326 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
329 (progn ; cvstree-style listing
330 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
332 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
333 (setq lastrev
(or (match-string 2) lastrev
))
334 (push (list (match-string 3)
335 (if (equal (match-string 1) " ") "branch" "revision")
338 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
339 (setq tags
(nreverse tags
)))
341 (progn ; new tree style listing
342 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
343 (re3 (concat re-lead
"\\(\\.\\)?\\(" cvs-status-rev-re
"\\)"))
344 (re2 (concat re-lead cvs-status-tag-re
"\\(\\)"))
345 (re1 (concat re-lead cvs-status-tag-re
346 " (\\(" cvs-status-rev-re
"\\))")))
347 (while (or (looking-at re1
) (looking-at re2
) (looking-at re3
))
348 (push (list (match-string 3)
349 (if (match-string 1) "branch" "revision")
350 (match-string 4)) tags
)
351 (goto-char (match-end 0))
352 (when (eolp) (forward-char 1))))
353 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
354 (setq tags
(nreverse tags
))))
356 (delete-region pt
(point)))
359 (defvar font-lock-mode
)
360 (defun cvs-refontify (beg end
)
361 (when (and (boundp 'font-lock-mode
)
363 (fboundp 'font-lock-fontify-region
))
364 (font-lock-fontify-region (1- beg
) (1+ end
))))
366 (defun cvs-status-trees ()
367 "Look for a lists of tags, and replace them with trees."
370 (goto-char (point-min))
371 (let ((inhibit-read-only t
)
373 (while (listp (setq tags
(cvs-status-get-tags)))
374 ;;(let ((pt (save-excursion (forward-line -1) (point))))
376 (narrow-to-region (point) (point))
378 (combine-after-change-calls
379 (cvs-tree-print (cvs-tags->tree tags
) 'cvs-tag-
>string
3)))
380 ;;(cvs-refontify pt (point))
386 ;;;; CVSTree-style trees
389 (defvar cvs-tree-use-jisx0208
390 nil
;; (and (char-display-font 'japanese-jisx0208) t)
391 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
392 Otherwise, default to ASCII chars like +, - and |.")
394 (defconst cvs-tree-char-space
395 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
33 33) " "))
396 (defconst cvs-tree-char-hbar
397 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
40 44) "--"))
398 (defconst cvs-tree-char-vbar
399 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
40 45) "| "))
400 (defconst cvs-tree-char-branch
401 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
40 50) "+-"))
402 (defconst cvs-tree-char-eob
;end of branch
403 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
40 49) "`-"))
404 (defconst cvs-tree-char-bob
;beginning of branch
405 (if cvs-tree-use-jisx0208
(make-char 'japanese-jisx0208
40 51) "+-"))
407 (defun cvs-tag-lessp (tag1 tag2
)
408 (eq (cvs-tag-compare tag1 tag2
) 'more2
))
410 (defvar cvs-tree-nomerge nil
)
412 (defun cvs-status-cvstrees (&optional arg
)
413 "Look for a list of tags, and replace it with a tree.
414 Optional prefix ARG chooses between two representations."
416 (when (and cvs-tree-use-jisx0208
417 (not enable-multibyte-characters
))
418 ;; We need to convert the buffer from unibyte to multibyte
419 ;; since we'll use multibyte chars for the tree.
420 (let ((modified (buffer-modified-p))
421 (inhibit-read-only t
)
422 (inhibit-modification-hooks t
))
425 (decode-coding-region (point-min) (point-max) 'undecided
)
426 (set-buffer-multibyte t
))
427 (restore-buffer-modified-p modified
))))
429 (goto-char (point-min))
430 (let ((inhibit-read-only t
)
432 (cvs-tree-nomerge (if arg
(not cvs-tree-nomerge
) cvs-tree-nomerge
)))
433 (while (listp (setq tags
(cvs-status-get-tags)))
434 (let ((tags (mapcar 'cvs-tag-make-tag tags
))
435 ;;(pt (save-excursion (forward-line -1) (point)))
437 (setq tags
(sort tags
'cvs-tag-lessp
))
438 (let* ((first (car tags
))
439 (prev (if (cvs-tag-p first
)
440 (list (car (cvs-tag->vlist first
))) nil
)))
441 (combine-after-change-calls
442 (cvs-tree-tags-insert tags prev
))
443 ;;(cvs-refontify pt (point))
447 (defun cvs-tree-tags-insert (tags prev
)
449 (let* ((tag (car tags
))
450 (vlist (cvs-tag->vlist tag
))
452 (let* ((next (cvs-car (cadr tags
)))
453 (nprev (if (and cvs-tree-nomerge next
454 (equal vlist
(cvs-tag->vlist next
)))
456 (cvs-map (lambda (v p
) v
) nprev prev
)))
457 (after (save-excursion
459 (cvs-tree-tags-insert (cdr tags
) nprev
)))
461 (nas nil
)) ;"next afters" to be returned
463 (do* ((vs vlist
(cdr vs
))
466 ((and (null as
) (null vs
) (null ps
))
467 (let ((revname (cvs-status-vl-to-str vlist
)))
468 (if (cvs-every 'identity
(cvs-map 'equal prev vlist
))
469 (insert (make-string (+ 4 (length revname
)) ?
)
470 (or (cvs-tag->name tag
) ""))
471 (insert " " revname
": " (or (cvs-tag->name tag
) "")))))
472 (let* ((eq (and pe
(equal (car ps
) (car vs
))))
473 (next-eq (equal (cadr ps
) (cadr vs
))))
477 (if next-eq
(cons t cvs-tree-char-vbar
)
478 (cons t cvs-tree-char-branch
))
479 (cons nil cvs-tree-char-bob
))
481 (if next-eq
(cons nil cvs-tree-char-space
)
482 (cons t cvs-tree-char-eob
))
483 (cons nil
(if (and (eq (cvs-tag->type tag
) 'branch
)
484 (cvs-every 'null as
))
486 cvs-tree-char-hbar
))))))
487 (insert (cdr na
+char
))
488 (push (car na
+char
) nas
))
493 ;;;; Merged trees from different files
496 (defun cvs-tree-fuzzy-merge-1 (trees tree prev
)
499 (defun cvs-tree-fuzzy-merge (trees tree
)
500 "Do the impossible: merge TREE into TREES."
504 "Get tags from the status output and merge tham all into a big tree."
506 (goto-char (point-min))
507 (let ((inhibit-read-only t
)
508 (trees (make-vector 31 0)) tree
)
509 (while (listp (setq tree
(cvs-tags->tree
(cvs-status-get-tags))))
510 (cvs-tree-fuzzy-merge trees tree
))
512 (let ((cvs-tag-print-rev nil
))
513 (cvs-tree-print tree
'cvs-tag-
>string
3)))))
516 (provide 'cvs-status
)
519 ;; $Log: cvs-status.el,v $
520 ;; Revision 1.8 2000/11/06 07:01:10 monnier
521 ;; (cvs-tree-merge): Use cvs-butlast (avoid CL).
522 ;; (cvs-status-get-tags): Fix regexp.
523 ;; (cvs-status-trees, cvs-status-cvstrees):
524 ;; Combine after change hooks and don't sit-for.
525 ;; (cvs-tree-use-jisx0208): Renamed from cvs-tree-dstr-2byte-ready.
526 ;; (cvs-tree-char-*): Renamed from cvs-tree-dstr-char-*.
527 ;; Use make-char rather than hard-coded cryptic data.
528 ;; (cvs-status-cvstrees): Convert the buffer to multibyte if necessary.
530 ;; Revision 1.7 2000/09/29 02:19:10 monnier
531 ;; (cvs-status-entry-leader-re): Minor fix.
533 ;; Revision 1.6 2000/08/16 20:46:32 monnier
534 ;; *** empty log message ***
536 ;; Revision 1.5 2000/08/06 09:18:02 gerd
537 ;; Use `nth' instead of `first', `second', and `third'.
539 ;; Revision 1.4 2000/05/10 22:08:28 monnier
540 ;; (cvs-status-minor-wrap): Use mark-active.
542 ;; Revision 1.3 2000/03/22 01:08:08 monnier
543 ;; (cvs-status-mode): Use define-derived-mode.
545 ;; Revision 1.2 2000/03/22 01:01:36 monnier
546 ;; (cvs-status-(prev|next)): Rename from
547 ;; cvs-status-(prev|next)-entry and use easy-mmode-define-navigation.
548 ;; (cvs-tree-dstr-*): Rename from cvstree-dstr-* and use two ascii chars
549 ;; to let the output "breathe" a little more (more readable).
552 ;;; cvs-status.el ends here