1 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
3 ;; Copyright (C) 1999-2011 Free Software Foundation, Inc.
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6 ;; Keywords: pcl-cvs cvs status tree vc tools
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 3 of the License, or
13 ;; (at your option) any later version.
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. If not, see <http://www.gnu.org/licenses/>.
27 ;; - Somehow allow cvs-status-tree to work on-the-fly
31 (eval-when-compile (require 'cl
))
36 (defgroup cvs-status nil
37 "Major mode for browsing `cvs status' output."
39 :prefix
"cvs-status-")
41 (easy-mmode-defmap cvs-status-mode-map
44 ("N" . cvs-status-next
)
45 ("P" . cvs-status-prev
)
46 ("\M-n" . cvs-status-next
)
47 ("\M-p" . cvs-status-prev
)
48 ("t" . cvs-status-cvstrees
)
49 ("T" . cvs-status-trees
)
50 (">" . cvs-mode-checkout
))
53 :inherit
'cvs-mode-map
)
55 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
56 ;; "Menu for `cvs-status-mode'."
58 ;; ["Show Tag Trees" cvs-status-tree t]
61 (defvar cvs-status-mode-hook nil
62 "Hook run at the end of `cvs-status-mode'.")
64 (defconst cvs-status-tags-leader-re
"^ Existing Tags:$")
65 (defconst cvs-status-entry-leader-re
66 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
67 (defconst cvs-status-dir-re
"^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
68 (defconst cvs-status-rev-re
"[0-9][.0-9]*\\.[.0-9]*[0-9]")
69 (defconst cvs-status-tag-re
"[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
71 (defconst cvs-status-font-lock-keywords
72 `((,cvs-status-entry-leader-re
75 (,cvs-status-tags-leader-re
77 (save-excursion (re-search-forward "^\n" nil
'move
) (point))
78 (progn (re-search-backward cvs-status-tags-leader-re nil t
)
80 (0 font-lock-comment-face
))
82 (save-excursion (re-search-forward "^\n" nil
'move
) (point))
83 (progn (re-search-backward cvs-status-tags-leader-re nil t
)
85 (1 font-lock-function-name-face
)))))
86 (defconst cvs-status-font-lock-defaults
87 '(cvs-status-font-lock-keywords t nil nil nil
(font-lock-multiline . t
)))
89 (defvar cvs-minor-wrap-function
)
90 (put 'cvs-status-mode
'mode-class
'special
)
92 (define-derived-mode cvs-status-mode fundamental-mode
"CVS-Status"
93 "Mode used for cvs status output."
94 (set (make-local-variable 'font-lock-defaults
) cvs-status-font-lock-defaults
)
95 (set (make-local-variable 'cvs-minor-wrap-function
) 'cvs-status-minor-wrap
))
97 ;; Define cvs-status-next and cvs-status-prev
98 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re
"entry")
100 (defun cvs-status-current-file ()
103 (or (re-search-backward cvs-status-entry-leader-re nil t
)
104 (re-search-forward cvs-status-entry-leader-re
))
105 (let* ((file (match-string 1))
106 (cvsdir (and (re-search-backward cvs-status-dir-re nil t
)
108 (pcldir (and (if (boundp 'cvs-pcl-cvs-dirchange-re
)
109 (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 (let* ((rev (cvs-car tags
))
226 (name (funcall printer
(cvs-car rev
)))
227 (rest (append (cvs-cdr name
) (cvs-cdr tags
)))
230 (or (= (forward-line 1) 0) (insert "\n"))
231 (cvs-tree-print rest printer column
))))
232 (assert (>= prefix column
))
233 (move-to-column prefix t
)
235 (insert (cvs-car name
))
236 (dolist (br (cvs-cdr rev
))
237 (let* ((column (current-column))
238 (brrev (funcall printer
(cvs-car br
)))
239 (brlength (length (cvs-car brrev
)))
240 (brfill (concat (make-string (/ brlength
2) ?
) "|"))
244 (cvs-tree-print (cvs-append brrev brfill
(cvs-cdr br
))
245 printer
(current-column)))))
246 (delete-region (save-excursion (move-to-column prefix
) (point))
248 (insert " " (make-string (- prefix column
2) ?-
) " ")
252 (defun cvs-tree-merge (tree1 tree2
)
253 "Merge tags trees TREE1 and TREE2 into one.
254 BEWARE: because of stability issues, this is not a symetric operation."
255 (assert (and (listp tree1
) (listp tree2
)))
260 (let* ((rev1 (car tree1
))
261 (tag1 (cvs-car rev1
))
262 (vl1 (cvs-tag->vlist tag1
))
265 (tag2 (cvs-car rev2
))
266 (vl2 (cvs-tag->vlist tag2
))
270 (case (cvs-tag-compare tag1 tag2
)
271 (more1 (list* rev2
(cvs-tree-merge tree1
(cdr tree2
))))
272 (more2 (list* rev1
(cvs-tree-merge (cdr tree1
) tree2
)))
274 (cons (cons (cvs-tag-merge tag1 tag2
)
275 (cvs-tree-merge (cvs-cdr rev1
) (cvs-cdr rev2
)))
276 (cvs-tree-merge (cdr tree1
) (cdr tree2
))))))
279 (list (cons (cvs-tag-make (butlast vl1
)) tree1
)) tree2
))
282 tree1
(list (cons (cvs-tag-make (butlast vl2
)) tree2
)))))))))
284 (defun cvs-tag-make-tag (tag)
285 (let ((vl (mapcar 'string-to-number
(split-string (nth 2 tag
) "\\."))))
286 (cvs-tag-make vl
(nth 0 tag
) (intern (nth 1 tag
)))))
288 (defun cvs-tags->tree
(tags)
289 "Make a tree out of a list of TAGS."
293 (let ((tag (cvs-tag-make-tag tag
)))
294 (list (if (not (eq (cvs-tag->type tag
) 'branch
)) tag
295 (list (cvs-tag-make (butlast (cvs-tag->vlist tag
)))
301 (push (cvs-tree-merge (pop tags
) (pop tags
)) tl
))
302 (setq tags
(nreverse tl
))))
305 (defun cvs-status-get-tags ()
306 "Look for a list of tags, read them in and delete them.
307 Return nil if there was an empty list of tags and t if there wasn't
308 even a list. Else, return the list of tags where each element of
309 the list is a three-string list TAG, KIND, REV."
311 (if (not (re-search-forward cvs-status-tags-leader-re nil t
)) t
315 (case-fold-search t
))
317 (looking-at "\\s-+no\\s-+tags")
319 (progn ; normal listing
320 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
321 (push (list (match-string 1) (match-string 2) (match-string 3)) tags
)
323 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
326 (progn ; cvstree-style listing
327 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
329 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
330 (setq lastrev
(or (match-string 2) lastrev
))
331 (push (list (match-string 3)
332 (if (equal (match-string 1) " ") "branch" "revision")
335 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
336 (setq tags
(nreverse tags
)))
338 (progn ; new tree style listing
339 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
340 (re3 (concat re-lead
"\\(\\.\\)?\\(" cvs-status-rev-re
"\\)"))
341 (re2 (concat re-lead cvs-status-tag-re
"\\(\\)"))
342 (re1 (concat re-lead cvs-status-tag-re
343 " (\\(" cvs-status-rev-re
"\\))")))
344 (while (or (looking-at re1
) (looking-at re2
) (looking-at re3
))
345 (push (list (match-string 3)
346 (if (match-string 1) "branch" "revision")
347 (match-string 4)) tags
)
348 (goto-char (match-end 0))
349 (when (eolp) (forward-char 1))))
350 (unless (looking-at "^$") (setq tags nil
) (goto-char pt
))
351 (setq tags
(nreverse tags
))))
353 (delete-region pt
(point)))
356 (defvar font-lock-mode
)
357 ;; (defun cvs-refontify (beg end)
358 ;; (when (and (boundp 'font-lock-mode)
360 ;; (fboundp 'font-lock-fontify-region))
361 ;; (font-lock-fontify-region (1- beg) (1+ end))))
363 (defun cvs-status-trees ()
364 "Look for a lists of tags, and replace them with trees."
367 (goto-char (point-min))
368 (let ((inhibit-read-only t
)
370 (while (listp (setq tags
(cvs-status-get-tags)))
371 ;;(let ((pt (save-excursion (forward-line -1) (point))))
373 (narrow-to-region (point) (point))
375 (combine-after-change-calls
376 (cvs-tree-print (cvs-tags->tree tags
) 'cvs-tag-
>string
3)))
377 ;;(cvs-refontify pt (point))
383 ;;;; CVSTree-style trees
386 (defvar cvs-tree-use-jisx0208 nil
) ;Old compat var.
387 (defvar cvs-tree-use-charset
389 (cvs-tree-use-jisx0208 'jisx0208
)
390 ((char-displayable-p ?━
) 'unicode
)
391 ((char-displayable-p (make-char 'japanese-jisx0208
40 44)) 'jisx0208
))
392 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
393 Otherwise, default to ASCII chars like +, - and |.")
395 (defconst cvs-tree-char-space
396 (case cvs-tree-use-charset
397 (jisx0208 (make-char 'japanese-jisx0208
33 33))
400 (defconst cvs-tree-char-hbar
401 (case cvs-tree-use-charset
402 (jisx0208 (make-char 'japanese-jisx0208
40 44))
405 (defconst cvs-tree-char-vbar
406 (case cvs-tree-use-charset
407 (jisx0208 (make-char 'japanese-jisx0208
40 45))
410 (defconst cvs-tree-char-branch
411 (case cvs-tree-use-charset
412 (jisx0208 (make-char 'japanese-jisx0208
40 50))
415 (defconst cvs-tree-char-eob
;end of branch
416 (case cvs-tree-use-charset
417 (jisx0208 (make-char 'japanese-jisx0208
40 49))
420 (defconst cvs-tree-char-bob
;beginning of branch
421 (case cvs-tree-use-charset
422 (jisx0208 (make-char 'japanese-jisx0208
40 51))
426 (defun cvs-tag-lessp (tag1 tag2
)
427 (eq (cvs-tag-compare tag1 tag2
) 'more2
))
429 (defvar cvs-tree-nomerge nil
)
431 (defun cvs-status-cvstrees (&optional arg
)
432 "Look for a list of tags, and replace it with a tree.
433 Optional prefix ARG chooses between two representations."
435 (when (and cvs-tree-use-charset
436 (not enable-multibyte-characters
))
437 ;; We need to convert the buffer from unibyte to multibyte
438 ;; since we'll use multibyte chars for the tree.
439 (let ((modified (buffer-modified-p))
440 (inhibit-read-only t
)
441 (inhibit-modification-hooks t
))
444 (decode-coding-region (point-min) (point-max) 'undecided
)
445 (set-buffer-multibyte t
))
446 (restore-buffer-modified-p modified
))))
448 (goto-char (point-min))
449 (let ((inhibit-read-only t
)
451 (cvs-tree-nomerge (if arg
(not cvs-tree-nomerge
) cvs-tree-nomerge
)))
452 (while (listp (setq tags
(cvs-status-get-tags)))
453 (let ((tags (mapcar 'cvs-tag-make-tag tags
))
454 ;;(pt (save-excursion (forward-line -1) (point)))
456 (setq tags
(sort tags
'cvs-tag-lessp
))
457 (let* ((first (car tags
))
458 (prev (if (cvs-tag-p first
)
459 (list (car (cvs-tag->vlist first
))) nil
)))
460 (combine-after-change-calls
461 (cvs-tree-tags-insert tags prev
))
462 ;;(cvs-refontify pt (point))
466 (defun cvs-tree-tags-insert (tags prev
)
468 (let* ((tag (car tags
))
469 (vlist (cvs-tag->vlist tag
))
471 (let* ((next (cvs-car (cadr tags
)))
472 (nprev (if (and cvs-tree-nomerge next
473 (equal vlist
(cvs-tag->vlist next
)))
475 (cvs-map (lambda (v p
) v
) nprev prev
)))
476 (after (save-excursion
478 (cvs-tree-tags-insert (cdr tags
) nprev
)))
480 (nas nil
)) ;"next afters" to be returned
482 (do* ((vs vlist
(cdr vs
))
485 ((and (null as
) (null vs
) (null ps
))
486 (let ((revname (cvs-status-vl-to-str vlist
)))
487 (if (cvs-every 'identity
(cvs-map 'equal prev vlist
))
488 (insert (make-string (+ 4 (length revname
)) ?
)
489 (or (cvs-tag->name tag
) ""))
490 (insert " " revname
": " (or (cvs-tag->name tag
) "")))))
491 (let* ((eq (and pe
(equal (car ps
) (car vs
))))
492 (next-eq (equal (cadr ps
) (cadr vs
))))
496 (if next-eq
(cons t cvs-tree-char-vbar
)
497 (cons t cvs-tree-char-branch
))
498 (cons nil cvs-tree-char-bob
))
500 (if next-eq
(cons nil cvs-tree-char-space
)
501 (cons t cvs-tree-char-eob
))
502 (cons nil
(if (and (eq (cvs-tag->type tag
) 'branch
)
503 (cvs-every 'null as
))
505 cvs-tree-char-hbar
))))))
506 (insert (cdr na
+char
))
507 (push (car na
+char
) nas
))
512 ;;;; Merged trees from different files
515 (defun cvs-tree-fuzzy-merge-1 (trees tree prev
)
518 (defun cvs-tree-fuzzy-merge (trees tree
)
519 "Do the impossible: merge TREE into TREES."
523 "Get tags from the status output and merge tham all into a big tree."
525 (goto-char (point-min))
526 (let ((inhibit-read-only t
)
527 (trees (make-vector 31 0)) tree
)
528 (while (listp (setq tree
(cvs-tags->tree
(cvs-status-get-tags))))
529 (cvs-tree-fuzzy-merge trees tree
))
531 (let ((cvs-tag-print-rev nil
))
532 (cvs-tree-print tree
'cvs-tag-
>string
3)))))
535 (provide 'cvs-status
)
537 ;;; cvs-status.el ends here