Commit | Line | Data |
---|---|---|
e57a1038 | 1 | ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output |
5b467bf4 | 2 | |
c4f6e489 | 3 | ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, |
114f9c96 | 4 | ;; 2008, 2009, 2010 Free Software Foundation, Inc. |
5b467bf4 | 5 | |
cc1eecfd | 6 | ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
9766adfb | 7 | ;; Keywords: rcs, sccs, cvs, log, vc, tools |
5b467bf4 SM |
8 | |
9 | ;; This file is part of GNU Emacs. | |
10 | ||
eb3fa2cf | 11 | ;; GNU Emacs is free software: you can redistribute it and/or modify |
5b467bf4 | 12 | ;; it under the terms of the GNU General Public License as published by |
eb3fa2cf GM |
13 | ;; the Free Software Foundation, either version 3 of the License, or |
14 | ;; (at your option) any later version. | |
5b467bf4 SM |
15 | |
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. | |
20 | ||
21 | ;; You should have received a copy of the GNU General Public License | |
eb3fa2cf | 22 | ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
5b467bf4 SM |
23 | |
24 | ;;; Commentary: | |
25 | ||
aa230d94 SM |
26 | ;; Major mode to browse revision log histories. |
27 | ;; Currently supports the format output by: | |
62c5f375 | 28 | ;; RCS, SCCS, CVS, Subversion, and DaRCS. |
aa230d94 SM |
29 | |
30 | ;; Examples of log output: | |
31 | ||
32 | ;;;; RCS/CVS: | |
33 | ||
34 | ;; ---------------------------- | |
35 | ;; revision 1.35 locked by: turlutut | |
36 | ;; date: 2005-03-22 18:48:38 +0000; author: monnier; state: Exp; lines: +6 -8 | |
37 | ;; (gnus-display-time-event-handler): | |
38 | ;; Check display-time-timer at runtime rather than only at load time | |
39 | ;; in case display-time-mode is turned off in the mean time. | |
40 | ;; ---------------------------- | |
41 | ;; revision 1.34 | |
42 | ;; date: 2005-02-09 15:50:38 +0000; author: kfstorm; state: Exp; lines: +7 -7 | |
43 | ;; branches: 1.34.2; | |
44 | ;; Change release version from 21.4 to 22.1 throughout. | |
45 | ;; Change development version from 21.3.50 to 22.0.50. | |
46 | ||
47 | ;;;; SCCS: | |
48 | ||
49 | ;;;; Subversion: | |
50 | ||
813e8939 ER |
51 | ;; ------------------------------------------------------------------------ |
52 | ;; r4622 | ckuethe | 2007-12-23 18:18:01 -0500 (Sun, 23 Dec 2007) | 2 lines | |
20ac86f4 | 53 | ;; |
813e8939 | 54 | ;; uBlox AEK-4T in binary mode. Added to unstable because it breaks gpsfake |
20ac86f4 | 55 | ;; |
813e8939 ER |
56 | ;; ------------------------------------------------------------------------ |
57 | ;; r4621 | ckuethe | 2007-12-23 16:48:11 -0500 (Sun, 23 Dec 2007) | 3 lines | |
20ac86f4 | 58 | ;; |
813e8939 ER |
59 | ;; Add a note about requiring usbfs to use the garmin gps18 (usb) |
60 | ;; Mention firmware testing the AC12 with firmware BQ00 and BQ04 | |
20ac86f4 | 61 | ;; |
813e8939 ER |
62 | ;; ------------------------------------------------------------------------ |
63 | ;; r4620 | ckuethe | 2007-12-23 15:52:34 -0500 (Sun, 23 Dec 2007) | 1 line | |
20ac86f4 | 64 | ;; |
813e8939 ER |
65 | ;; add link to latest hardware reference |
66 | ;; ------------------------------------------------------------------------ | |
67 | ;; r4619 | ckuethe | 2007-12-23 14:37:31 -0500 (Sun, 23 Dec 2007) | 1 line | |
20ac86f4 | 68 | ;; |
813e8939 ER |
69 | ;; there is now a regression test for AC12 without raw data output |
70 | ||
62c5f375 SM |
71 | ;;;; Darcs: |
72 | ||
73 | ;; Changes to darcsum.el: | |
20ac86f4 | 74 | ;; |
62c5f375 SM |
75 | ;; Mon Nov 28 15:19:38 GMT 2005 Dave Love <fx@gnu.org> |
76 | ;; * Abstract process startup into darcsum-start-process. Use TERM=dumb. | |
20ac86f4 | 77 | ;; TERM=dumb avoids escape characters, at least, for any old darcs that |
62c5f375 | 78 | ;; doesn't understand DARCS_DONT_COLOR & al. |
20ac86f4 | 79 | ;; |
62c5f375 SM |
80 | ;; Thu Nov 24 15:20:45 GMT 2005 Dave Love <fx@gnu.org> |
81 | ;; * darcsum-mode-related changes. | |
82 | ;; Don't call font-lock-mode (unnecessary) or use-local-map (redundant). | |
83 | ;; Use mode-class 'special. Add :group. | |
84 | ;; Add trailing-whitespace option to mode hook and fix | |
85 | ;; darcsum-display-changeset not to use trailing whitespace. | |
86 | ||
813e8939 ER |
87 | ;;;; Mercurial |
88 | ||
89 | ;; changeset: 11:8ff1a4166444 | |
90 | ;; tag: tip | |
91 | ;; user: Eric S. Raymond <esr@thyrsus.com> | |
92 | ;; date: Wed Dec 26 12:18:58 2007 -0500 | |
93 | ;; summary: Explain keywords. Add markup fixes. | |
20ac86f4 | 94 | ;; |
813e8939 ER |
95 | ;; changeset: 10:20abc7ab09c3 |
96 | ;; user: Eric S. Raymond <esr@thyrsus.com> | |
97 | ;; date: Wed Dec 26 11:37:28 2007 -0500 | |
98 | ;; summary: Typo fixes. | |
20ac86f4 | 99 | ;; |
813e8939 ER |
100 | ;; changeset: 9:ada9f4da88aa |
101 | ;; user: Eric S. Raymond <esr@thyrsus.com> | |
102 | ;; date: Wed Dec 26 11:23:00 2007 -0500 | |
103 | ;; summary: Add RCS example session. | |
104 | ||
aa230d94 | 105 | ;;; Todo: |
5b467bf4 | 106 | |
5b467bf4 | 107 | ;; - add ability to modify a log-entry (via cvs-mode-admin ;-) |
e57a1038 | 108 | ;; - remove references to cvs-* |
aa230d94 | 109 | ;; - make it easier to add support for new backends without changing the code. |
5b467bf4 SM |
110 | |
111 | ;;; Code: | |
112 | ||
113 | (eval-when-compile (require 'cl)) | |
5b467bf4 | 114 | (require 'pcvs-util) |
ac3f4c6f | 115 | (autoload 'vc-find-revision "vc") |
c66b7ac0 | 116 | (autoload 'vc-diff-internal "vc") |
5b467bf4 | 117 | |
71f6f911 JB |
118 | (defvar cvs-minor-wrap-function) |
119 | ||
5b467bf4 | 120 | (defgroup log-view nil |
e57a1038 | 121 | "Major mode for browsing log output of RCS/CVS/SCCS." |
5b467bf4 SM |
122 | :group 'pcl-cvs |
123 | :prefix "log-view-") | |
124 | ||
56a03f46 GM |
125 | ;; Needed because log-view-mode-map inherits from widget-keymap. (Bug#5311) |
126 | (require 'wid-edit) | |
127 | ||
5b467bf4 | 128 | (easy-mmode-defmap log-view-mode-map |
c9829c70 | 129 | '(("z" . kill-this-buffer) |
9eaeec5b | 130 | ("q" . quit-window) |
83db937c | 131 | ("m" . log-view-toggle-mark-entry) |
9b64a7f0 | 132 | ("e" . log-view-modify-change-comment) |
99cb8c8b | 133 | ("d" . log-view-diff) |
238a0f3a | 134 | ("=" . log-view-diff) |
6653c6b7 | 135 | ("D" . log-view-diff-changeset) |
a3f5d84d | 136 | ("a" . log-view-annotate-version) |
ac3f4c6f | 137 | ("f" . log-view-find-revision) |
99cb8c8b | 138 | ("n" . log-view-msg-next) |
cdbb990f | 139 | ("p" . log-view-msg-prev) |
25edda53 DN |
140 | ("\t" . log-view-msg-next) |
141 | ([backtab] . log-view-msg-prev) | |
cdbb990f SM |
142 | ("N" . log-view-file-next) |
143 | ("P" . log-view-file-prev) | |
e2c2a3e2 KG |
144 | ("\M-n" . log-view-file-next) |
145 | ("\M-p" . log-view-file-prev)) | |
5b467bf4 | 146 | "Log-View's keymap." |
fb0c18ff | 147 | :inherit widget-keymap |
c9829c70 | 148 | :group 'log-view) |
5b467bf4 | 149 | |
d621bc0a DN |
150 | (easy-menu-define log-view-mode-menu log-view-mode-map |
151 | "Log-View Display Menu" | |
152 | `("Log-View" | |
153 | ;; XXX Do we need menu entries for these? | |
154 | ;; ["Quit" quit-window] | |
155 | ;; ["Kill This Buffer" kill-this-buffer] | |
799224fe DN |
156 | ["Mark Log Entry for Diff" set-mark-command |
157 | :help ""] | |
158 | ["Diff Revisions" log-view-diff | |
159 | :help "Get the diff between two revisions"] | |
6653c6b7 DN |
160 | ["Changeset Diff" log-view-diff-changeset |
161 | :help "Get the changeset diff between two revisions"] | |
799224fe DN |
162 | ["Visit Version" log-view-find-revision |
163 | :help "Visit the version at point"] | |
164 | ["Annotate Version" log-view-annotate-version | |
165 | :help "Annotate the version at point"] | |
031f1766 DN |
166 | ["Modify Log Comment" log-view-modify-change-comment |
167 | :help "Edit the change comment displayed at point"] | |
168 | "-----" | |
799224fe DN |
169 | ["Next Log Entry" log-view-msg-next |
170 | :help "Go to the next count'th log message"] | |
171 | ["Previous Log Entry" log-view-msg-prev | |
172 | :help "Go to the previous count'th log message"] | |
173 | ["Next File" log-view-file-next | |
174 | :help "Go to the next count'th file"] | |
175 | ["Previous File" log-view-file-prev | |
176 | :help "Go to the previous count'th file"])) | |
d621bc0a | 177 | |
5b467bf4 SM |
178 | (defvar log-view-mode-hook nil |
179 | "Hook run at the end of `log-view-mode'.") | |
180 | ||
d842de85 | 181 | (defface log-view-file |
5b467bf4 | 182 | '((((class color) (background light)) |
1fd714a4 RS |
183 | (:background "grey70" :weight bold)) |
184 | (t (:weight bold))) | |
5b467bf4 SM |
185 | "Face for the file header line in `log-view-mode'." |
186 | :group 'log-view) | |
c4f6e489 | 187 | (define-obsolete-face-alias 'log-view-file-face 'log-view-file "22.1") |
d842de85 | 188 | (defvar log-view-file-face 'log-view-file) |
5b467bf4 | 189 | |
d842de85 | 190 | (defface log-view-message |
5b467bf4 SM |
191 | '((((class color) (background light)) |
192 | (:background "grey85")) | |
1fd714a4 | 193 | (t (:weight bold))) |
5b467bf4 SM |
194 | "Face for the message header line in `log-view-mode'." |
195 | :group 'log-view) | |
d842de85 | 196 | ;; backward-compatibility alias |
c4f6e489 | 197 | (define-obsolete-face-alias 'log-view-message-face 'log-view-message "22.1") |
d842de85 | 198 | (defvar log-view-message-face 'log-view-message) |
5b467bf4 | 199 | |
18b2e5b9 | 200 | (defvar log-view-file-re |
95588f91 SM |
201 | (concat "^\\(?:Working file: \\(?1:.+\\)" ;RCS and CVS. |
202 | ;; Subversion has no such thing?? | |
203 | "\\|\\(?:SCCS/s\\.\\|Changes to \\)\\(?1:.+\\):" ;SCCS and Darcs. | |
2ef3b3fe SM |
204 | "\\)\n") ;Include the \n for font-lock reasons. |
205 | "Regexp matching the text identifying the file. | |
206 | The match group number 1 should match the file name itself.") | |
aa230d94 | 207 | |
6653c6b7 DN |
208 | (defvar log-view-per-file-logs t |
209 | "Set if to t if the logs are shown one file at a time.") | |
210 | ||
18b2e5b9 | 211 | (defvar log-view-message-re |
95588f91 SM |
212 | (concat "^\\(?:revision \\(?1:[.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS. |
213 | "\\|r\\(?1:[0-9]+\\) | .* | .*" ; Subversion. | |
214 | "\\|D \\(?1:[.0-9]+\\) .*" ; SCCS. | |
62c5f375 SM |
215 | ;; Darcs doesn't have revision names. VC-darcs uses patch names |
216 | ;; instead. Darcs patch names are hashcodes, which do not appear | |
217 | ;; in the log output :-(, but darcs accepts any prefix of the log | |
218 | ;; message as a patch name, so we match the first line of the log | |
219 | ;; message. | |
220 | ;; First loosely match the date format. | |
221 | (concat "\\|[^ \n].*[^0-9\n][0-9][0-9]:[0-9][0-9][^0-9\n].*[^ \n]" | |
222 | ;;Email of user and finally Msg, used as revision name. | |
95588f91 | 223 | " .*@.*\n\\(?: \\* \\(?1:.*\\)\\)?") |
2ef3b3fe SM |
224 | "\\)$") |
225 | "Regexp matching the text identifying a revision. | |
226 | The match group number 1 should match the revision number itself.") | |
5b467bf4 | 227 | |
18b2e5b9 SM |
228 | (defvar log-view-font-lock-keywords |
229 | ;; We use `eval' so as to use the buffer-local value of log-view-file-re | |
230 | ;; and log-view-message-re, if applicable. | |
231 | '((eval . `(,log-view-file-re | |
232 | (1 (if (boundp 'cvs-filename-face) cvs-filename-face)) | |
233 | (0 log-view-file-face append))) | |
234 | (eval . `(,log-view-message-re . log-view-message-face)))) | |
5bdc71d0 | 235 | |
5b467bf4 SM |
236 | (defconst log-view-font-lock-defaults |
237 | '(log-view-font-lock-keywords t nil nil nil)) | |
238 | ||
6653c6b7 DN |
239 | (defvar log-view-vc-fileset nil |
240 | "Set this to the fileset corresponding to the current log.") | |
241 | ||
242 | (defvar log-view-vc-backend nil | |
243 | "Set this to the VC backend that created the current log.") | |
244 | ||
edb33387 | 245 | ;;;; |
5b467bf4 | 246 | ;;;; Actual code |
edb33387 | 247 | ;;;; |
5b467bf4 SM |
248 | |
249 | ;;;###autoload | |
c9829c70 | 250 | (define-derived-mode log-view-mode special-mode "Log-View" |
5b467bf4 | 251 | "Major mode for browsing CVS log output." |
99cb8c8b | 252 | (setq buffer-read-only t) |
5b467bf4 | 253 | (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults) |
20ac86f4 | 254 | (set (make-local-variable 'beginning-of-defun-function) |
a3f5d84d | 255 | 'log-view-beginning-of-defun) |
20ac86f4 | 256 | (set (make-local-variable 'end-of-defun-function) |
a3f5d84d | 257 | 'log-view-end-of-defun) |
8117868f DN |
258 | (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap) |
259 | (hack-dir-local-variables-non-file-buffer)) | |
5b467bf4 SM |
260 | |
261 | ;;;; | |
262 | ;;;; Navigation | |
263 | ;;;; | |
264 | ||
cdbb990f SM |
265 | ;; define log-view-{msg,file}-{next,prev} |
266 | (easy-mmode-define-navigation log-view-msg log-view-message-re "log message") | |
267 | (easy-mmode-define-navigation log-view-file log-view-file-re "file") | |
5b467bf4 | 268 | |
3e87f5fc SM |
269 | (defun log-view-goto-rev (rev) |
270 | (goto-char (point-min)) | |
271 | (ignore-errors | |
272 | (while (not (equal rev (log-view-current-tag))) | |
273 | (log-view-msg-next)) | |
274 | t)) | |
275 | ||
5b467bf4 SM |
276 | ;;;; |
277 | ;;;; Linkage to PCL-CVS (mostly copied from cvs-status.el) | |
278 | ;;;; | |
279 | ||
280 | (defconst log-view-dir-re "^cvs[.ex]* [a-z]+: Logging \\(.+\\)$") | |
281 | ||
282 | (defun log-view-current-file () | |
283 | (save-excursion | |
284 | (forward-line 1) | |
285 | (or (re-search-backward log-view-file-re nil t) | |
22f4e5c1 | 286 | (re-search-forward log-view-file-re nil t) |
ccf89694 | 287 | (error "Unable to determine the current file")) |
95588f91 | 288 | (let* ((file (match-string 1)) |
5b467bf4 SM |
289 | (cvsdir (and (re-search-backward log-view-dir-re nil t) |
290 | (match-string 1))) | |
e57a1038 SM |
291 | (pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re) |
292 | (re-search-backward cvs-pcl-cvs-dirchange-re nil t) | |
5b467bf4 SM |
293 | (match-string 1))) |
294 | (dir "")) | |
295 | (let ((default-directory "")) | |
296 | (when pcldir (setq dir (expand-file-name pcldir dir))) | |
99cb8c8b SS |
297 | (when cvsdir (setq dir (expand-file-name cvsdir dir)))) |
298 | (expand-file-name file dir)))) | |
5b467bf4 | 299 | |
99cb8c8b | 300 | (defun log-view-current-tag (&optional where) |
cdbb990f | 301 | (save-excursion |
99cb8c8b | 302 | (when where (goto-char where)) |
cdbb990f SM |
303 | (forward-line 1) |
304 | (let ((pt (point))) | |
305 | (when (re-search-backward log-view-message-re nil t) | |
3a44b2ae | 306 | (let ((rev (match-string-no-properties 1))) |
cdbb990f SM |
307 | (unless (re-search-forward log-view-file-re pt t) |
308 | rev)))))) | |
5b467bf4 | 309 | |
83db937c | 310 | (defun log-view-toggle-mark-entry () |
a0902360 DN |
311 | "Toggle the marked state for the log entry at point. |
312 | Individual log entries can be marked and unmarked. The marked | |
313 | entries are denoted by changing their background color. | |
314 | `log-view-get-marked' returns the list of tags for the marked | |
315 | log entries." | |
83db937c DN |
316 | (interactive) |
317 | (save-excursion | |
318 | (forward-line 1) | |
319 | (let ((pt (point))) | |
320 | (when (re-search-backward log-view-message-re nil t) | |
321 | (let ((beg (match-beginning 0)) | |
322 | end ov ovlist found tag) | |
323 | (unless (re-search-forward log-view-file-re pt t) | |
3a44b2ae DN |
324 | ;; Look to see if the current entry is marked. |
325 | (setq found (get-char-property (point) 'log-view-self)) | |
83db937c | 326 | (if found |
3a44b2ae DN |
327 | (delete-overlay found) |
328 | ;; Create an overlay that covers this entry and change | |
813e8939 | 329 | ;; its color. |
83db937c | 330 | (setq tag (log-view-current-tag (point))) |
83db937c | 331 | (forward-line 1) |
3a44b2ae | 332 | (setq end |
83db937c DN |
333 | (if (re-search-forward log-view-message-re nil t) |
334 | (match-beginning 0) | |
335 | (point-max))) | |
336 | (setq ov (make-overlay beg end)) | |
337 | (overlay-put ov 'face 'log-view-file) | |
3a44b2ae DN |
338 | ;; This is used to check if the overlay is present. |
339 | (overlay-put ov 'log-view-self ov) | |
83db937c DN |
340 | (overlay-put ov 'log-view-marked tag)))))))) |
341 | ||
3a44b2ae | 342 | (defun log-view-get-marked () |
a0902360 | 343 | "Return the list of tags for the marked log entries." |
3a44b2ae DN |
344 | (save-excursion |
345 | (let ((pos (point-min)) | |
346 | marked-list ov) | |
347 | (while (setq pos (next-single-property-change pos 'face)) | |
348 | (when (setq ov (get-char-property pos 'log-view-self)) | |
349 | (push (overlay-get ov 'log-view-marked) marked-list) | |
350 | (setq pos (overlay-end ov)))) | |
351 | marked-list))) | |
352 | ||
a3f5d84d DN |
353 | (defun log-view-beginning-of-defun () |
354 | ;; This assumes that a log entry starts with a line matching | |
355 | ;; `log-view-message-re'. Modes that derive from `log-view-mode' | |
356 | ;; for which this assumption is not valid will have to provide | |
357 | ;; another implementation of this function. `log-view-msg-prev' | |
358 | ;; does a similar job to this function, we can't use it here | |
359 | ;; directly because it prints messages that are not appropriate in | |
360 | ;; this context and it does not move to the beginning of the buffer | |
361 | ;; when the point is before the first log entry. | |
362 | ||
363 | ;; `log-view-beginning-of-defun' and `log-view-end-of-defun' have | |
364 | ;; been checked to work with logs produced by RCS, CVS, git, | |
365 | ;; mercurial and subversion. | |
366 | ||
367 | (re-search-backward log-view-message-re nil 'move)) | |
368 | ||
369 | (defun log-view-end-of-defun () | |
370 | ;; The idea in this function is to search for the beginning of the | |
371 | ;; next log entry using `log-view-message-re' and then go back one | |
372 | ;; line when finding it. Modes that derive from `log-view-mode' for | |
373 | ;; which this assumption is not valid will have to provide another | |
374 | ;; implementation of this function. | |
375 | ||
376 | ;; Look back and if there is no entry there it means we are before | |
377 | ;; the first log entry, so go forward until finding one. | |
378 | (unless (save-excursion (re-search-backward log-view-message-re nil t)) | |
379 | (re-search-forward log-view-message-re nil t)) | |
380 | ||
381 | ;; In case we are at the end of log entry going forward a line will | |
382 | ;; make us find the next entry when searching. If we are inside of | |
383 | ;; an entry going forward a line will still keep the point inside | |
384 | ;; the same entry. | |
385 | (forward-line 1) | |
386 | ||
387 | ;; In case we are at the beginning of an entry, move past it. | |
388 | (when (looking-at log-view-message-re) | |
389 | (goto-char (match-end 0)) | |
390 | (forward-line 1)) | |
391 | ||
392 | ;; Search for the start of the next log entry. Go to the end of the | |
393 | ;; buffer if we could not find a next entry. | |
394 | (when (re-search-forward log-view-message-re nil 'move) | |
395 | (goto-char (match-beginning 0)) | |
396 | (forward-line -1))) | |
397 | ||
aa230d94 SM |
398 | (defvar cvs-minor-current-files) |
399 | (defvar cvs-branch-prefix) | |
400 | (defvar cvs-secondary-branch-prefix) | |
401 | ||
5b467bf4 SM |
402 | (defun log-view-minor-wrap (buf f) |
403 | (let ((data (with-current-buffer buf | |
243afed7 SM |
404 | (let* ((beg (point)) |
405 | (end (if mark-active (mark) (point))) | |
cbc98273 JL |
406 | (fr (log-view-current-tag beg)) |
407 | (to (log-view-current-tag end))) | |
408 | (when (string-equal fr to) | |
409 | (save-excursion | |
410 | (goto-char end) | |
411 | (log-view-msg-next) | |
412 | (setq to (log-view-current-tag)))) | |
413 | (cons | |
243afed7 SM |
414 | ;; The first revision has to be the one at point, for |
415 | ;; operations that only take one revision | |
416 | ;; (e.g. cvs-mode-edit). | |
417 | (cons (log-view-current-file) fr) | |
418 | (cons (log-view-current-file) to)))))) | |
5b467bf4 SM |
419 | (let ((cvs-branch-prefix (cdar data)) |
420 | (cvs-secondary-branch-prefix (and (cdar data) (cddr data))) | |
421 | (cvs-minor-current-files | |
422 | (cons (caar data) | |
423 | (when (and (cadr data) (not (equal (caar data) (cadr data)))) | |
424 | (list (cadr data))))) | |
425 | ;; FIXME: I need to force because the fileinfos are UNKNOWN | |
426 | (cvs-force-command "/F")) | |
427 | (funcall f)))) | |
428 | ||
ac3f4c6f | 429 | (defun log-view-find-revision (pos) |
c0313667 AS |
430 | "Visit the version at point." |
431 | (interactive "d") | |
6653c6b7 DN |
432 | (unless log-view-per-file-logs |
433 | (when (> (length log-view-vc-fileset) 1) | |
434 | (error "Multiple files shown in this buffer, cannot use this command here"))) | |
c0313667 AS |
435 | (save-excursion |
436 | (goto-char pos) | |
6653c6b7 DN |
437 | (switch-to-buffer (vc-find-revision (if log-view-per-file-logs |
438 | (log-view-current-file) | |
439 | (car log-view-vc-fileset)) | |
440 | (log-view-current-tag))))) | |
c0313667 | 441 | |
9b64a7f0 ER |
442 | |
443 | (defun log-view-extract-comment () | |
444 | "Parse comment from around the current point in the log." | |
445 | (save-excursion | |
446 | (let (st en (backend (vc-backend (log-view-current-file)))) | |
447 | (log-view-end-of-defun) | |
448 | (cond ((eq backend 'SVN) | |
449 | (forward-line -1))) | |
450 | (setq en (point)) | |
451 | (log-view-beginning-of-defun) | |
452 | (cond ((memq backend '(SCCS RCS CVS MCVS SVN)) | |
453 | (forward-line 2)) | |
454 | ((eq backend 'Hg) | |
455 | (forward-line 4) | |
20ac86f4 | 456 | (re-search-forward "summary: *" nil t))) |
9b64a7f0 ER |
457 | (setq st (point)) |
458 | (buffer-substring st en)))) | |
459 | ||
8df5b06d GM |
460 | (declare-function vc-modify-change-comment "vc" (files rev oldcomment)) |
461 | ||
9b64a7f0 ER |
462 | (defun log-view-modify-change-comment () |
463 | "Edit the change comment displayed at point." | |
464 | (interactive) | |
6653c6b7 DN |
465 | (vc-modify-change-comment (list (if log-view-per-file-logs |
466 | (log-view-current-file) | |
467 | (car log-view-vc-fileset))) | |
468 | (log-view-current-tag) | |
469 | (log-view-extract-comment))) | |
9b64a7f0 | 470 | |
a3f5d84d DN |
471 | (defun log-view-annotate-version (pos) |
472 | "Annotate the version at point." | |
473 | (interactive "d") | |
6653c6b7 DN |
474 | (unless log-view-per-file-logs |
475 | (when (> (length log-view-vc-fileset) 1) | |
476 | (error "Multiple files shown in this buffer, cannot use this command here"))) | |
a3f5d84d DN |
477 | (save-excursion |
478 | (goto-char pos) | |
c9c95fc3 CY |
479 | (vc-annotate (if log-view-per-file-logs |
480 | (log-view-current-file) | |
481 | (car log-view-vc-fileset)) | |
482 | (log-view-current-tag)))) | |
a3f5d84d | 483 | |
467ee23f SM |
484 | ;; |
485 | ;; diff | |
486 | ;; | |
99cb8c8b SS |
487 | |
488 | (defun log-view-diff (beg end) | |
e8171d36 JL |
489 | "Get the diff between two revisions. |
490 | If the mark is not active or the mark is on the revision at point, | |
491 | get the diff between the revision at point and its previous revision. | |
492 | Otherwise, get the diff between the revisions where the region starts | |
1acec32e SM |
493 | and ends. |
494 | Contrary to `log-view-diff-changeset', it will only show the part of the | |
495 | changeset that affected the currently considered file(s)." | |
da4ae7d3 JL |
496 | (interactive |
497 | (list (if mark-active (region-beginning) (point)) | |
498 | (if mark-active (region-end) (point)))) | |
99cb8c8b SS |
499 | (let ((fr (log-view-current-tag beg)) |
500 | (to (log-view-current-tag end))) | |
501 | (when (string-equal fr to) | |
502 | (save-excursion | |
503 | (goto-char end) | |
504 | (log-view-msg-next) | |
505 | (setq to (log-view-current-tag)))) | |
c66b7ac0 DN |
506 | (vc-diff-internal |
507 | t (list log-view-vc-backend | |
508 | (if log-view-per-file-logs | |
509 | (list (log-view-current-file)) | |
510 | log-view-vc-fileset)) | |
511 | to fr))) | |
6653c6b7 | 512 | |
20ac86f4 JB |
513 | (declare-function vc-diff-internal "vc" |
514 | (async vc-fileset rev1 rev2 &optional verbose)) | |
515 | ||
6653c6b7 DN |
516 | (defun log-view-diff-changeset (beg end) |
517 | "Get the diff between two revisions. | |
518 | If the mark is not active or the mark is on the revision at point, | |
519 | get the diff between the revision at point and its previous revision. | |
520 | Otherwise, get the diff between the revisions where the region starts | |
1acec32e SM |
521 | and ends. |
522 | Contrary to `log-view-diff', it will show the whole changeset including | |
523 | the changes that affected other files than the currently considered file(s)." | |
6653c6b7 DN |
524 | (interactive |
525 | (list (if mark-active (region-beginning) (point)) | |
526 | (if mark-active (region-end) (point)))) | |
527 | (when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file) | |
528 | (error "The %s backend does not support changeset diffs" log-view-vc-backend)) | |
529 | (let ((fr (log-view-current-tag beg)) | |
530 | (to (log-view-current-tag end))) | |
531 | (when (string-equal fr to) | |
532 | ;; TO and FR are the same, look at the previous revision. | |
533 | (setq to (vc-call-backend log-view-vc-backend 'previous-revision nil fr))) | |
534 | (vc-diff-internal | |
535 | t | |
536 | ;; We want to see the diff for all the files in the changeset, so | |
537 | ;; pass NIL for the file list. The value passed here should | |
538 | ;; follow what `vc-deduce-fileset' returns. | |
539 | (list log-view-vc-backend nil) | |
540 | to fr))) | |
99cb8c8b | 541 | |
5b467bf4 | 542 | (provide 'log-view) |
cdbb990f | 543 | |
9be92b96 | 544 | ;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f |
5b467bf4 | 545 | ;;; log-view.el ends here |