55076
|
1 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2
|
74439
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
|
100908
|
4 ;; 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5
|
70292
|
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
|
42557
|
7 ;; Keywords: pcl-cvs cvs status tree tools
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10
|
94678
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by
|
94678
|
13 ;; the Free Software Foundation, either version 3 of the License, or
|
|
14 ;; (at your option) any later version.
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful,
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License
|
94678
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
23
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 ;;; Commentary:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;; Todo:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 ;; - Somehow allow cvs-status-tree to work on-the-fly
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 ;;; Code:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 (eval-when-compile (require 'cl))
|
58159
|
33 (require 'pcvs-util)
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 (defgroup cvs-status nil
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
38 "Major mode for browsing `cvs status' output."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 :group 'pcl-cvs
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 :prefix "cvs-status-")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
41
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
42 (easy-mmode-defmap cvs-status-mode-map
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
43 '(("n" . next-line)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
44 ("p" . previous-line)
|
28249
|
45 ("N" . cvs-status-next)
|
|
46 ("P" . cvs-status-prev)
|
|
47 ("\M-n" . cvs-status-next)
|
|
48 ("\M-p" . cvs-status-prev)
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 ("t" . cvs-status-cvstrees)
|
56750
|
50 ("T" . cvs-status-trees)
|
58159
|
51 (">" . cvs-mode-checkout))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
52 "CVS-Status' keymap."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
53 :group 'cvs-status
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
54 :inherit 'cvs-mode-map)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
55
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
56 ;;(easy-menu-define cvs-status-menu cvs-status-mode-map
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 ;; "Menu for `cvs-status-mode'."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
58 ;; '("CVS-Status"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
59 ;; ["Show Tag Trees" cvs-status-tree t]
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
60 ;; ))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
62 (defvar cvs-status-mode-hook nil
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
63 "Hook run at the end of `cvs-status-mode'.")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
65 (defconst cvs-status-tags-leader-re "^ Existing Tags:$")
|
31972
|
66 (defconst cvs-status-entry-leader-re
|
|
67 "^File:\\s-+\\(?:no file \\)?\\(.*\\S-\\)\\s-+Status: \\(.+\\)$")
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
68 (defconst cvs-status-dir-re "^cvs[.ex]* [a-z]+: Examining \\(.+\\)$")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
69 (defconst cvs-status-rev-re "[0-9][.0-9]*\\.[.0-9]*[0-9]")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
70 (defconst cvs-status-tag-re "[ \t]\\([a-zA-Z][^ \t\n.]*\\)")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
71
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
72 (defconst cvs-status-font-lock-keywords
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
73 `((,cvs-status-entry-leader-re
|
63210
|
74 (1 'cvs-filename)
|
|
75 (2 'cvs-need-action))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 (,cvs-status-tags-leader-re
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 (,cvs-status-rev-re
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
78 (save-excursion (re-search-forward "^\n" nil 'move) (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
79 (progn (re-search-backward cvs-status-tags-leader-re nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
80 (forward-line 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 (0 font-lock-comment-face))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
82 (,cvs-status-tag-re
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
83 (save-excursion (re-search-forward "^\n" nil 'move) (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
84 (progn (re-search-backward cvs-status-tags-leader-re nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
85 (forward-line 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
86 (1 font-lock-function-name-face)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87 (defconst cvs-status-font-lock-defaults
|
33231
|
88 '(cvs-status-font-lock-keywords t nil nil nil (font-lock-multiline . t)))
|
49588
|
89
|
58159
|
90 (defvar cvs-minor-wrap-function)
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
91 (put 'cvs-status-mode 'mode-class 'special)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
92 ;;;###autoload
|
28250
|
93 (define-derived-mode cvs-status-mode fundamental-mode "CVS-Status"
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
94 "Mode used for cvs status output."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
95 (set (make-local-variable 'font-lock-defaults) cvs-status-font-lock-defaults)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
96 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-status-minor-wrap))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
97
|
28249
|
98 ;; Define cvs-status-next and cvs-status-prev
|
|
99 (easy-mmode-define-navigation cvs-status cvs-status-entry-leader-re "entry")
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
100
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
101 (defun cvs-status-current-file ()
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
102 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 (forward-line 1)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
104 (or (re-search-backward cvs-status-entry-leader-re nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 (re-search-forward cvs-status-entry-leader-re))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 (let* ((file (match-string 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
107 (cvsdir (and (re-search-backward cvs-status-dir-re nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
108 (match-string 1)))
|
58159
|
109 (pcldir (and (if (boundp 'cvs-pcl-cvs-dirchange-re)
|
|
110 (re-search-backward cvs-pcl-cvs-dirchange-re nil t))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
111 (match-string 1)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
112 (dir ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
113 (let ((default-directory ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
114 (when pcldir (setq dir (expand-file-name pcldir dir)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
115 (when cvsdir (setq dir (expand-file-name cvsdir dir)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
116 (expand-file-name file dir)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
117
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
118 (defun cvs-status-current-tag ()
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
119 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
120 (let ((pt (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
121 (col (current-column))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
122 (start (progn (re-search-backward cvs-status-tags-leader-re nil t) (point)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
123 (end (progn (re-search-forward "^$" nil t) (point))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
124 (when (and (< start pt) (> end pt))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
125 (goto-char pt)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 (end-of-line)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 (let ((tag nil) (dist pt) (end (point)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 (beginning-of-line)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
129 (while (re-search-forward cvs-status-tag-re end t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 (let* ((cole (current-column))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 (colb (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
132 (goto-char (match-beginning 1)) (current-column)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
133 (ndist (min (abs (- cole col)) (abs (- colb col)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134 (when (< ndist dist)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
135 (setq dist ndist)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
136 (setq tag (match-string 1)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
137 tag)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
138
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
139 (defun cvs-status-minor-wrap (buf f)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
140 (let ((data (with-current-buffer buf
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 (cons
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
142 (cons (cvs-status-current-file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 (cvs-status-current-tag))
|
28857
|
144 (when mark-active
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
146 (goto-char (mark))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
147 (cons (cvs-status-current-file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 (cvs-status-current-tag))))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
149 (let ((cvs-branch-prefix (cdar data))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
150 (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
151 (cvs-minor-current-files
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 (cons (caar data)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 (when (and (cadr data) (not (equal (caar data) (cadr data))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
154 (list (cadr data)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
155 ;; FIXME: I need to force because the fileinfos are UNKNOWN
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156 (cvs-force-command "/F"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
157 (funcall f))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
158
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
159 ;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
160 ;; Tagelt, tag element
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
161 ;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
162
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
163 (defstruct (cvs-tag
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
164 (:constructor nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
165 (:constructor cvs-tag-make
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
166 (vlist &optional name type))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 (:conc-name cvs-tag->))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 vlist
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
169 name
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
170 type)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
171
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
172 (defsubst cvs-status-vl-to-str (vl) (mapconcat 'number-to-string vl "."))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
174 (defun cvs-tag->string (tag)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175 (if (stringp tag) tag
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
176 (let ((name (cvs-tag->name tag))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
177 (vl (cvs-tag->vlist tag)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
178 (if (null name) (cvs-status-vl-to-str vl)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
179 (let ((rev (if vl (concat " (" (cvs-status-vl-to-str vl) ")") "")))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
180 (if (consp name) (mapcar (lambda (name) (concat name rev)) name)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
181 (concat name rev)))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
182
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
183 (defun cvs-tag-compare-1 (vl1 vl2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
184 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
185 ((and (null vl1) (null vl2)) 'equal)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
186 ((null vl1) 'more2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
187 ((null vl2) 'more1)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
188 (t (let ((v1 (car vl1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
189 (v2 (car vl2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
190 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
191 ((> v1 v2) 'more1)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
192 ((< v1 v2) 'more2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
193 (t (cvs-tag-compare-1 (cdr vl1) (cdr vl2))))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
194
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
195 (defsubst cvs-tag-compare (tag1 tag2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
196 (cvs-tag-compare-1 (cvs-tag->vlist tag1) (cvs-tag->vlist tag2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
197
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
198 (defun cvs-tag-merge (tag1 tag2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
199 "Merge TAG1 and TAG2 into one."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
200 (let ((type1 (cvs-tag->type tag1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
201 (type2 (cvs-tag->type tag2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
202 (name1 (cvs-tag->name tag1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 (name2 (cvs-tag->name tag2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
204 (unless (equal (cvs-tag->vlist tag1) (cvs-tag->vlist tag2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
205 (setf (cvs-tag->vlist tag1) nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
206 (if type1
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
207 (unless (or (not type2) (equal type1 type2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
208 (setf (cvs-tag->type tag1) nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
209 (setf (cvs-tag->type tag1) type2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
210 (if name1
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
211 (setf (cvs-tag->name tag1) (cvs-append name1 name2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
212 (setf (cvs-tag->name tag1) name2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
213 tag1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
214
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
215 (defun cvs-tree-print (tags printer column)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
216 "Print the tree of TAGS where each tag's string is given by PRINTER.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
217 PRINTER should accept both a tag (in which case it should return a string)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
218 or a string (in which case it should simply return its argument).
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
219 A tag cannot be a CONS. The return value can also be a list of strings,
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
220 if several nodes where merged into one.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
221 The tree will be printed no closer than column COLUMN."
|
49588
|
222
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
223 (let* ((eol (save-excursion (end-of-line) (current-column)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
224 (column (max (+ eol 2) column)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
225 (if (null tags) column
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
226 ;;(move-to-column-force column)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 (let* ((rev (cvs-car tags))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (name (funcall printer (cvs-car rev)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 (rest (append (cvs-cdr name) (cvs-cdr tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
230 (prefix
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 (or (= (forward-line 1) 0) (insert "\n"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 (cvs-tree-print rest printer column))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 (assert (>= prefix column))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 (move-to-column prefix t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 (assert (eolp))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 (insert (cvs-car name))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 (dolist (br (cvs-cdr rev))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 (let* ((column (current-column))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
240 (brrev (funcall printer (cvs-car br)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
241 (brlength (length (cvs-car brrev)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
242 (brfill (concat (make-string (/ brlength 2) ? ) "|"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
243 (prefix
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
244 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
245 (insert " -- ")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
246 (cvs-tree-print (cvs-append brrev brfill (cvs-cdr br))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
247 printer (current-column)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
248 (delete-region (save-excursion (move-to-column prefix) (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
249 (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
250 (insert " " (make-string (- prefix column 2) ?-) " ")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
251 (end-of-line)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
252 prefix))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 (defun cvs-tree-merge (tree1 tree2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 "Merge tags trees TREE1 and TREE2 into one.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256 BEWARE: because of stability issues, this is not a symetric operation."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
257 (assert (and (listp tree1) (listp tree2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
258 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
259 ((null tree1) tree2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
260 ((null tree2) tree1)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
261 (t
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 (let* ((rev1 (car tree1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
263 (tag1 (cvs-car rev1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
264 (vl1 (cvs-tag->vlist tag1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
265 (l1 (length vl1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
266 (rev2 (car tree2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
267 (tag2 (cvs-car rev2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
268 (vl2 (cvs-tag->vlist tag2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
269 (l2 (length vl2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
270 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
271 ((= l1 l2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
272 (case (cvs-tag-compare tag1 tag2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
273 (more1 (list* rev2 (cvs-tree-merge tree1 (cdr tree2))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
274 (more2 (list* rev1 (cvs-tree-merge (cdr tree1) tree2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
275 (equal
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
276 (cons (cons (cvs-tag-merge tag1 tag2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
277 (cvs-tree-merge (cvs-cdr rev1) (cvs-cdr rev2)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
278 (cvs-tree-merge (cdr tree1) (cdr tree2))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
279 ((> l1 l2)
|
33231
|
280 (cvs-tree-merge
|
55790
45bf91de4d41
(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
281 (list (cons (cvs-tag-make (butlast vl1)) tree1)) tree2))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
282 ((< l1 l2)
|
33231
|
283 (cvs-tree-merge
|
55790
45bf91de4d41
(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
284 tree1 (list (cons (cvs-tag-make (butlast vl2)) tree2)))))))))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
285
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
286 (defun cvs-tag-make-tag (tag)
|
30618
|
287 (let ((vl (mapcar 'string-to-number (split-string (nth 2 tag) "\\."))))
|
|
288 (cvs-tag-make vl (nth 0 tag) (intern (nth 1 tag)))))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
289
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 (defun cvs-tags->tree (tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
291 "Make a tree out of a list of TAGS."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
292 (let ((tags
|
33231
|
293 (mapcar
|
|
294 (lambda (tag)
|
|
295 (let ((tag (cvs-tag-make-tag tag)))
|
|
296 (list (if (not (eq (cvs-tag->type tag) 'branch)) tag
|
55790
45bf91de4d41
(cvs-tree-merge, cvs-tags->tree): Use `butlast', not `cvs-butlast'.
Juanma Barranquero <lekktu@gmail.com>
diff
changeset
|
297 (list (cvs-tag-make (butlast (cvs-tag->vlist tag)))
|
33231
|
298 tag)))))
|
|
299 tags)))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
300 (while (cdr tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
301 (let (tl)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
302 (while tags
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
303 (push (cvs-tree-merge (pop tags) (pop tags)) tl))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
304 (setq tags (nreverse tl))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
305 (car tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
306
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
307 (defun cvs-status-get-tags ()
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
308 "Look for a list of tags, read them in and delete them.
|
42206
|
309 Return nil if there was an empty list of tags and t if there wasn't
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
310 even a list. Else, return the list of tags where each element of
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
311 the list is a three-string list TAG, KIND, REV."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
312 (let ((tags nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
313 (if (not (re-search-forward cvs-status-tags-leader-re nil t)) t
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
314 (forward-char 1)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
315 (let ((pt (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
316 (lastrev nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
317 (case-fold-search t))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
318 (or
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
319 (looking-at "\\s-+no\\s-+tags")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
320
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
321 (progn ; normal listing
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
322 (while (looking-at "^[ \t]+\\([^ \t\n]+\\)[ \t]+(\\([a-z]+\\): \\(.+\\))$")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
323 (push (list (match-string 1) (match-string 2) (match-string 3)) tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
324 (forward-line 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
325 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
326 tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
327
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
328 (progn ; cvstree-style listing
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
329 (while (or (looking-at "^ .+\\(.\\) \\([0-9.]+\\): \\([^\n\t .0-9][^\n\t ]*\\)?$")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
330 (and lastrev
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
331 (looking-at "^ .+\\(\\) \\(8\\)? \\([^\n\t .0-9][^\n\t ]*\\)$")))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
332 (setq lastrev (or (match-string 2) lastrev))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
333 (push (list (match-string 3)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
334 (if (equal (match-string 1) " ") "branch" "revision")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
335 lastrev) tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
336 (forward-line 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
337 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
338 (setq tags (nreverse tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
339
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
340 (progn ; new tree style listing
|
33231
|
341 (let* ((re-lead "[ \t]*\\(-+\\)?\\(|\n?[ \t]+\\)*")
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
342 (re3 (concat re-lead "\\(\\.\\)?\\(" cvs-status-rev-re "\\)"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
343 (re2 (concat re-lead cvs-status-tag-re "\\(\\)"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
344 (re1 (concat re-lead cvs-status-tag-re
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
345 " (\\(" cvs-status-rev-re "\\))")))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
346 (while (or (looking-at re1) (looking-at re2) (looking-at re3))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
347 (push (list (match-string 3)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
348 (if (match-string 1) "branch" "revision")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
349 (match-string 4)) tags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
350 (goto-char (match-end 0))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
351 (when (eolp) (forward-char 1))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
352 (unless (looking-at "^$") (setq tags nil) (goto-char pt))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
353 (setq tags (nreverse tags))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
354
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
355 (delete-region pt (point)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
356 tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
357
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
358 (defvar font-lock-mode)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (defun cvs-refontify (beg end)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360 (when (and (boundp 'font-lock-mode)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
361 font-lock-mode
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
362 (fboundp 'font-lock-fontify-region))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
363 (font-lock-fontify-region (1- beg) (1+ end))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 (defun cvs-status-trees ()
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 "Look for a lists of tags, and replace them with trees."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 (interactive)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
368 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
369 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370 (let ((inhibit-read-only t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
371 (tags nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
372 (while (listp (setq tags (cvs-status-get-tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
373 ;;(let ((pt (save-excursion (forward-line -1) (point))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
374 (save-restriction
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (narrow-to-region (point) (point))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
376 ;;(newline)
|
33231
|
377 (combine-after-change-calls
|
|
378 (cvs-tree-print (cvs-tags->tree tags) 'cvs-tag->string 3)))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
379 ;;(cvs-refontify pt (point))
|
33231
|
380 ;;(sit-for 0)
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
381 ;;)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
382 ))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
383
|
33231
|
384 ;;;;
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
385 ;;;; CVSTree-style trees
|
33231
|
386 ;;;;
|
|
387
|
55076
|
388 (defvar cvs-tree-use-jisx0208 nil) ;Old compat var.
|
|
389 (defvar cvs-tree-use-charset
|
|
390 (cond
|
|
391 (cvs-tree-use-jisx0208 'jisx0208)
|
|
392 ((char-displayable-p ?��) 'unicode)
|
|
393 ((char-displayable-p (make-char 'japanese-jisx0208 40 44)) 'jisx0208))
|
33231
|
394 "*Non-nil if we should use the graphical glyphs from `japanese-jisx0208'.
|
|
395 Otherwise, default to ASCII chars like +, - and |.")
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
396
|
33231
|
397 (defconst cvs-tree-char-space
|
55076
|
398 (case cvs-tree-use-charset
|
|
399 (jisx0208 (make-char 'japanese-jisx0208 33 33))
|
|
400 (unicode " ")
|
|
401 (t " ")))
|
33231
|
402 (defconst cvs-tree-char-hbar
|
55076
|
403 (case cvs-tree-use-charset
|
|
404 (jisx0208 (make-char 'japanese-jisx0208 40 44))
|
|
405 (unicode "��")
|
|
406 (t "--")))
|
33231
|
407 (defconst cvs-tree-char-vbar
|
55076
|
408 (case cvs-tree-use-charset
|
|
409 (jisx0208 (make-char 'japanese-jisx0208 40 45))
|
|
410 (unicode "��")
|
|
411 (t "| ")))
|
33231
|
412 (defconst cvs-tree-char-branch
|
55076
|
413 (case cvs-tree-use-charset
|
|
414 (jisx0208 (make-char 'japanese-jisx0208 40 50))
|
|
415 (unicode "��")
|
|
416 (t "+-")))
|
33231
|
417 (defconst cvs-tree-char-eob ;end of branch
|
55076
|
418 (case cvs-tree-use-charset
|
|
419 (jisx0208 (make-char 'japanese-jisx0208 40 49))
|
|
420 (unicode "��")
|
|
421 (t "`-")))
|
33231
|
422 (defconst cvs-tree-char-bob ;beginning of branch
|
55076
|
423 (case cvs-tree-use-charset
|
|
424 (jisx0208 (make-char 'japanese-jisx0208 40 51))
|
|
425 (unicode "��")
|
|
426 (t "+-")))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
427
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
428 (defun cvs-tag-lessp (tag1 tag2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
429 (eq (cvs-tag-compare tag1 tag2) 'more2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
430
|
28249
|
431 (defvar cvs-tree-nomerge nil)
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
432
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
433 (defun cvs-status-cvstrees (&optional arg)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
434 "Look for a list of tags, and replace it with a tree.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
435 Optional prefix ARG chooses between two representations."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
436 (interactive "P")
|
55076
|
437 (when (and cvs-tree-use-charset
|
33231
|
438 (not enable-multibyte-characters))
|
|
439 ;; We need to convert the buffer from unibyte to multibyte
|
|
440 ;; since we'll use multibyte chars for the tree.
|
|
441 (let ((modified (buffer-modified-p))
|
|
442 (inhibit-read-only t)
|
|
443 (inhibit-modification-hooks t))
|
|
444 (unwind-protect
|
|
445 (progn
|
|
446 (decode-coding-region (point-min) (point-max) 'undecided)
|
|
447 (set-buffer-multibyte t))
|
|
448 (restore-buffer-modified-p modified))))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
449 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
450 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
451 (let ((inhibit-read-only t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
452 (tags nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
453 (cvs-tree-nomerge (if arg (not cvs-tree-nomerge) cvs-tree-nomerge)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 (while (listp (setq tags (cvs-status-get-tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 (let ((tags (mapcar 'cvs-tag-make-tag tags))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
456 ;;(pt (save-excursion (forward-line -1) (point)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
457 )
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
458 (setq tags (sort tags 'cvs-tag-lessp))
|
30887
|
459 (let* ((first (car tags))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
460 (prev (if (cvs-tag-p first)
|
30887
|
461 (list (car (cvs-tag->vlist first))) nil)))
|
33231
|
462 (combine-after-change-calls
|
|
463 (cvs-tree-tags-insert tags prev))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
464 ;;(cvs-refontify pt (point))
|
33231
|
465 ;;(sit-for 0)
|
|
466 ))))))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
467
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
468 (defun cvs-tree-tags-insert (tags prev)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
469 (when tags
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
470 (let* ((tag (car tags))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 (vlist (cvs-tag->vlist tag))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 (nprev ;"next prev"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
473 (let* ((next (cvs-car (cadr tags)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
474 (nprev (if (and cvs-tree-nomerge next
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
475 (equal vlist (cvs-tag->vlist next)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
476 prev vlist)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
477 (cvs-map (lambda (v p) v) nprev prev)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
478 (after (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
479 (newline)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
480 (cvs-tree-tags-insert (cdr tags) nprev)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
481 (pe t) ;"prev equal"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
482 (nas nil)) ;"next afters" to be returned
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
483 (insert " ")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
484 (do* ((vs vlist (cdr vs))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
485 (ps prev (cdr ps))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
486 (as after (cdr as)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
487 ((and (null as) (null vs) (null ps))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
488 (let ((revname (cvs-status-vl-to-str vlist)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
489 (if (cvs-every 'identity (cvs-map 'equal prev vlist))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
490 (insert (make-string (+ 4 (length revname)) ? )
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
491 (or (cvs-tag->name tag) ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
492 (insert " " revname ": " (or (cvs-tag->name tag) "")))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
493 (let* ((eq (and pe (equal (car ps) (car vs))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
494 (next-eq (equal (cadr ps) (cadr vs))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
495 (let* ((na+char
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
496 (if (car as)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
497 (if eq
|
33231
|
498 (if next-eq (cons t cvs-tree-char-vbar)
|
|
499 (cons t cvs-tree-char-branch))
|
|
500 (cons nil cvs-tree-char-bob))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
501 (if eq
|
33231
|
502 (if next-eq (cons nil cvs-tree-char-space)
|
|
503 (cons t cvs-tree-char-eob))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
504 (cons nil (if (and (eq (cvs-tag->type tag) 'branch)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
505 (cvs-every 'null as))
|
33231
|
506 cvs-tree-char-space
|
|
507 cvs-tree-char-hbar))))))
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
508 (insert (cdr na+char))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
509 (push (car na+char) nas))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
510 (setq pe eq)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
511 (nreverse nas))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
512
|
49588
|
513 ;;;;
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
514 ;;;; Merged trees from different files
|
49588
|
515 ;;;;
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
516
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
517 (defun cvs-tree-fuzzy-merge-1 (trees tree prev)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
518 )
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
519
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
520 (defun cvs-tree-fuzzy-merge (trees tree)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
521 "Do the impossible: merge TREE into TREES."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 ())
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
523
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
524 (defun cvs-tree ()
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
525 "Get tags from the status output and merge tham all into a big tree."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
526 (save-excursion
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
527 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
528 (let ((inhibit-read-only t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
529 (trees (make-vector 31 0)) tree)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 (while (listp (setq tree (cvs-tags->tree (cvs-status-get-tags))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
531 (cvs-tree-fuzzy-merge trees tree))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
532 (erase-buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 (let ((cvs-tag-print-rev nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
534 (cvs-tree-print tree 'cvs-tag->string 3)))))
|
49588
|
535
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
536
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
537 (provide 'cvs-status)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538
|
58159
|
539 ;; arch-tag: db8b5094-d02a-473e-a476-544e89ff5ad0
|
28088
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
540 ;;; cvs-status.el ends here
|