1 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
4 ;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
7 ;; Keywords: pcl-cvs cvs status tree vc tools
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 3 of the License, or
14 ;; (at your option) any later version.
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. If not, see <http://www.gnu.org/licenses/>.
28 ;; - Somehow allow cvs-status-tree to work on-the-fly
32 (eval-when-compile (require 'cl
))
37 (defgroup cvs-status nil
38 "Major mode for browsing `cvs status' output."
40 :prefix
"cvs-status-")
42 (easy-mmode-defmap cvs-status-mode-map
45 ("N" . cvs-status-next
)
46 ("P" . cvs-status-prev
)
47 ("\M-n" . cvs-status-next
)
48 ("\M-p" . cvs-status-prev
)
49 ("t" . cvs-status-cvstrees
)
50 ("T" . cvs-status-trees
)
51 (">" . cvs-mode-checkout
))
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
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
)))
90 (defvar cvs-minor-wrap-function
)
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 (if (boundp 'cvs-pcl-cvs-dirchange-re
)
110 (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 (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 (butlast vl1
)) tree1
)) tree2
))
283 tree1
(list (cons (cvs-tag-make (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 (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 nil
) ;Old compat var.
388 (defvar cvs-tree-use-charset
390 (cvs-tree-use-jisx0208 'jisx0208
)
391 ((char-displayable-p ?━
) 'unicode
)
392 ((char-displayable-p (make-char 'japanese-jisx0208
40 44)) 'jisx0208
))
393 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
394 Otherwise, default to ASCII chars like +, - and |.")
396 (defconst cvs-tree-char-space
397 (case cvs-tree-use-charset
398 (jisx0208 (make-char 'japanese-jisx0208
33 33))
401 (defconst cvs-tree-char-hbar
402 (case cvs-tree-use-charset
403 (jisx0208 (make-char 'japanese-jisx0208
40 44))
406 (defconst cvs-tree-char-vbar
407 (case cvs-tree-use-charset
408 (jisx0208 (make-char 'japanese-jisx0208
40 45))
411 (defconst cvs-tree-char-branch
412 (case cvs-tree-use-charset
413 (jisx0208 (make-char 'japanese-jisx0208
40 50))
416 (defconst cvs-tree-char-eob
;end of branch
417 (case cvs-tree-use-charset
418 (jisx0208 (make-char 'japanese-jisx0208
40 49))
421 (defconst cvs-tree-char-bob
;beginning of branch
422 (case cvs-tree-use-charset
423 (jisx0208 (make-char 'japanese-jisx0208
40 51))
427 (defun cvs-tag-lessp (tag1 tag2
)
428 (eq (cvs-tag-compare tag1 tag2
) 'more2
))
430 (defvar cvs-tree-nomerge nil
)
432 (defun cvs-status-cvstrees (&optional arg
)
433 "Look for a list of tags, and replace it with a tree.
434 Optional prefix ARG chooses between two representations."
436 (when (and cvs-tree-use-charset
437 (not enable-multibyte-characters
))
438 ;; We need to convert the buffer from unibyte to multibyte
439 ;; since we'll use multibyte chars for the tree.
440 (let ((modified (buffer-modified-p))
441 (inhibit-read-only t
)
442 (inhibit-modification-hooks t
))
445 (decode-coding-region (point-min) (point-max) 'undecided
)
446 (set-buffer-multibyte t
))
447 (restore-buffer-modified-p modified
))))
449 (goto-char (point-min))
450 (let ((inhibit-read-only t
)
452 (cvs-tree-nomerge (if arg
(not cvs-tree-nomerge
) cvs-tree-nomerge
)))
453 (while (listp (setq tags
(cvs-status-get-tags)))
454 (let ((tags (mapcar 'cvs-tag-make-tag tags
))
455 ;;(pt (save-excursion (forward-line -1) (point)))
457 (setq tags
(sort tags
'cvs-tag-lessp
))
458 (let* ((first (car tags
))
459 (prev (if (cvs-tag-p first
)
460 (list (car (cvs-tag->vlist first
))) nil
)))
461 (combine-after-change-calls
462 (cvs-tree-tags-insert tags prev
))
463 ;;(cvs-refontify pt (point))
467 (defun cvs-tree-tags-insert (tags prev
)
469 (let* ((tag (car tags
))
470 (vlist (cvs-tag->vlist tag
))
472 (let* ((next (cvs-car (cadr tags
)))
473 (nprev (if (and cvs-tree-nomerge next
474 (equal vlist
(cvs-tag->vlist next
)))
476 (cvs-map (lambda (v p
) v
) nprev prev
)))
477 (after (save-excursion
479 (cvs-tree-tags-insert (cdr tags
) nprev
)))
481 (nas nil
)) ;"next afters" to be returned
483 (do* ((vs vlist
(cdr vs
))
486 ((and (null as
) (null vs
) (null ps
))
487 (let ((revname (cvs-status-vl-to-str vlist
)))
488 (if (cvs-every 'identity
(cvs-map 'equal prev vlist
))
489 (insert (make-string (+ 4 (length revname
)) ?
)
490 (or (cvs-tag->name tag
) ""))
491 (insert " " revname
": " (or (cvs-tag->name tag
) "")))))
492 (let* ((eq (and pe
(equal (car ps
) (car vs
))))
493 (next-eq (equal (cadr ps
) (cadr vs
))))
497 (if next-eq
(cons t cvs-tree-char-vbar
)
498 (cons t cvs-tree-char-branch
))
499 (cons nil cvs-tree-char-bob
))
501 (if next-eq
(cons nil cvs-tree-char-space
)
502 (cons t cvs-tree-char-eob
))
503 (cons nil
(if (and (eq (cvs-tag->type tag
) 'branch
)
504 (cvs-every 'null as
))
506 cvs-tree-char-hbar
))))))
507 (insert (cdr na
+char
))
508 (push (car na
+char
) nas
))
513 ;;;; Merged trees from different files
516 (defun cvs-tree-fuzzy-merge-1 (trees tree prev
)
519 (defun cvs-tree-fuzzy-merge (trees tree
)
520 "Do the impossible: merge TREE into TREES."
524 "Get tags from the status output and merge tham all into a big tree."
526 (goto-char (point-min))
527 (let ((inhibit-read-only t
)
528 (trees (make-vector 31 0)) tree
)
529 (while (listp (setq tree
(cvs-tags->tree
(cvs-status-get-tags))))
530 (cvs-tree-fuzzy-merge trees tree
))
532 (let ((cvs-tag-print-rev nil
))
533 (cvs-tree-print tree
'cvs-tag-
>string
3)))))
536 (provide 'cvs-status
)
538 ;;; cvs-status.el ends here