X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/5b467bf4e2787e3290280cadbae9e915df88dacd..6e0f362cb0a10f1a71fcc10ca8c979de4673217c:/lisp/log-view.el

diff --git a/lisp/log-view.el b/lisp/log-view.el
index c157b392ad..fbe83d7951 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,11 +1,10 @@
-;;; log-view.el --- Major mode for browsing CVS log output
+;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
-;; Copyright (C) 1999-2000  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@cs.yale.edu>
-;; Keywords: pcl-cvs cvs log
-;; Version: $Name:  $
-;; Revision: $Id: log-view.el,v 1.2 2000/03/03 20:58:09 monnier Exp $
+;; Keywords: rcs sccs cvs log version-control
 
 ;; This file is part of GNU Emacs.
 
@@ -21,85 +20,95 @@
 
 ;; 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
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
 ;; Todo:
 
-;; - extract version info in log-view-current-tag
-;; - add support for SCCS' output format
 ;; - add compatibility with cvs-log.el
 ;; - add ability to modify a log-entry (via cvs-mode-admin ;-)
+;; - remove references to cvs-*
 
 ;;; Code:
 
 (eval-when-compile (require 'cl))
-;;(require 'pcvs-defs)
 (require 'pcvs-util)
-
+(autoload 'vc-version-diff "vc")
 
 (defgroup log-view nil
-  "Major mode for browsing log output for PCL-CVS."
+  "Major mode for browsing log output of RCS/CVS/SCCS."
   :group 'pcl-cvs
   :prefix "log-view-")
 
 (easy-mmode-defmap log-view-mode-map
-  '(("n" . log-view-next-message)
-    ("N" . log-view-next-file)
-    ("M-n" . log-view-next-file)
-    ("p" . log-view-prev-message)
-    ("P" . log-view-prev-file)
-    ("M-p" . log-view-prev-file))
+  '(("q" . quit-window)
+    ("z" . kill-this-buffer)
+    ("m" . set-mark-command)
+    ;; ("e" . cvs-mode-edit-log)
+    ("d" . log-view-diff)
+    ("f" . log-view-find-version)
+    ("n" . log-view-msg-next)
+    ("p" . log-view-msg-prev)
+    ("N" . log-view-file-next)
+    ("P" . log-view-file-prev)
+    ("\M-n" . log-view-file-next)
+    ("\M-p" . log-view-file-prev))
   "Log-View's keymap."
   :group 'log-view
-  :inherit 'cvs-mode-map)
+  ;; 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))
 
 (defvar log-view-mode-hook nil
   "Hook run at the end of `log-view-mode'.")
 
-(defface log-view-file-face
+(defface log-view-file
   '((((class color) (background light))
-     (:background "grey70" :bold t))
-    (t (:bold t)))
+     (:background "grey70" :weight bold))
+    (t (:weight bold)))
   "Face for the file header line in `log-view-mode'."
   :group 'log-view)
