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
7 ;; Revision: $Id: cvs-status.el,v 1.9 2000/12/06 19:50:12 fx Exp $
9 ;; This file is part of GNU Emacs.
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation; either version 2, or (at your option)
16 ;; GNU Emacs is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
24 ;; Boston, MA 02111-1307, USA.
30 ;; - Somehow allow cvs-status-tree to work on-the-fly
34 (eval-when-compile (require 'cl))
39 (defgroup cvs-status nil
40 "Major mode for browsing `cvs status' output."
42 :prefix "cvs-status-")
44 (easy-mmode-defmap cvs-status-mode-map
47 ("N" . cvs-status-next)
48 ("P" . cvs-status-prev)
49 ("\M-n" . cvs-status-next)
50 ("\M-p" . cvs-status-prev)
51 ("t" . cvs-status-cvstrees)
52 ("T" . cvs-status-trees))
55 :inherit 'cvs-mode-map)
57 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
58 ;; "Menu for `cvs-status-mode'."
60 ;; ["Show Tag Trees" cvs-status-tree t]
63 (defvar cvs-status-mode-hook nil
64 "Hook run at the end of `cvs-status-mode'.")
66 (defconst cvs-status-tags-leader-re "^ Existing Tags:$")
67 (defconst cvs-status-entry-leader-re
68 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
69 (defconst cvs-status-dir-re "^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
70 (defconst cvs-status-rev-re "[0-9][.0-9]*\\.[.0-9]*[0-9]")
71 (defconst cvs-status-tag-re "[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
73 (defconst cvs-status-font-lock-keywords
74 `((,cvs-status-entry-leader-re
75 (1 'cvs-filename-face)
76 (2 'cvs-need-action-face))
77 (,cvs-status-tags-leader-re
79 (save-excursion (re-search-forward "^\n" nil 'move) (point))
80 (progn (re-search-backward cvs-status-tags-leader-re nil t)
82 (0 font-lock-comment-face))
84 (save-excursion (re-search-forward "^\n" nil 'move) (point))
85 (progn (re-search-backward cvs-status-tags-leader-re nil t)
87 (1 font-lock-function-name-face)))))
88 (defconst cvs-status-font-lock-defaults
89 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
92 (put 'cvs-status-mode 'mode-class 'special)
94 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
95 "Mode used for cvs status output."
96 (set (make-local-variable 'font-lock-defaults) cvs-status-font-lock-defaults)
97 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-status-minor-wrap))
99 ;; Define cvs-status-next and cvs-status-prev
100 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re "entry")
102 (defun cvs-status-current-file ()
105 (or (re-search-backward cvs-status-entry-leader-re nil t)
106 (re-search-forward cvs-status-entry-leader-re))
107 (let* ((file (match-string 1))
108 (cvsdir (and (re-search-backward cvs-status-dir-re nil t)
110 (pcldir (and (re-search-backward cvs-pcl-cvs-dirchange-re nil t)
113 (let ((default-directory ""))
114 (when pcldir (setq dir (expand-file-name pcldir dir)))
115 (when cvsdir (setq dir (expand-file-name cvsdir dir)))
116 (expand-file-name file dir)))))
118 (defun cvs-status-current-tag ()
121 (col (current-column))
122 (start (progn (re-search-backward cvs-status-tags-leader-re nil t) (point)))
123 (end (progn (re-search-forward "^$" nil t) (point))))
124 (when (and (< start pt) (> end pt))
127 (let ((tag nil) (dist pt) (end (point)))
129 (while (re-search-forward cvs-status-tag-re end t)
130 (let* ((cole (current-column))
131 (colb (save-excursion
132 (goto-char (match-beginning 1)) (current-column)))
133 (ndist (min (abs (- cole col)) (abs (- colb col)))))
136 (setq tag (match-string 1)))))
139 (defun cvs-status-minor-wrap (buf f)
140 (let ((data (with-current-buffer buf
142 (cons (cvs-status-current-file)
143 (cvs-status-current-tag))
147 (cons (cvs-status-current-file)
148 (cvs-status-current-tag))))))))
149 (let ((cvs-branch-prefix (cdar data))
150 (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
151 (cvs-minor-current-files
153 (when (and (cadr data) (not (equal (caar data) (cadr data))))
154 (list (cadr data)))))
155 ;; FIXME: I need to force because the fileinfos are UNKNOWN
156 (cvs-force-command "/F"))
160 ;; Tagelt, tag element
165 (:constructor cvs-tag-make
166 (vlist &optional name type))
167 (:conc-name cvs-tag->))
172 (defsubst cvs-status-vl-to-str (vl) (mapconcat 'number-to-string vl "."))
174 (defun cvs-tag->string (tag)
175 (if (stringp tag) tag
176 (let ((name (cvs-tag->name tag))
177 (vl (cvs-tag->vlist tag)))
178 (if (null name) (cvs-status-vl-to-str vl)
179 (let ((rev (if vl (concat " (" (cvs-status-vl-to-str vl) ")") "")))
180 (if (consp name) (mapcar (lambda (name) (concat name rev)) name)
181 (concat name rev)))))))
183 (defun cvs-tag-compare-1 (vl1 vl2)
185 ((and (null vl1) (null vl2)) 'equal)
188 (t (let ((v1 (car vl1))
193 (t (cvs-tag-compare-1 (cdr vl1) (cdr vl2))))))))
195 (defsubst cvs-tag-compare (tag1 tag2)
196 (cvs-tag-compare-1 (cvs-tag->vlist tag1) (cvs-tag->vlist tag2)))
198 (defun cvs-tag-merge (tag1 tag2)
199 "Merge TAG1 and TAG2 into one."
200 (let ((type1 (cvs-tag->type tag1))
201 (type2 (cvs-tag->type tag2))
202 (name1 (cvs-tag->name tag1))
203 (name2 (cvs-tag->name tag2)))
204 (unless (equal (cvs-tag->vlist tag1) (cvs-tag->vlist tag2))
205 (setf (cvs-tag->vlist tag1) nil))
207 (unless (or (not type2) (equal type1 type2))
208 (setf (cvs-tag->type tag1) nil))
209 (setf (cvs-tag->type tag1) type2))
211 (setf (cvs-tag->name tag1) (cvs-append name1 name2))
212 (setf (cvs-tag->name tag1) name2))
215 (defun cvs-tree-print (tags printer column)
216 "Print the tree of TAGS where each tag's string is given by PRINTER.
217 PRINTER should accept both a tag (in which case it should return a string)
218 or a string (in which case it should simply return its argument).
219 A tag cannot be a CONS. The return value can also be a list of strings,
220 if several nodes where merged into one.
221 The tree will be printed no closer than column COLUMN."
223 (let* ((eol (save-excursion (end-of-line) (current-column)))
224 (column (max (+ eol 2) column)))
225 (if (null tags) column
226 ;;(move-to-column-force column)
227 (let* ((rev (cvs-car tags))
228 (name (funcall printer (cvs-car rev)))
229 (rest (append (cvs-cdr name) (cvs-cdr tags)))
232 (or (= (forward-line 1) 0) (insert "\n"))
233 (cvs-tree-print rest printer column))))
234 (assert (>= prefix column))
235 (move-to-column prefix t)
237 (insert (cvs-car name))
238 (dolist (br (cvs-cdr rev))
239 (let* ((column (current-column))
240 (brrev (funcall printer (cvs-car br)))
241 (brlength (length (cvs-car brrev)))
242 (brfill (concat (make-string (/ brlength 2) ? ) "|"))
246 (cvs-tree-print (cvs-append brrev brfill (cvs-cdr br))
247 printer (current-column)))))
248 (delete-region (save-excursion (move-to-column prefix) (point))
250 (insert " " (make-string (- prefix column 2) ?-) " ")
254 (defun cvs-tree-merge (tree1 tree2)
255 "Merge tags trees TREE1 and TREE2 into one.
256 BEWARE: because of stability issues, this is not a symetric operation."
257 (assert (and (listp tree1) (listp tree2)))
262 (let* ((rev1 (car tree1))
263 (tag1 (cvs-car rev1))
264 (vl1 (cvs-tag->vlist tag1))
267 (tag2 (cvs-car rev2))
268 (vl2 (cvs-tag->vlist tag2))
272 (case (cvs-tag-compare tag1 tag2)
273 (more1 (list* rev2 (cvs-tree-merge tree1 (cdr tree2))))
274 (more2 (list* rev1 (cvs-tree-merge (cdr tree1) tree2)))
276 (cons (cons (cvs-tag-merge tag1 tag2)
277 (cvs-tree-merge (cvs-cdr rev1) (cvs-cdr rev2)))
278 (cvs-tree-merge (cdr tree1) (cdr tree2))))))
281 (list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2))
284 tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2)))))))))
286 (defun cvs-tag-make-tag (tag)
287 (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
288 (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag)))))
290 (defun cvs-tags->tree (tags)
291 "Make a tree out of a list of TAGS."
295 (let ((tag (cvs-tag-make-tag tag)))
296 (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
297 (list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag)))
303 (push (cvs-tree-merge (pop tags) (pop tags)) tl))
304 (setq tags (nreverse tl))))
307 (defun cvs-status-get-tags ()
308 "Look for a list of tags, read them in and delete them.
309 Returns NIL if there was an empty list of tags and T if there wasn't
310 even a list. Else, return the list of tags where each element of
311 the list is a three-string list TAG, KIND, REV."
313 (if (not (re-search-forward cvs-status-tags-leader-re nil t)) t
317 (case-fold-search t))
319 (looking-at "\\s-+no\\s-+tags")
321 (progn ; normal listing
322 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
323 (push (list (match-string 1) (match-string 2) (match-string 3)) tags)
325 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
328 (progn ; cvstree-style listing
329 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
331 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
332 (setq lastrev (or (match-string 2) lastrev))
333 (push (list (match-string 3)
334 (if (equal (match-string 1) " ") "branch" "revision")
337 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
338 (setq tags (nreverse tags)))
340 (progn ; new tree style listing
341 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
342 (re3 (concat re-lead "\\(\\.\\)?\\(" cvs-status-rev-re "\\)"))
343 (re2 (concat re-lead cvs-status-tag-re "\\(\\)"))
344 (re1 (concat re-lead cvs-status-tag-re
345 " (\\(" cvs-status-rev-re "\\))")))
346 (while (or (looking-at re1) (looking-at re2) (looking-at re3))
347 (push (list (match-string 3)
348 (if (match-string 1) "branch" "revision")
349 (match-string 4)) tags)
350 (goto-char (match-end 0))
351 (when (eolp) (forward-char 1))))
352 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
353 (setq tags (nreverse tags))))
355 (delete-region pt (point)))
358 (defvar font-lock-mode)
359 (defun cvs-refontify (beg end)
360 (when (and (boundp 'font-lock-mode)
362 (fboundp 'font-lock-fontify-region))
363 (font-lock-fontify-region (1- beg) (1+ end))))
365 (defun cvs-status-trees ()
366 "Look for a lists of tags, and replace them with trees."
369 (goto-char (point-min))
370 (let ((inhibit-read-only t)
372 (while (listp (setq tags (cvs-status-get-tags)))
373 ;;(let ((pt (save-excursion (forward-line -1) (point))))
375 (narrow-to-region (point) (point))
377 (combine-after-change-calls
378 (cvs-tree-print (cvs-tags->tree tags) 'cvs-tag->string 3)))
379 ;;(cvs-refontify pt (point))
385 ;;;; CVSTree-style trees
388 (defvar cvs-tree-use-jisx0208
389 nil ;; (and (char-display-font 'japanese-jisx0208) t)
390 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
391 Otherwise, default to ASCII chars like +, - and |.")
393 (defconst cvs-tree-char-space
394 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 33 33) " "))
395 (defconst cvs-tree-char-hbar
396 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 44) "--"))
397 (defconst cvs-tree-char-vbar
398 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 45) "| "))
399 (defconst cvs-tree-char-branch
400 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 50) "+-"))
401 (defconst cvs-tree-char-eob ;end of branch
402 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 49) "`-"))
403 (defconst cvs-tree-char-bob ;beginning of branch
404 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 51) "+-"))
406 (defun cvs-tag-lessp (tag1 tag2)
407 (eq (cvs-tag-compare tag1 tag2) 'more2))
409 (defvar cvs-tree-nomerge nil)
411 (defun cvs-status-cvstrees (&optional arg)
412 "Look for a list of tags, and replace it with a tree.
413 Optional prefix ARG chooses between two representations."
415 (when (and cvs-tree-use-jisx0208
416 (not enable-multibyte-characters))
417 ;; We need to convert the buffer from unibyte to multibyte
418 ;; since we'll use multibyte chars for the tree.
419 (let ((modified (buffer-modified-p))
420 (inhibit-read-only t)
421 (inhibit-modification-hooks t))
424 (decode-coding-region (point-min) (point-max) 'undecided)
425 (set-buffer-multibyte t))
426 (restore-buffer-modified-p modified))))
428 (goto-char (point-min))
429 (let ((inhibit-read-only t)
431 (cvs-tree-nomerge (if arg (not cvs-tree-nomerge) cvs-tree-nomerge)))
432 (while (listp (setq tags (cvs-status-get-tags)))
433 (let ((tags (mapcar 'cvs-tag-make-tag tags))
434 ;;(pt (save-excursion (forward-line -1) (point)))
436 (setq tags (sort tags 'cvs-tag-lessp))
437 (let* ((first (car tags))
438 (prev (if (cvs-tag-p first)
439 (list (car (cvs-tag->vlist first))) nil)))
440 (combine-after-change-calls
441 (cvs-tree-tags-insert tags prev))
442 ;;(cvs-refontify pt (point))
446 (defun cvs-tree-tags-insert (tags prev)
448 (let* ((tag (car tags))
449 (vlist (cvs-tag->vlist tag))
451 (let* ((next (cvs-car (cadr tags)))
452 (nprev (if (and cvs-tree-nomerge next
453 (equal vlist (cvs-tag->vlist next)))
455 (cvs-map (lambda (v p) v) nprev prev)))
456 (after (save-excursion
458 (cvs-tree-tags-insert (cdr tags) nprev)))
460 (nas nil)) ;"next afters" to be returned
462 (do* ((vs vlist (cdr vs))
465 ((and (null as) (null vs) (null ps))
466 (let ((revname (cvs-status-vl-to-str vlist)))
467 (if (cvs-every 'identity (cvs-map 'equal prev vlist))
468 (insert (make-string (+ 4 (length revname)) ? )
469 (or (cvs-tag->name tag) ""))
470 (insert " " revname ": " (or (cvs-tag->name tag) "")))))
471 (let* ((eq (and pe (equal (car ps) (car vs))))
472 (next-eq (equal (cadr ps) (cadr vs))))
476 (if next-eq (cons t cvs-tree-char-vbar)
477 (cons t cvs-tree-char-branch))
478 (cons nil cvs-tree-char-bob))
480 (if next-eq (cons nil cvs-tree-char-space)
481 (cons t cvs-tree-char-eob))
482 (cons nil (if (and (eq (cvs-tag->type tag) 'branch)
483 (cvs-every 'null as))
485 cvs-tree-char-hbar))))))
486 (insert (cdr na+char))
487 (push (car na+char) nas))
492 ;;;; Merged trees from different files
495 (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
498 (defun cvs-tree-fuzzy-merge (trees tree)
499 "Do the impossible: merge TREE into TREES."
503 "Get tags from the status output and merge tham all into a big tree."
505 (goto-char (point-min))
506 (let ((inhibit-read-only t)
507 (trees (make-vector 31 0)) tree)
508 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags))))
509 (cvs-tree-fuzzy-merge trees tree))
511 (let ((cvs-tag-print-rev nil))
512 (cvs-tree-print tree 'cvs-tag->string 3)))))
515 (provide 'cvs-status)
518 ;; $Log: cvs-status.el,v $
519 ;; Revision 1.9 2000/12/06 19:50:12 fx
520 ;; Fix copyright years.
522 ;; Revision 1.8 2000/11/06 07:01:10 monnier
523 ;; (cvs-tree-merge): Use cvs-butlast (avoid CL).
524 ;; (cvs-status-get-tags): Fix regexp.
525 ;; (cvs-status-trees, cvs-status-cvstrees):
526 ;; Combine after change hooks and don't sit-for.
527 ;; (cvs-tree-use-jisx0208): Renamed from cvs-tree-dstr-2byte-ready.
528 ;; (cvs-tree-char-*): Renamed from cvs-tree-dstr-char-*.
529 ;; Use make-char rather than hard-coded cryptic data.
530 ;; (cvs-status-cvstrees): Convert the buffer to multibyte if necessary.
532 ;; Revision 1.7 2000/09/29 02:19:10 monnier
533 ;; (cvs-status-entry-leader-re): Minor fix.
535 ;; Revision 1.6 2000/08/16 20:46:32 monnier
536 ;; *** empty log message ***
538 ;; Revision 1.5 2000/08/06 09:18:02 gerd
539 ;; Use `nth' instead of `first', `second', and `third'.
541 ;; Revision 1.4 2000/05/10 22:08:28 monnier
542 ;; (cvs-status-minor-wrap): Use mark-active.
544 ;; Revision 1.3 2000/03/22 01:08:08 monnier
545 ;; (cvs-status-mode): Use define-derived-mode.
547 ;; Revision 1.2 2000/03/22 01:01:36 monnier
548 ;; (cvs-status-(prev|next)): Rename from
549 ;; cvs-status-(prev|next)-entry and use easy-mmode-define-navigation.
550 ;; (cvs-tree-dstr-*): Rename from cvstree-dstr-* and use two ascii chars
551 ;; to let the output "breathe" a little more (more readable).
554 ;;; cvs-status.el ends here