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 ;; This file is part of GNU Emacs.
10 ;; GNU Emacs is free software; you can redistribute it and/or modify
11 ;; it under the terms of the GNU General Public License as published by
12 ;; the Free Software Foundation; either version 2, or (at your option)
15 ;; GNU Emacs is distributed in the hope that it will be useful,
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 ;; GNU General Public License for more details.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
23 ;; Boston, MA 02111-1307, USA.
29 ;; - Somehow allow cvs-status-tree to work on-the-fly
33 (eval-when-compile (require 'cl))
38 (defgroup cvs-status nil
39 "Major mode for browsing `cvs status' output."
41 :prefix "cvs-status-")
43 (easy-mmode-defmap cvs-status-mode-map
46 ("N" . cvs-status-next)
47 ("P" . cvs-status-prev)
48 ("\M-n" . cvs-status-next)
49 ("\M-p" . cvs-status-prev)
50 ("t" . cvs-status-cvstrees)
51 ("T" . cvs-status-trees))
54 :inherit 'cvs-mode-map)
56 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
57 ;; "Menu for `cvs-status-mode'."
59 ;; ["Show Tag Trees" cvs-status-tree t]
62 (defvar cvs-status-mode-hook nil
63 "Hook run at the end of `cvs-status-mode'.")
65 (defconst cvs-status-tags-leader-re "^ Existing Tags:$")
66 (defconst cvs-status-entry-leader-re
67 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
68 (defconst cvs-status-dir-re "^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
69 (defconst cvs-status-rev-re "[0-9][.0-9]*\\.[.0-9]*[0-9]")
70 (defconst cvs-status-tag-re "[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
72 (defconst cvs-status-font-lock-keywords
73 `((,cvs-status-entry-leader-re
74 (1 'cvs-filename-face)
75 (2 'cvs-need-action-face))
76 (,cvs-status-tags-leader-re
78 (save-excursion (re-search-forward "^\n" nil 'move) (point))
79 (progn (re-search-backward cvs-status-tags-leader-re nil t)
81 (0 font-lock-comment-face))
83 (save-excursion (re-search-forward "^\n" nil 'move) (point))
84 (progn (re-search-backward cvs-status-tags-leader-re nil t)
86 (1 font-lock-function-name-face)))))
87 (defconst cvs-status-font-lock-defaults
88 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
91 (put 'cvs-status-mode 'mode-class 'special)
93 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
94 "Mode used for cvs status output."
95 (set (make-local-variable 'font-lock-defaults) cvs-status-font-lock-defaults)
96 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-status-minor-wrap))
98 ;; Define cvs-status-next and cvs-status-prev
99 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re "entry")
101 (defun cvs-status-current-file ()
104 (or (re-search-backward cvs-status-entry-leader-re nil t)
105 (re-search-forward cvs-status-entry-leader-re))
106 (let* ((file (match-string 1))
107 (cvsdir (and (re-search-backward cvs-status-dir-re nil t)
109 (pcldir (and (re-search-backward cvs-pcl-cvs-dirchange-re nil t)
112 (let ((default-directory ""))
113 (when pcldir (setq dir (expand-file-name pcldir dir)))
114 (when cvsdir (setq dir (expand-file-name cvsdir dir)))
115 (expand-file-name file dir)))))
117 (defun cvs-status-current-tag ()
120 (col (current-column))
121 (start (progn (re-search-backward cvs-status-tags-leader-re nil t) (point)))
122 (end (progn (re-search-forward "^$" nil t) (point))))
123 (when (and (< start pt) (> end pt))
126 (let ((tag nil) (dist pt) (end (point)))
128 (while (re-search-forward cvs-status-tag-re end t)
129 (let* ((cole (current-column))
130 (colb (save-excursion
131 (goto-char (match-beginning 1)) (current-column)))
132 (ndist (min (abs (- cole col)) (abs (- colb col)))))
135 (setq tag (match-string 1)))))
138 (defun cvs-status-minor-wrap (buf f)
139 (let ((data (with-current-buffer buf
141 (cons (cvs-status-current-file)
142 (cvs-status-current-tag))
146 (cons (cvs-status-current-file)
147 (cvs-status-current-tag))))))))
148 (let ((cvs-branch-prefix (cdar data))
149 (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
150 (cvs-minor-current-files
152 (when (and (cadr data) (not (equal (caar data) (cadr data))))
153 (list (cadr data)))))
154 ;; FIXME: I need to force because the fileinfos are UNKNOWN
155 (cvs-force-command "/F"))
159 ;; Tagelt, tag element
164 (:constructor cvs-tag-make
165 (vlist &optional name type))
166 (:conc-name cvs-tag->))
171 (defsubst cvs-status-vl-to-str (vl) (mapconcat 'number-to-string vl "."))
173 (defun cvs-tag->string (tag)
174 (if (stringp tag) tag
175 (let ((name (cvs-tag->name tag))
176 (vl (cvs-tag->vlist tag)))
177 (if (null name) (cvs-status-vl-to-str vl)
178 (let ((rev (if vl (concat " (" (cvs-status-vl-to-str vl) ")") "")))
179 (if (consp name) (mapcar (lambda (name) (concat name rev)) name)
180 (concat name rev)))))))
182 (defun cvs-tag-compare-1 (vl1 vl2)
184 ((and (null vl1) (null vl2)) 'equal)
187 (t (let ((v1 (car vl1))
192 (t (cvs-tag-compare-1 (cdr vl1) (cdr vl2))))))))
194 (defsubst cvs-tag-compare (tag1 tag2)
195 (cvs-tag-compare-1 (cvs-tag->vlist tag1) (cvs-tag->vlist tag2)))
197 (defun cvs-tag-merge (tag1 tag2)
198 "Merge TAG1 and TAG2 into one."
199 (let ((type1 (cvs-tag->type tag1))
200 (type2 (cvs-tag->type tag2))
201 (name1 (cvs-tag->name tag1))
202 (name2 (cvs-tag->name tag2)))
203 (unless (equal (cvs-tag->vlist tag1) (cvs-tag->vlist tag2))
204 (setf (cvs-tag->vlist tag1) nil))
206 (unless (or (not type2) (equal type1 type2))
207 (setf (cvs-tag->type tag1) nil))
208 (setf (cvs-tag->type tag1) type2))
210 (setf (cvs-tag->name tag1) (cvs-append name1 name2))
211 (setf (cvs-tag->name tag1) name2))
214 (defun cvs-tree-print (tags printer column)
215 "Print the tree of TAGS where each tag's string is given by PRINTER.
216 PRINTER should accept both a tag (in which case it should return a string)
217 or a string (in which case it should simply return its argument).
218 A tag cannot be a CONS. The return value can also be a list of strings,
219 if several nodes where merged into one.
220 The tree will be printed no closer than column COLUMN."
222 (let* ((eol (save-excursion (end-of-line) (current-column)))
223 (column (max (+ eol 2) column)))
224 (if (null tags) column
225 ;;(move-to-column-force column)
226 (let* ((rev (cvs-car tags))
227 (name (funcall printer (cvs-car rev)))
228 (rest (append (cvs-cdr name) (cvs-cdr tags)))
231 (or (= (forward-line 1) 0) (insert "\n"))
232 (cvs-tree-print rest printer column))))
233 (assert (>= prefix column))
234 (move-to-column prefix t)
236 (insert (cvs-car name))
237 (dolist (br (cvs-cdr rev))
238 (let* ((column (current-column))
239 (brrev (funcall printer (cvs-car br)))
240 (brlength (length (cvs-car brrev)))
241 (brfill (concat (make-string (/ brlength 2) ? ) "|"))
245 (cvs-tree-print (cvs-append brrev brfill (cvs-cdr br))
246 printer (current-column)))))
247 (delete-region (save-excursion (move-to-column prefix) (point))
249 (insert " " (make-string (- prefix column 2) ?-) " ")
253 (defun cvs-tree-merge (tree1 tree2)
254 "Merge tags trees TREE1 and TREE2 into one.
255 BEWARE: because of stability issues, this is not a symetric operation."
256 (assert (and (listp tree1) (listp tree2)))
261 (let* ((rev1 (car tree1))
262 (tag1 (cvs-car rev1))
263 (vl1 (cvs-tag->vlist tag1))
266 (tag2 (cvs-car rev2))
267 (vl2 (cvs-tag->vlist tag2))
271 (case (cvs-tag-compare tag1 tag2)
272 (more1 (list* rev2 (cvs-tree-merge tree1 (cdr tree2))))
273 (more2 (list* rev1 (cvs-tree-merge (cdr tree1) tree2)))
275 (cons (cons (cvs-tag-merge tag1 tag2)
276 (cvs-tree-merge (cvs-cdr rev1) (cvs-cdr rev2)))
277 (cvs-tree-merge (cdr tree1) (cdr tree2))))))
280 (list (cons (cvs-tag-make (cvs-butlast vl1)) tree1)) tree2))
283 tree1 (list (cons (cvs-tag-make (cvs-butlast vl2)) tree2)))))))))
285 (defun cvs-tag-make-tag (tag)
286 (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
287 (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag)))))
289 (defun cvs-tags->tree (tags)
290 "Make a tree out of a list of TAGS."
294 (let ((tag (cvs-tag-make-tag tag)))
295 (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
296 (list (cvs-tag-make (cvs-butlast (cvs-tag->vlist tag)))
302 (push (cvs-tree-merge (pop tags) (pop tags)) tl))
303 (setq tags (nreverse tl))))
306 (defun cvs-status-get-tags ()
307 "Look for a list of tags, read them in and delete them.
308 Return nil if there was an empty list of tags and t if there wasn't
309 even a list. Else, return the list of tags where each element of
310 the list is a three-string list TAG, KIND, REV."
312 (if (not (re-search-forward cvs-status-tags-leader-re nil t)) t
316 (case-fold-search t))
318 (looking-at "\\s-+no\\s-+tags")
320 (progn ; normal listing
321 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
322 (push (list (match-string 1) (match-string 2) (match-string 3)) tags)
324 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
327 (progn ; cvstree-style listing
328 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
330 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
331 (setq lastrev (or (match-string 2) lastrev))
332 (push (list (match-string 3)
333 (if (equal (match-string 1) " ") "branch" "revision")
336 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
337 (setq tags (nreverse tags)))
339 (progn ; new tree style listing
340 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
341 (re3 (concat re-lead "\\(\\.\\)?\\(" cvs-status-rev-re "\\)"))
342 (re2 (concat re-lead cvs-status-tag-re "\\(\\)"))
343 (re1 (concat re-lead cvs-status-tag-re
344 " (\\(" cvs-status-rev-re "\\))")))
345 (while (or (looking-at re1) (looking-at re2) (looking-at re3))
346 (push (list (match-string 3)
347 (if (match-string 1) "branch" "revision")
348 (match-string 4)) tags)
349 (goto-char (match-end 0))
350 (when (eolp) (forward-char 1))))
351 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
352 (setq tags (nreverse tags))))
354 (delete-region pt (point)))
357 (defvar font-lock-mode)
358 (defun cvs-refontify (beg end)
359 (when (and (boundp 'font-lock-mode)
361 (fboundp 'font-lock-fontify-region))
362 (font-lock-fontify-region (1- beg) (1+ end))))
364 (defun cvs-status-trees ()
365 "Look for a lists of tags, and replace them with trees."
368 (goto-char (point-min))
369 (let ((inhibit-read-only t)
371 (while (listp (setq tags (cvs-status-get-tags)))
372 ;;(let ((pt (save-excursion (forward-line -1) (point))))
374 (narrow-to-region (point) (point))
376 (combine-after-change-calls
377 (cvs-tree-print (cvs-tags->tree tags) 'cvs-tag->string 3)))
378 ;;(cvs-refontify pt (point))
384 ;;;; CVSTree-style trees
387 (defvar cvs-tree-use-jisx0208
388 nil ;; (and (char-display-font 'japanese-jisx0208) t)
389 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
390 Otherwise, default to ASCII chars like +, - and |.")
392 (defconst cvs-tree-char-space
393 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 33 33) " "))
394 (defconst cvs-tree-char-hbar
395 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 44) "--"))
396 (defconst cvs-tree-char-vbar
397 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 45) "| "))
398 (defconst cvs-tree-char-branch
399 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 50) "+-"))
400 (defconst cvs-tree-char-eob ;end of branch
401 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 49) "`-"))
402 (defconst cvs-tree-char-bob ;beginning of branch
403 (if cvs-tree-use-jisx0208 (make-char 'japanese-jisx0208 40 51) "+-"))
405 (defun cvs-tag-lessp (tag1 tag2)
406 (eq (cvs-tag-compare tag1 tag2) 'more2))
408 (defvar cvs-tree-nomerge nil)
410 (defun cvs-status-cvstrees (&optional arg)
411 "Look for a list of tags, and replace it with a tree.
412 Optional prefix ARG chooses between two representations."
414 (when (and cvs-tree-use-jisx0208
415 (not enable-multibyte-characters))
416 ;; We need to convert the buffer from unibyte to multibyte
417 ;; since we'll use multibyte chars for the tree.
418 (let ((modified (buffer-modified-p))
419 (inhibit-read-only t)
420 (inhibit-modification-hooks t))
423 (decode-coding-region (point-min) (point-max) 'undecided)
424 (set-buffer-multibyte t))
425 (restore-buffer-modified-p modified))))
427 (goto-char (point-min))
428 (let ((inhibit-read-only t)
430 (cvs-tree-nomerge (if arg (not cvs-tree-nomerge) cvs-tree-nomerge)))
431 (while (listp (setq tags (cvs-status-get-tags)))
432 (let ((tags (mapcar 'cvs-tag-make-tag tags))
433 ;;(pt (save-excursion (forward-line -1) (point)))
435 (setq tags (sort tags 'cvs-tag-lessp))
436 (let* ((first (car tags))
437 (prev (if (cvs-tag-p first)
438 (list (car (cvs-tag->vlist first))) nil)))
439 (combine-after-change-calls
440 (cvs-tree-tags-insert tags prev))
441 ;;(cvs-refontify pt (point))
445 (defun cvs-tree-tags-insert (tags prev)
447 (let* ((tag (car tags))
448 (vlist (cvs-tag->vlist tag))
450 (let* ((next (cvs-car (cadr tags)))
451 (nprev (if (and cvs-tree-nomerge next
452 (equal vlist (cvs-tag->vlist next)))
454 (cvs-map (lambda (v p) v) nprev prev)))
455 (after (save-excursion
457 (cvs-tree-tags-insert (cdr tags) nprev)))
459 (nas nil)) ;"next afters" to be returned
461 (do* ((vs vlist (cdr vs))
464 ((and (null as) (null vs) (null ps))
465 (let ((revname (cvs-status-vl-to-str vlist)))
466 (if (cvs-every 'identity (cvs-map 'equal prev vlist))
467 (insert (make-string (+ 4 (length revname)) ? )
468 (or (cvs-tag->name tag) ""))
469 (insert " " revname ": " (or (cvs-tag->name tag) "")))))
470 (let* ((eq (and pe (equal (car ps) (car vs))))
471 (next-eq (equal (cadr ps) (cadr vs))))
475 (if next-eq (cons t cvs-tree-char-vbar)
476 (cons t cvs-tree-char-branch))
477 (cons nil cvs-tree-char-bob))
479 (if next-eq (cons nil cvs-tree-char-space)
480 (cons t cvs-tree-char-eob))
481 (cons nil (if (and (eq (cvs-tag->type tag) 'branch)
482 (cvs-every 'null as))
484 cvs-tree-char-hbar))))))
485 (insert (cdr na+char))
486 (push (car na+char) nas))
491 ;;;; Merged trees from different files
494 (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
497 (defun cvs-tree-fuzzy-merge (trees tree)
498 "Do the impossible: merge TREE into TREES."
502 "Get tags from the status output and merge tham all into a big tree."
504 (goto-char (point-min))
505 (let ((inhibit-read-only t)
506 (trees (make-vector 31 0)) tree)
507 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags))))
508 (cvs-tree-fuzzy-merge trees tree))
510 (let ((cvs-tag-print-rev nil))
511 (cvs-tree-print tree 'cvs-tag->string 3)))))
514 (provide 'cvs-status)
516 ;;; cvs-status.el ends here