log-view.el 22.6 KB
Newer Older
Xue Fuqiao's avatar
Xue Fuqiao committed
1
;;; log-view.el --- Major mode for browsing revision log histories -*- lexical-binding: t -*-
Stefan Monnier's avatar
Stefan Monnier committed
2

Paul Eggert's avatar
Paul Eggert committed
3
;; Copyright (C) 1999-2016 Free Software Foundation, Inc.
Stefan Monnier's avatar
Stefan Monnier committed
4

Stefan Monnier's avatar
Stefan Monnier committed
5
;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
Xue Fuqiao's avatar
Xue Fuqiao committed
6
;; Keywords: tools, vc
Stefan Monnier's avatar
Stefan Monnier committed
7 8 9

;; This file is part of GNU Emacs.

10
;; GNU Emacs is free software: you can redistribute it and/or modify
Stefan Monnier's avatar
Stefan Monnier committed
11
;; it under the terms of the GNU General Public License as published by
12 13
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
Stefan Monnier's avatar
Stefan Monnier committed
14 15 16 17 18 19 20

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; 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/>.
Stefan Monnier's avatar
Stefan Monnier committed
22 23 24

;;; Commentary:

25 26
;; Major mode to browse revision log histories.
;; Currently supports the format output by:
Xue Fuqiao's avatar
Xue Fuqiao committed
27
;; SCCS, RCS, CVS, Subversion, DaRCS, and Mercurial.
28 29 30

;; Examples of log output:

Xue Fuqiao's avatar
Xue Fuqiao committed
31 32
;;;; SCCS:

33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
;;;; RCS/CVS:

;; ----------------------------
;; revision 1.35	locked by: turlutut
;; date: 2005-03-22 18:48:38 +0000;  author: monnier;  state: Exp;  lines: +6 -8
;; (gnus-display-time-event-handler):
;; Check display-time-timer at runtime rather than only at load time
;; in case display-time-mode is turned off in the mean time.
;; ----------------------------
;; revision 1.34
;; date: 2005-02-09 15:50:38 +0000;  author: kfstorm;  state: Exp;  lines: +7 -7
;; branches:  1.34.2;
;; Change release version from 21.4 to 22.1 throughout.
;; Change development version from 21.3.50 to 22.0.50.

;;;; Subversion:

50 51
;; ------------------------------------------------------------------------
;; r4622 | ckuethe | 2007-12-23 18:18:01 -0500 (Sun, 23 Dec 2007) | 2 lines
52
;;
53
;; uBlox AEK-4T in binary mode. Added to unstable because it breaks gpsfake
54
;;
55 56
;; ------------------------------------------------------------------------
;; r4621 | ckuethe | 2007-12-23 16:48:11 -0500 (Sun, 23 Dec 2007) | 3 lines
57
;;
58 59
;; Add a note about requiring usbfs to use the garmin gps18 (usb)
;; Mention firmware testing the AC12 with firmware BQ00 and BQ04
60
;;
61 62
;; ------------------------------------------------------------------------
;; r4620 | ckuethe | 2007-12-23 15:52:34 -0500 (Sun, 23 Dec 2007) | 1 line
63
;;
64 65 66
;; add link to latest hardware reference
;; ------------------------------------------------------------------------
;; r4619 | ckuethe | 2007-12-23 14:37:31 -0500 (Sun, 23 Dec 2007) | 1 line
67
;;
68 69
;; there is now a regression test for AC12 without raw data output

70 71 72
;;;; Darcs:

;; Changes to darcsum.el:
73
;;
74 75
;; Mon Nov 28 15:19:38 GMT 2005  Dave Love <fx@gnu.org>
;;   * Abstract process startup into darcsum-start-process.  Use TERM=dumb.
76
;;   TERM=dumb avoids escape characters, at least, for any old darcs that
77
;;   doesn't understand DARCS_DONT_COLOR & al.
78
;;
79 80 81 82 83 84 85
;; Thu Nov 24 15:20:45 GMT 2005  Dave Love <fx@gnu.org>
;;   * darcsum-mode-related changes.
;;   Don't call font-lock-mode (unnecessary) or use-local-map (redundant).
;;   Use mode-class 'special.  Add :group.
;;   Add trailing-whitespace option to mode hook and fix
;;   darcsum-display-changeset not to use trailing whitespace.

86 87 88 89 90 91 92
;;;; Mercurial

