2000-05-21 02:12:34 +00:00
|
|
|
;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2005-08-06 22:13:43 +00:00
|
|
|
;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
|
|
|
|
;; 2005 Free Software Foundation, Inc.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; Author: Stefan Monnier <monnier@cs.yale.edu>
|
2000-05-21 02:12:34 +00:00
|
|
|
;; Keywords: rcs sccs cvs log version-control
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
;; 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
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 23:32:44 +00:00
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2005-12-20 21:58:14 +00:00
|
|
|
;; Major mode to browse revision log histories.
|
|
|
|
;; Currently supports the format output by:
|
|
|
|
;; RCS, SCCS, CVS, Subversion.
|
|
|
|
|
|
|
|
;; Examples of log output:
|
|
|
|
|
|
|
|
;;;; 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.
|
|
|
|
|
|
|
|
;;;; SCCS:
|
|
|
|
|
|
|
|
;;;; Subversion:
|
|
|
|
|
|
|
|
;;; Todo:
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;; - add ability to modify a log-entry (via cvs-mode-admin ;-)
|
2000-05-21 02:12:34 +00:00
|
|
|
;; - remove references to cvs-*
|
2005-12-20 21:58:14 +00:00
|
|
|
;; - make it easier to add support for new backends without changing the code.
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
(require 'pcvs-util)
|
2005-12-23 21:49:32 +00:00
|
|
|
(autoload 'vc-find-version "vc")
|
2001-11-12 23:01:17 +00:00
|
|
|
(autoload 'vc-version-diff "vc")
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2005-08-31 13:50:48 +00:00
|
|
|
(defvar cvs-minor-wrap-function)
|
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(defgroup log-view nil
|
2000-05-21 02:12:34 +00:00
|
|
|
"Major mode for browsing log output of RCS/CVS/SCCS."
|
2000-03-11 03:51:31 +00:00
|
|
|
:group 'pcl-cvs
|
|
|
|
:prefix "log-view-")
|
|
|
|
|
|
|
|
(easy-mmode-defmap log-view-mode-map
|
2001-11-12 23:01:17 +00:00
|
|
|
'(("q" . quit-window)
|
|
|
|
("z" . kill-this-buffer)
|
|
|
|
("m" . set-mark-command)
|
2003-01-14 21:46:13 +00:00
|
|
|
;; ("e" . cvs-mode-edit-log)
|
2001-11-12 23:01:17 +00:00
|
|
|
("d" . log-view-diff)
|
2001-11-26 16:08:51 +00:00
|
|
|
("f" . log-view-find-version)
|
2001-11-12 23:01:17 +00:00
|
|
|
("n" . log-view-msg-next)
|
2000-03-22 01:10:09 +00:00
|
|
|
("p" . log-view-msg-prev)
|
|
|
|
("N" . log-view-file-next)
|
|
|
|
("P" . log-view-file-prev)
|
2001-10-29 15:46:46 +00:00
|
|
|
("\M-n" . log-view-file-next)
|
|
|
|
("\M-p" . log-view-file-prev))
|
2000-03-11 03:51:31 +00:00
|
|
|
"Log-View's keymap."
|
|
|
|
:group 'log-view
|
2000-05-21 02:12:34 +00:00
|
|
|
;; Here I really need either buffer-local keymap-inheritance
|
|
|
|
;; or a minor-mode-map with lower precedence than the local map.
|
|
|
|
:inherit (if (boundp 'cvs-mode-map) cvs-mode-map))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defvar log-view-mode-hook nil
|
|
|
|
"Hook run at the end of `log-view-mode'.")
|
|
|
|
|
2005-06-10 08:29:58 +00:00
|
|
|
(defface log-view-file
|
2000-03-11 03:51:31 +00:00
|
|
|
'((((class color) (background light))
|
2001-12-31 20:44:44 +00:00
|
|
|
(:background "grey70" :weight bold))
|
|
|
|
(t (:weight bold)))
|
2000-03-11 03:51:31 +00:00
|
|
|
"Face for the file header line in `log-view-mode'."
|
|
|
|
:group 'log-view)
|
2005-06-10 08:29:58 +00:00
|
|
|
;; backward-compatibility alias
|
|
|
|
(put 'log-view-file-face 'face-alias 'log-view-file)
|
|
|
|
(defvar log-view-file-face 'log-view-file)
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2005-06-10 08:29:58 +00:00
|
|
|
(defface log-view-message
|
2000-03-11 03:51:31 +00:00
|
|
|
'((((class color) (background light))
|
|
|
|
(:background "grey85"))
|
2001-12-31 20:44:44 +00:00
|
|
|
(t (:weight bold)))
|
2000-03-11 03:51:31 +00:00
|
|
|
"Face for the message header line in `log-view-mode'."
|
|
|
|
:group 'log-view)
|
2005-06-10 08:29:58 +00:00
|
|
|
;; backward-compatibility alias
|
|
|
|
(put 'log-view-message-face 'face-alias 'log-view-message)
|
|
|
|
(defvar log-view-message-face 'log-view-message)
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defconst log-view-file-re
|
2005-12-20 21:58:14 +00:00
|
|
|
(concat "^\\(?:Working file: \\(.+\\)" ;RCS and CVS.
|
|
|
|
"\\|SCCS/s\\.\\(.+\\):" ;SCCS.
|
|
|
|
"\\)\n")) ;Include the \n for font-lock reasons.
|
|
|
|
|
|
|
|
(defconst log-view-message-re
|
|
|
|
(concat "^\\(?:revision \\([.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS.
|
|
|
|
"\\|r\\([0-9]+\\) | .* | .*" ; Subversion.
|
|
|
|
"\\|D \\([.0-9]+\\) .*" ; SCCS.
|
|
|
|
"\\)$"))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
(defconst log-view-font-lock-keywords
|
|
|
|
`((,log-view-file-re
|
2005-12-20 21:58:14 +00:00
|
|
|
(1 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
|
2000-05-21 02:12:34 +00:00
|
|
|
(2 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
|
|
|
|
(0 log-view-file-face append))
|
2000-03-11 03:51:31 +00:00
|
|
|
(,log-view-message-re . log-view-message-face)))
|
|
|
|
(defconst log-view-font-lock-defaults
|
|
|
|
'(log-view-font-lock-keywords t nil nil nil))
|
|
|
|
|
2001-11-12 20:34:45 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
;;;; Actual code
|
2001-11-12 20:34:45 +00:00
|
|
|
;;;;
|
2000-03-11 03:51:31 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2000-03-22 01:10:09 +00:00
|
|
|
(define-derived-mode log-view-mode fundamental-mode "Log-View"
|
2000-03-11 03:51:31 +00:00
|
|
|
"Major mode for browsing CVS log output."
|
2001-11-12 23:01:17 +00:00
|
|
|
(setq buffer-read-only t)
|
2000-03-11 03:51:31 +00:00
|
|
|
(set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)
|
|
|
|
(set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
|
|
|
|
|
|
|
|
;;;;
|
|
|
|
;;;; Navigation
|
|
|
|
;;;;
|
|
|
|
|
2000-03-22 01:10:09 +00:00
|
|
|
;; 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")
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2000-05-10 22:22:21 +00:00
|
|
|
(defun log-view-goto-rev (rev)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(ignore-errors
|
|
|
|
(while (not (equal rev (log-view-current-tag)))
|
|
|
|
(log-view-msg-next))
|
|
|
|
t))
|
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
;;;;
|
|
|
|
;;;; 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 ()
|
|
|
|
(save-excursion
|
|
|
|
(forward-line 1)
|
|
|
|
(or (re-search-backward log-view-file-re nil t)
|
|
|
|
(re-search-forward log-view-file-re))
|
2005-12-23 21:49:32 +00:00
|
|
|
(let* ((file (or (match-string 1) (match-string 2)))
|
2000-03-11 03:51:31 +00:00
|
|
|
(cvsdir (and (re-search-backward log-view-dir-re nil t)
|
|
|
|
(match-string 1)))
|
2000-05-21 02:12:34 +00:00
|
|
|
(pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re)
|
|
|
|
(re-search-backward cvs-pcl-cvs-dirchange-re nil t)
|
2000-03-11 03:51:31 +00:00
|
|
|
(match-string 1)))
|
|
|
|
(dir ""))
|
|
|
|
(let ((default-directory ""))
|
|
|
|
(when pcldir (setq dir (expand-file-name pcldir dir)))
|
2001-11-12 23:01:17 +00:00
|
|
|
(when cvsdir (setq dir (expand-file-name cvsdir dir))))
|
|
|
|
(expand-file-name file dir))))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2001-11-12 23:01:17 +00:00
|
|
|
(defun log-view-current-tag (&optional where)
|
2000-03-22 01:10:09 +00:00
|
|
|
(save-excursion
|
2001-11-12 23:01:17 +00:00
|
|
|
(when where (goto-char where))
|
2000-03-22 01:10:09 +00:00
|
|
|
(forward-line 1)
|
|
|
|
(let ((pt (point)))
|
|
|
|
(when (re-search-backward log-view-message-re nil t)
|
2005-12-20 21:58:14 +00:00
|
|
|
(let (rev)
|
|
|
|
;; Find the subgroup that matched.
|
2005-12-23 21:49:32 +00:00
|
|
|
(dotimes (i (/ (length (match-data 'integers)) 2))
|
2005-12-20 21:58:14 +00:00
|
|
|
(setq rev (or rev (match-string (1+ i)))))
|
2000-03-22 01:10:09 +00:00
|
|
|
(unless (re-search-forward log-view-file-re pt t)
|
|
|
|
rev))))))
|
2000-03-11 03:51:31 +00:00
|
|
|
|
2005-12-20 21:58:14 +00:00
|
|
|
(defvar cvs-minor-current-files)
|
|
|
|
(defvar cvs-branch-prefix)
|
|
|
|
(defvar cvs-secondary-branch-prefix)
|
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(defun log-view-minor-wrap (buf f)
|
|
|
|
(let ((data (with-current-buffer buf
|
|
|
|
(cons
|
|
|
|
(cons (log-view-current-file)
|
|
|
|
(log-view-current-tag))
|
2000-05-10 22:22:21 +00:00
|
|
|
(when mark-active
|
2000-03-11 03:51:31 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char (mark))
|
|
|
|
(cons (log-view-current-file)
|
|
|
|
(log-view-current-tag))))))))
|
|
|
|
(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))))
|
|
|
|
|
2001-11-26 16:08:51 +00:00
|
|
|
(defun log-view-find-version (pos)
|
|
|
|
"Visit the version at point."
|
|
|
|
(interactive "d")
|
|
|
|
(save-excursion
|
|
|
|
(goto-char pos)
|
2003-02-04 12:29:42 +00:00
|
|
|
(switch-to-buffer (vc-find-version (log-view-current-file)
|
2001-11-26 16:08:51 +00:00
|
|
|
(log-view-current-tag)))))
|
|
|
|
|
2001-12-16 16:28:59 +00:00
|
|
|
;;
|
|
|
|
;; diff
|
|
|
|
;;
|
2001-11-12 23:01:17 +00:00
|
|
|
|
|
|
|
(defun log-view-diff (beg end)
|
2005-12-14 10:20:03 +00:00
|
|
|
"Get the diff between two revisions.
|
|
|
|
If the mark is not active 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."
|
2004-04-27 06:42:48 +00:00
|
|
|
(interactive
|
|
|
|
(list (if mark-active (region-beginning) (point))
|
|
|
|
(if mark-active (region-end) (point))))
|
2001-11-12 23:01:17 +00:00
|
|
|
(let ((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))))
|
|
|
|
(vc-version-diff (log-view-current-file) to fr)))
|
|
|
|
|
2000-03-11 03:51:31 +00:00
|
|
|
(provide 'log-view)
|
2000-03-22 01:10:09 +00:00
|
|
|
|
2005-02-18 21:56:47 +00:00
|
|
|
;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
|
2000-03-11 03:51:31 +00:00
|
|
|
;;; log-view.el ends here
|