-(defvar log-view-file-face 'log-view-file-face)
+;; backward-compatibility alias
+(put 'log-view-file-face 'face-alias 'log-view-file)
+(defvar log-view-file-face 'log-view-file)
 
-(defface log-view-message-face
+(defface log-view-message
   '((((class color) (background light))
      (:background "grey85"))
-    (t (:bold t)))
+    (t (:weight bold)))
   "Face for the message header line in `log-view-mode'."
   :group 'log-view)
-(defvar log-view-message-face 'log-view-message-face)
+;; backward-compatibility alias
+(put 'log-view-message-face 'face-alias 'log-view-message)
+(defvar log-view-message-face 'log-view-message)
 
 (defconst log-view-file-re
   (concat "^\\("
 	  "Working file: \\(.+\\)"
 	  "\\|SCCS/s\\.\\(.+\\):"
 	  "\\)\n"))
-(defconst log-view-message-re "^----------------------------$")
+;; In RCS, a locked revision will look like "revision N.M\tlocked by: FOO".
+(defconst log-view-message-re "^\\(revision \\([.0-9]+\\)\\(?:\t.*\\)?\\|r\\([0-9]+\\) | .* | .*\\|D \\([.0-9]+\\) .*\\)$")
 
 (defconst log-view-font-lock-keywords
   `((,log-view-file-re
-     (2 'cvs-filename-face nil t)
-     (3 'cvs-filename-face nil t)
-     (0 'log-view-file-face append))
+     (2 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
+     (3 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t)
+     (0 log-view-file-face append))
     (,log-view-message-re . log-view-message-face)))
 (defconst log-view-font-lock-defaults
   '(log-view-font-lock-keywords t nil nil nil))
 
-;;;; 
+;;;;
 ;;;; Actual code
-;;;; 
+;;;;
 
 ;;;###autoload
-(autoload 'log-view-mode "log-view" "Major mode for browsing CVS log output." t)
-(eval-when-compile (autoload 'easy-mmode-define-derived-mode "easy-mmode"))
-(easy-mmode-define-derived-mode log-view-mode fundamental-mode "Log-View"
+(define-derived-mode log-view-mode fundamental-mode "Log-View"
   "Major mode for browsing CVS log output."
+  (setq buffer-read-only t)
   (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults)
   (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
 
@@ -107,37 +116,16 @@
 ;;;; Navigation
 ;;;;
 
-(defun log-view-next-message (&optional count)
-  "Move to next (COUNT'th) log message."
-  (interactive "p")
-  (unless count (setq count 1))
-  (if (< count 0) (log-view-prev-message (- count))
-    (when (looking-at log-view-message-re) (incf count))
-    (re-search-forward log-view-message-re nil nil count)
-    (goto-char (match-beginning 0))))
-
-(defun log-view-next-file (&optional count)
-  "Move to next (COUNT'th) file."
-  (interactive "p")
-  (unless count (setq count 1))
-  (if (< count 0) (log-view-prev-file (- count))
-    (when (looking-at log-view-file-re) (incf count))
-    (re-search-forward log-view-file-re nil nil count)
-    (goto-char (match-beginning 0))))
-
-(defun log-view-prev-message (&optional count)
-  "Move to previous (COUNT'th) log message."
-  (interactive "p")
-  (unless count (setq count 1))
-  (if (< count 0) (log-view-next-message (- count))
-    (re-search-backward log-view-message-re nil nil count)))
-
-(defun log-view-prev-file (&optional count)
-  "Move to previous (COUNT'th) file."
-  (interactive "p")
-  (unless count (setq count 1))
-  (if (< count 0) (log-view-next-file (- count))
-    (re-search-backward log-view-file-re nil nil count)))
+;; 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")
+
+(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))
 
 ;;;;
 ;;;; Linkage to PCL-CVS (mostly copied from cvs-status.el)
@@ -153,24 +141,31 @@
     (let* ((file (or (match-string 2) (match-string 3)))
 	   (cvsdir (and (re-search-backward log-view-dir-re nil t)
 			(match-string 1)))
-	   (pcldir (and (re-search-backward cvs-pcl-cvs-dirchange-re nil t)
+	   (pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re)
+			(re-search-backward cvs-pcl-cvs-dirchange-re nil t)
 			(match-string 1)))
 	   (dir ""))
       (let ((default-directory ""))
 	(when pcldir (setq dir (expand-file-name pcldir dir)))
-	(when cvsdir (setq dir (expand-file-name cvsdir dir)))
-	(expand-file-name file dir)))))
+	(when cvsdir (setq dir (expand-file-name cvsdir dir))))
+      (expand-file-name file dir))))
 
-(defun log-view-current-tag ()
-  nil);; FIXME
+(defun log-view-current-tag (&optional where)
+  (save-excursion
+    (when where (goto-char where))
+    (forward-line 1)
+    (let ((pt (point)))
+      (when (re-search-backward log-view-message-re nil t)
+	(let ((rev (or (match-string 2) (match-string 3) (match-string 4))))
+	  (unless (re-search-forward log-view-file-re pt t)
+	    rev))))))
 
 (defun log-view-minor-wrap (buf f)
   (let ((data (with-current-buffer buf
 		(cons
 		 (cons (log-view-current-file)
 		       (log-view-current-tag))
-		 (when (ignore-errors (mark))
-		   ;; `mark-active' is not provided by XEmacs :-(
+		 (when mark-active
 		   (save-excursion
 		     (goto-char (mark))
 		     (cons (log-view-current-file)
@@ -185,5 +180,36 @@
 	  (cvs-force-command "/F"))
       (funcall f))))
 
+(defun log-view-find-version (pos)
+  "Visit the version at point."
+  (interactive "d")
+  (save-excursion
+    (goto-char pos)
+    (switch-to-buffer (vc-find-version (log-view-current-file)
+                                       (log-view-current-tag)))))
+
+;;
+;; diff
+;;
+
+(defun log-view-diff (beg end)
+  "Get the diff for several revisions.
+If the point is the same as the mark, get the diff for this revision.
+Otherwise, get the diff between the revisions
+were the region starts and ends."
+  (interactive
+   (list (if mark-active (region-beginning) (point))
+         (if mark-active (region-end) (point))))
+  (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)))
+
 (provide 'log-view)
+
+;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f
 ;;; log-view.el ends here