;; changeset:   11:8ff1a4166444
;; tag:         tip
;; user:        Eric S. Raymond <esr@thyrsus.com>
;; date:        Wed Dec 26 12:18:58 2007 -0500
;; summary:     Explain keywords.  Add markup fixes.
93
;;
94 95 96 97
;; changeset:   10:20abc7ab09c3
;; user:        Eric S. Raymond <esr@thyrsus.com>
;; date:        Wed Dec 26 11:37:28 2007 -0500
;; summary:     Typo fixes.
98
;;
99 100 101 102 103
;; changeset:   9:ada9f4da88aa
;; user:        Eric S. Raymond <esr@thyrsus.com>
;; date:        Wed Dec 26 11:23:00 2007 -0500
;; summary:     Add RCS example session.

104
;;; Todo:
Stefan Monnier's avatar
Stefan Monnier committed
105 106

;; - add ability to modify a log-entry (via cvs-mode-admin ;-)
Stefan Monnier's avatar
Stefan Monnier committed
107
;; - remove references to cvs-*
108
;; - make it easier to add support for new backends without changing the code.
Stefan Monnier's avatar
Stefan Monnier committed
109 110 111 112

;;; Code:

(require 'pcvs-util)
Eric S. Raymond's avatar
Eric S. Raymond committed
113
(autoload 'vc-find-revision "vc")
114
(autoload 'vc-diff-internal "vc")
Stefan Monnier's avatar
Stefan Monnier committed
115

116
(defvar cvs-minor-wrap-function)
117
(defvar cvs-force-command)
118

Stefan Monnier's avatar
Stefan Monnier committed
119
(defgroup log-view nil
Xue Fuqiao's avatar
Xue Fuqiao committed
120
  "Major mode for browsing log output of revision log histories."
Stefan Monnier's avatar
Stefan Monnier committed
121 122 123 124
  :group 'pcl-cvs
  :prefix "log-view-")

(easy-mmode-defmap log-view-mode-map
125
  '(
Xue Fuqiao's avatar
Xue Fuqiao committed
126 127 128 129 130 131 132 133 134 135 136
    ("-"	. 	negative-argument)
    ("0"	.	digit-argument)
    ("1"	.	digit-argument)
    ("2"	.	digit-argument)
    ("3"	.	digit-argument)
    ("4"	.	digit-argument)
    ("5"	.	digit-argument)
    ("6"	.	digit-argument)
    ("7"	.	digit-argument)
    ("8"	.	digit-argument)
    ("9"	.	digit-argument)
137

Xue Fuqiao's avatar
Xue Fuqiao committed
138
    ("\C-m" . log-view-toggle-entry-display)
139
    ("m" . log-view-toggle-mark-entry)
140
    ("e" . log-view-modify-change-comment)
141
    ("d" . log-view-diff)
142
    ("=" . log-view-diff)
143
    ("D" . log-view-diff-changeset)
144
    ("a" . log-view-annotate-version)
Eric S. Raymond's avatar
Eric S. Raymond committed
145
    ("f" . log-view-find-revision)
146
    ("n" . log-view-msg-next)
147
    ("p" . log-view-msg-prev)
148 149
    ("\t" . log-view-msg-next)
    ([backtab] . log-view-msg-prev)
150 151
    ("N" . log-view-file-next)
    ("P" . log-view-file-prev)
152 153
    ("\M-n" . log-view-file-next)
    ("\M-p" . log-view-file-prev))
Stefan Monnier's avatar
Stefan Monnier committed
154
  "Log-View's keymap."
155
  :inherit special-mode-map
156
  :group 'log-view)
Stefan Monnier's avatar
Stefan Monnier committed
157

158 159 160 161 162 163
(easy-menu-define log-view-mode-menu log-view-mode-map
  "Log-View Display Menu"
  `("Log-View"
    ;; XXX Do we need menu entries for these?
    ;; ["Quit"  quit-window]
    ;; ["Kill This Buffer"  kill-this-buffer]
164 165 166 167
    ["Mark Log Entry for Diff"  set-mark-command
     :help ""]
    ["Diff Revisions"  log-view-diff
     :help "Get the diff between two revisions"]
168 169
    ["Changeset Diff"  log-view-diff-changeset
     :help "Get the changeset diff between two revisions"]
170 171 172 173
    ["Visit Version"  log-view-find-revision
     :help "Visit the version at point"]
    ["Annotate Version"  log-view-annotate-version
     :help "Annotate the version at point"]
174 175
    ["Modify Log Comment" log-view-modify-change-comment
     :help "Edit the change comment displayed at point"]
176 177
    ["Toggle Details at Point" log-view-toggle-entry-display
     :active log-view-expanded-log-entry-function]
178
    "-----"
179 180 181 182 183 184 185 186
    ["Next Log Entry"  log-view-msg-next
     :help "Go to the next count'th log message"]
    ["Previous Log Entry"  log-view-msg-prev
     :help "Go to the previous count'th log message"]
    ["Next File"  log-view-file-next
     :help "Go to the next count'th file"]
    ["Previous File"  log-view-file-prev
     :help "Go to the previous count'th file"]))
187

Stefan Monnier's avatar
Stefan Monnier committed
188 189 190
(defvar log-view-mode-hook nil
  "Hook run at the end of `log-view-mode'.")

191 192 193 194 195 196
(defvar log-view-expanded-log-entry-function nil
  "Function returning the detailed description of a Log View entry.
It is called by the command `log-view-toggle-entry-display' with
one arg, the revision tag (a string), and should return a string.
If it is nil, `log-view-toggle-entry-display' does nothing.")

197
(defface log-view-file
Stefan Monnier's avatar
Stefan Monnier committed
198
  '((((class color) (background light))
199 200
     (:background "grey70" :weight bold))
    (t (:weight bold)))
Stefan Monnier's avatar
Stefan Monnier committed
201 202
  "Face for the file header line in `log-view-mode'."
  :group 'log-view)
203
(define-obsolete-face-alias 'log-view-file-face 'log-view-file "22.1")
204
(defvar log-view-file-face 'log-view-file)
Stefan Monnier's avatar
Stefan Monnier committed
205

206
(defface log-view-message
Stefan Monnier's avatar
Stefan Monnier committed
207 208
  '((((class color) (background light))
     (:background "grey85"))
209
    (t (:weight bold)))
Stefan Monnier's avatar
Stefan Monnier committed
210 211
  "Face for the message header line in `log-view-mode'."
  :group 'log-view)
212
;; backward-compatibility alias
213
(define-obsolete-face-alias 'log-view-message-face 'log-view-message "22.1")
214
(defvar log-view-message-face 'log-view-message)
Stefan Monnier's avatar
Stefan Monnier committed
215

216
(defvar log-view-file-re
217 218 219
  (concat "^\\(?:Working file: \\(?1:.+\\)"                ;RCS and CVS.
          ;; Subversion has no such thing??
          "\\|\\(?:SCCS/s\\.\\|Changes to \\)\\(?1:.+\\):" ;SCCS and Darcs.
Stefan Monnier's avatar
Stefan Monnier committed
220 221 222
	  "\\)\n")                    ;Include the \n for font-lock reasons.
  "Regexp matching the text identifying the file.
The match group number 1 should match the file name itself.")
223

224 225 226
(defvar log-view-per-file-logs t
  "Set if to t if the logs are shown one file at a time.")

227
(defvar log-view-message-re
228 229 230
  (concat "^\\(?:revision \\(?1:[.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS.
          "\\|r\\(?1:[0-9]+\\) | .* | .*"                ; Subversion.
          "\\|D \\(?1:[.0-9]+\\) .*"                     ; SCCS.
231 232 233 234 235 236 237 238
          ;; Darcs doesn't have revision names.  VC-darcs uses patch names
          ;; instead.  Darcs patch names are hashcodes, which do not appear
          ;; in the log output :-(, but darcs accepts any prefix of the log
          ;; message as a patch name, so we match the first line of the log
          ;; message.
          ;; First loosely match the date format.
          (concat "\\|[^ \n].*[^0-9\n][0-9][0-9]:[0-9][0-9][^0-9\n].*[^ \n]"
                  ;;Email of user and finally Msg, used as revision name.
239
                  "  .*@.*\n\\(?:  \\* \\(?1:.*\\)\\)?")
Stefan Monnier's avatar
Stefan Monnier committed
240 241 242
          "\\)$")
  "Regexp matching the text identifying a revision.
The match group number 1 should match the revision number itself.")
Stefan Monnier's avatar
Stefan Monnier committed
243

244 245 246 247 248 249 250
(defvar log-view-font-lock-keywords
  ;; We use `eval' so as to use the buffer-local value of log-view-file-re
  ;; and log-view-message-re, if applicable.
  '((eval . `(,log-view-file-re
              (1 (if (boundp 'cvs-filename-face) cvs-filename-face))
              (0 log-view-file-face append)))
    (eval . `(,log-view-message-re . log-view-message-face))))
251

Stefan Monnier's avatar
Stefan Monnier committed
252 253 254
(defconst log-view-font-lock-defaults
  '(log-view-font-lock-keywords t nil nil nil))

255
(defvar log-view-vc-fileset nil
256
  "The VC fileset corresponding to the current log.")
257 258

(defvar log-view-vc-backend nil
259
  "The VC backend that created the current log.")
260

Sam Steingold's avatar
Sam Steingold committed
261
;;;;
Stefan Monnier's avatar
Stefan Monnier committed
262
;;;; Actual code
Sam Steingold's avatar
Sam Steingold committed
263
;;;;
Stefan Monnier's avatar
Stefan Monnier committed
264 265

;;;###autoload
266
(define-derived-mode log-view-mode special-mode "Log-View"
Stefan Monnier's avatar
Stefan Monnier committed
267
  "Major mode for browsing CVS log output."
268
  (setq buffer-read-only t)
Stefan Monnier's avatar
Stefan Monnier committed
269
  (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)
270
  (set (make-local-variable 'beginning-of-defun-function)
271
       'log-view-beginning-of-defun)
272
  (set (make-local-variable 'end-of-defun-function)
273
       'log-view-end-of-defun)
274 275
  (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap)
  (hack-dir-local-variables-non-file-buffer))
Stefan Monnier's avatar
Stefan Monnier committed
276 277 278 279 280

;;;;
;;;; Navigation
;;;;

281 282 283
;; define log-view-{msg,file}-{next,prev}
(easy-mmode-define-navigation log-view-msg log-view-message-re "log message")
(easy-mmode-define-navigation log-view-file log-view-file-re "file")
Stefan Monnier's avatar
Stefan Monnier committed
284

285
(defun log-view-goto-rev (rev)
Xue Fuqiao's avatar
Xue Fuqiao committed
286
  "Go to revision REV."
287 288 289 290 291 292
  (goto-char (point-min))
  (ignore-errors
    (while (not (equal rev (log-view-current-tag)))
      (log-view-msg-next))
    t))

Stefan Monnier's avatar
Stefan Monnier committed
293 294 295 296 297 298 299
;;;;
;;;; Linkage to PCL-CVS (mostly copied from cvs-status.el)
;;;;

(defconst log-view-dir-re "^cvs[.ex]* [a-z]+: Logging \\(.+\\)$")

(defun log-view-current-file ()
Xue Fuqiao's avatar
Xue Fuqiao committed
300
  "Return the current file."
Stefan Monnier's avatar
Stefan Monnier committed
301 302 303
  (save-excursion
    (forward-line 1)
    (or (re-search-backward log-view-file-re nil t)
304
	(re-search-forward log-view-file-re nil t)
305
	(error "Unable to determine the current file"))
306
    (let* ((file (match-string 1))
Stefan Monnier's avatar
Stefan Monnier committed
307 308
	   (cvsdir (and (re-search-backward log-view-dir-re nil t)
			(match-string 1)))
Stefan Monnier's avatar
Stefan Monnier committed
309 310
	   (pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re)
			(re-search-backward cvs-pcl-cvs-dirchange-re nil t)
Stefan Monnier's avatar
Stefan Monnier committed
311 312 313 314
			(match-string 1)))
	   (dir ""))
      (let ((default-directory ""))
	(when pcldir (setq dir (expand-file-name pcldir dir)))
315 316
	(when cvsdir (setq dir (expand-file-name cvsdir dir))))
      (expand-file-name file dir))))
Stefan Monnier's avatar
Stefan Monnier committed
317

318 319 320 321 322 323 324 325 326 327 328 329
(defun log-view-current-entry (&optional pos move)
  "Return the position and revision tag of the Log View entry at POS.
This is a list (BEG TAG), where BEG is a buffer position and TAG
is a string.  If POS is nil or omitted, it defaults to point.
If there is no entry at POS, return nil.

If optional arg MOVE is non-nil, move point to BEG if found.
Otherwise, don't move point."
  (let ((looping t)
	result)
    (save-excursion
      (when pos (goto-char pos))
330 331 332
      (forward-line 0)
      ;; Treat "---" separator lines as part of the following revision.
      (forward-line (if (looking-at "-\\{20,\\}$") 2 1))
333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349
      (while looping
	(setq pos (re-search-backward log-view-message-re nil 'move)
	      looping (and pos (log-view-inside-comment-p (point)))))
      (when pos
	(setq result
	      (list pos (match-string-no-properties 1)))))
    (and move result (goto-char pos))
    result))

(defun log-view-inside-comment-p (pos)
  "Return non-nil if POS lies inside an expanded log entry."
  (eq (get-text-property pos 'log-view-comment) t))

(defun log-view-current-tag (&optional pos)
  "Return the revision tag (a string) of the Log View entry at POS.
if POS is omitted or nil, it defaults to point."
  (cadr (log-view-current-entry pos)))
Stefan Monnier's avatar
Stefan Monnier committed
350

351
(defun log-view-toggle-mark-entry ()
352
  "Toggle the marked state for the log entry at point.
Xue Fuqiao's avatar
Xue Fuqiao committed
353
Individual log entries can be marked and unmarked.  The marked
354 355 356
entries are denoted by changing their background color.
`log-view-get-marked' returns the list of tags for the marked
log entries."
357 358
  (interactive)
  (save-excursion
359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376
    (let* ((entry (log-view-current-entry nil t))
	   (beg (car entry))
	   found)
      (when entry
	;; Look to see if the current entry is marked.
	(setq found (get-char-property beg 'log-view-self))
	(if found
	    (delete-overlay found)
	  ;; Create an overlay covering this entry and change its color.
	  (let* ((end (if (get-text-property beg 'log-view-entry-expanded)
			  (next-single-property-change beg 'log-view-comment)
			(log-view-end-of-defun)
			(point)))
		 (ov (make-overlay beg end)))
	    (overlay-put ov 'face 'log-view-file)
	    ;; This is used to check if the overlay is present.
	    (overlay-put ov 'log-view-self ov)
	    (overlay-put ov 'log-view-marked (nth 1 entry))))))))
377

378
(defun log-view-get-marked ()
379
  "Return the list of tags for the marked log entries."
380 381 382 383 384 385 386 387 388
  (save-excursion
    (let ((pos (point-min))
	  marked-list ov)
      (while (setq pos (next-single-property-change pos 'face))
	(when (setq ov (get-char-property pos 'log-view-self))
	  (push (overlay-get ov 'log-view-marked) marked-list)
	  (setq pos (overlay-end ov))))
      marked-list)))

389
(defun log-view-toggle-entry-display ()
Glenn Morris's avatar
Glenn Morris committed
390 391
  "If possible, expand the current Log View entry.
This calls `log-view-expanded-log-entry-function' to do the work."
392 393 394 395 396 397 398 399 400 401 402 403 404 405 406
  (interactive)
  ;; Don't do anything unless `log-view-expanded-log-entry-function'
  ;; is defined in this mode.
  (when (functionp log-view-expanded-log-entry-function)
    (let* ((opoint (point))
	   (entry (log-view-current-entry nil t))
	   (beg (car entry))
	   (buffer-read-only nil))
      (when entry
	(if (get-text-property beg 'log-view-entry-expanded)
	    ;; If the entry is expanded, collapse it.
	    (let ((pos (next-single-property-change beg 'log-view-comment)))
	      (unless (and pos (log-view-inside-comment-p pos))
		(error "Broken markup in `log-view-toggle-entry-display'"))
	      (delete-region pos
407 408 409
                             (or
                              (next-single-property-change pos 'log-view-comment)
                              (point-max)))
410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433
	      (put-text-property beg (1+ beg) 'log-view-entry-expanded nil)
	      (if (< opoint pos)
		  (goto-char opoint)))
	  ;; Otherwise, expand the entry.
	  (let ((long-entry (funcall log-view-expanded-log-entry-function
				     (nth 1 entry))))
	    (when long-entry
	      (put-text-property beg (1+ beg) 'log-view-entry-expanded t)
	      (log-view-end-of-defun)
	      (setq beg (point))
	      (insert long-entry "\n")
	      (add-text-properties
	       beg (point)
	       '(font-lock-face font-lock-comment-face log-view-comment t))
	      (goto-char opoint))))))))

(defun log-view-beginning-of-defun (&optional arg)
  "Move backward to the beginning of a Log View entry.
With ARG, do it that many times.  Negative ARG means move forward
to the beginning of the ARGth following entry.

This is Log View mode's default `beginning-of-defun-function'.
It assumes that a log entry starts with a line matching
`log-view-message-re'."
434
  (when (null arg) (setf arg 1))
435
  (if (< arg 0)
436 437 438
      ;; In log view, the end of one defun is the beginning of the
      ;; next, so punting to log-view-end-of-defun is safe in this
      ;; context.
439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458
      (log-view-end-of-defun (- arg))
    (let ((found t))
      (while (> arg 0)
        (setf arg (1- arg))
        (let ((cur-start (log-view-current-entry)))
          (setf found
                (cond ((null cur-start)
                       (goto-char (point-min))
                       nil)
                      ((>= (car cur-start) (point))
                       (unless (bobp)
                         (forward-line -1)
                         (setf arg (1+ arg)))
                       nil)
                      (t
                       (goto-char (car cur-start))
                       t)))))
      found)))

(defun log-view-end-of-defun-1 ()
459 460 461 462 463 464 465 466 467 468 469 470
  "Move forward to the next Log View entry."
  (let ((looping t))
    (if (looking-at log-view-message-re)
	(goto-char (match-end 0)))
    (while looping
      (cond
       ((re-search-forward log-view-message-re nil 'move)
	(unless (log-view-inside-comment-p (point))
	  (setq looping nil)
	  (goto-char (match-beginning 0))))
       ;; Don't advance past the end buttons inserted by
       ;; `vc-print-log-setup-buttons'.
471 472
       ((looking-back "Show 2X entries    Show unlimited entries"
                      (line-beginning-position))
473
	(setq looping nil)
474 475 476 477
	(forward-line -1))
       ;; There are no buttons if we've turned on unlimited entries.
       ((eobp)
        (setq looping nil))))))
478

479 480 481 482 483 484 485 486 487 488
(defun log-view-end-of-defun (&optional arg)
  "Move forward to the next Log View entry.
Works like `end-of-defun'."
  (when (null arg) (setf arg 1))
  (if (< arg 0)
      (log-view-beginning-of-defun (- arg))
    (dotimes (_n arg)
      (log-view-end-of-defun-1)
      t)))

489 490 491 492
(defvar cvs-minor-current-files)
(defvar cvs-branch-prefix)
(defvar cvs-secondary-branch-prefix)

Stefan Monnier's avatar
Stefan Monnier committed
493 494
(defun log-view-minor-wrap (buf f)
  (let ((data (with-current-buffer buf
495
		(let* ((beg (point))
496
		       (end (if (use-region-p) (mark) (point)))
497 498 499 500 501 502 503 504
		       (fr (log-view-current-tag beg))
		       (to (log-view-current-tag end)))
		  (when (string-equal fr to)
		    (save-excursion
		      (goto-char end)
		      (log-view-msg-next)
		      (setq to (log-view-current-tag))))
		  (cons
505 506 507 508 509
                   ;; The first revision has to be the one at point, for
                   ;; operations that only take one revision
                   ;; (e.g. cvs-mode-edit).
		   (cons (log-view-current-file) fr)
		   (cons (log-view-current-file) to))))))
Stefan Monnier's avatar
Stefan Monnier committed
510 511 512 513 514 515 516 517 518 519
    (let ((cvs-branch-prefix (cdar data))
	  (cvs-secondary-branch-prefix (and (cdar data) (cddr data)))
	  (cvs-minor-current-files
	   (cons (caar data)
		 (when (and (cadr data) (not (equal (caar data) (cadr data))))
		   (list (cadr data)))))
	  ;; FIXME:  I need to force because the fileinfos are UNKNOWN
	  (cvs-force-command "/F"))
      (funcall f))))

Eric S. Raymond's avatar
Eric S. Raymond committed
520
(defun log-view-find-revision (pos)
Xue Fuqiao's avatar
Xue Fuqiao committed
521 522
  "Visit the version at POS.
If called interactively, visit the version at point."
523
  (interactive "d")
524 525 526
  (unless log-view-per-file-logs
    (when (> (length log-view-vc-fileset) 1)
      (error "Multiple files shown in this buffer, cannot use this command here")))
527 528
  (save-excursion
    (goto-char pos)
529 530 531 532
    (switch-to-buffer (vc-find-revision (if log-view-per-file-logs
					    (log-view-current-file)
					  (car log-view-vc-fileset))
					(log-view-current-tag)))))
533

534 535 536 537 538 539 540 541 542

(defun log-view-extract-comment ()
  "Parse comment from around the current point in the log."
  (save-excursion
    (let (st en (backend (vc-backend (log-view-current-file))))
      (log-view-end-of-defun)
      (cond ((eq backend 'SVN)
	     (forward-line -1)))
      (setq en (point))
543 544
      (or (log-view-current-entry nil t)
          (throw 'beginning-of-buffer nil))
Dmitry Gutov's avatar
Dmitry Gutov committed
545
      (cond ((memq backend '(SCCS RCS CVS SVN))
546 547 548
	     (forward-line 2))
	    ((eq backend 'Hg)
	     (forward-line 4)
549
	     (re-search-forward "summary: *" nil t)))
550 551 552
      (setq st (point))
      (buffer-substring st en))))

553 554
(declare-function vc-modify-change-comment "vc" (files rev oldcomment))

555 556 557
(defun log-view-modify-change-comment ()
  "Edit the change comment displayed at point."
  (interactive)
558 559 560 561 562
  (vc-modify-change-comment (list (if log-view-per-file-logs
				      (log-view-current-file)
				    (car log-view-vc-fileset)))
			    (log-view-current-tag)
			    (log-view-extract-comment)))
563

564
(defun log-view-annotate-version (pos)
Xue Fuqiao's avatar
Xue Fuqiao committed
565 566
  "Annotate the version at POS.
If called interactively, annotate the version at point."
567
  (interactive "d")
568 569 570
  (unless log-view-per-file-logs
    (when (> (length log-view-vc-fileset) 1)
      (error "Multiple files shown in this buffer, cannot use this command here")))
571 572
  (save-excursion
    (goto-char pos)
573 574 575 576
    (vc-annotate (if log-view-per-file-logs
		     (log-view-current-file)
		   (car log-view-vc-fileset))
		 (log-view-current-tag))))
577

578 579 580
;;
;; diff
;;
581 582

(defun log-view-diff (beg end)
Juri Linkov's avatar
Juri Linkov committed
583
  "Get the diff between two revisions.
584 585 586 587 588 589 590 591
If the region is inactive or the mark is on the revision at
point, get the diff between the revision at point and its
previous revision.  Otherwise, get the diff between the revisions
where the region starts and ends.

Unlike `log-view-diff-changeset', this function only shows the
part of the changeset which affected the currently considered
file(s)."
592
  (interactive
593 594
   (list (if (use-region-p) (region-beginning) (point))
         (if (use-region-p) (region-end) (point))))
595
  (log-view-diff-common beg end))
596 597 598

(defun log-view-diff-changeset (beg end)
  "Get the diff between two revisions.
599 600 601 602 603 604 605 606
If the region is inactive or the mark is on the revision at
point, get the diff between the revision at point and its
previous revision.  Otherwise, get the diff between the revisions
where the region starts and ends.

Unlike `log-view-diff' this function shows the whole changeset,
including changes affecting other files than the currently
considered file(s)."
607
  (interactive
608 609
   (list (if (use-region-p) (region-beginning) (point))
         (if (use-region-p) (region-end) (point))))
610 611 612 613
  (when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file)
    (error "The %s backend does not support changeset diffs" log-view-vc-backend))
  (let ((default-directory (vc-root-dir)))
    (log-view-diff-common beg end t)))
614 615 616 617

(defun log-view-diff-common (beg end &optional whole-changeset)
  (let ((to (log-view-current-tag beg))
        (fr (log-view-current-tag end)))
618 619
    (when (string-equal fr to)
      ;; TO and FR are the same, look at the previous revision.
620
      (setq fr (vc-call-backend log-view-vc-backend 'previous-revision nil fr)))
621
    (vc-diff-internal
622 623 624 625 626 627 628 629 630 631
     t (list log-view-vc-backend
             ;; The value passed here should follow what
             ;; `vc-deduce-fileset' returns.  If we want to see the
             ;; diff for all the files in the changeset, pass NIL for
             ;; the file list.
             (unless whole-changeset
               (if log-view-per-file-logs
                   (list (log-view-current-file))
                 log-view-vc-fileset)))
     fr to)))
632

Stefan Monnier's avatar
Stefan Monnier committed
633
(provide 'log-view)
634

Stefan Monnier's avatar
Stefan Monnier committed
635
;;; log-view.el ends here