X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/0d30b33766e277a5bff6eabc9da5afdaebd8b32a..243afed719439f865473c90b5bd7638a6ad1a564:/lisp/log-view.el diff --git a/lisp/log-view.el b/lisp/log-view.el index fbe83d7951..e7a58dad8b 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -1,7 +1,7 @@ ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output -;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, -;; 2005 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +;; Free Software Foundation, Inc. ;; Author: Stefan Monnier ;; Keywords: rcs sccs cvs log version-control @@ -25,18 +25,62 @@ ;;; Commentary: -;; Todo: +;; Major mode to browse revision log histories. +;; Currently supports the format output by: +;; RCS, SCCS, CVS, Subversion, and DaRCS. + +;; 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: + +;;;; Darcs: + +;; Changes to darcsum.el: +;; +;; Mon Nov 28 15:19:38 GMT 2005 Dave Love +;; * Abstract process startup into darcsum-start-process. Use TERM=dumb. +;; TERM=dumb avoids escape characters, at least, for any old darcs that +;; doesn't understand DARCS_DONT_COLOR & al. +;; +;; Thu Nov 24 15:20:45 GMT 2005 Dave Love +;; * 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. + +;;; Todo: -;; - add compatibility with cvs-log.el ;; - add ability to modify a log-entry (via cvs-mode-admin ;-) ;; - remove references to cvs-* +;; - make it easier to add support for new backends without changing the code. ;;; Code: (eval-when-compile (require 'cl)) (require 'pcvs-util) +(autoload 'vc-find-version "vc") (autoload 'vc-version-diff "vc") +(defvar cvs-minor-wrap-function) + (defgroup log-view nil "Major mode for browsing log output of RCS/CVS/SCCS." :group 'pcl-cvs @@ -85,17 +129,29 @@ (defvar log-view-message-face 'log-view-message) (defconst log-view-file-re - (concat "^\\(" - "Working file: \\(.+\\)" - "\\|SCCS/s\\.\\(.+\\):" - "\\)\n")) -;; 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]+\\) .*\\)$") + (concat "^\\(?:Working file: \\(.+\\)" ;RCS and CVS. + "\\|\\(?:SCCS/s\\.\\|Changes to \\)\\(.+\\):" ;SCCS and Darcs. + "\\)\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. + ;; 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. + " .*@.*\n\\(?: \\* \\(.*\\)\\)?") + "\\)$")) (defconst log-view-font-lock-keywords `((,log-view-file-re + (1 (if (boundp 'cvs-filename-face) cvs-filename-face) nil t) (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 @@ -138,7 +194,7 @@ (forward-line 1) (or (re-search-backward log-view-file-re nil t) (re-search-forward log-view-file-re)) - (let* ((file (or (match-string 2) (match-string 3))) + (let* ((file (or (match-string 1) (match-string 2))) (cvsdir (and (re-search-backward log-view-dir-re nil t) (match-string 1))) (pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re) @@ -156,20 +212,34 @@ (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)))) + (let (rev) + ;; Find the subgroup that matched. + (dotimes (i (/ (length (match-data 'integers)) 2)) + (setq rev (or rev (match-string (1+ i))))) (unless (re-search-forward log-view-file-re pt t) rev)))))) +(defvar cvs-minor-current-files) +(defvar cvs-branch-prefix) +(defvar cvs-secondary-branch-prefix) + (defun log-view-minor-wrap (buf f) (let ((data (with-current-buffer buf - (cons - (cons (log-view-current-file) - (log-view-current-tag)) - (when mark-active - (save-excursion - (goto-char (mark)) - (cons (log-view-current-file) - (log-view-current-tag)))))))) + (let* ((beg (point)) + (end (if mark-active (mark) (point))) + (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 + ;; 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)))))) (let ((cvs-branch-prefix (cdar data)) (cvs-secondary-branch-prefix (and (cdar data) (cddr data))) (cvs-minor-current-files @@ -193,10 +263,11 @@ ;; (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." + "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." (interactive (list (if mark-active (region-beginning) (point)) (if mark-active (region-end) (point))))