;;; 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 <monnier@cs.yale.edu>
+;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
;; Keywords: rcs sccs cvs log version-control
;; This file is part of GNU Emacs.
;; Major mode to browse revision log histories.
;; Currently supports the format output by:
-;; RCS, SCCS, CVS, Subversion.
+;; RCS, SCCS, CVS, Subversion, and DaRCS.
;; Examples of log output:
;;;; Subversion:
+;;;; Darcs:
+
+;; Changes to darcsum.el:
+;;
+;; Mon Nov 28 15:19:38 GMT 2005 Dave Love <fx@gnu.org>
+;; * 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 <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.
+
;;; Todo:
;; - add ability to modify a log-entry (via cvs-mode-admin ;-)
(eval-when-compile (require 'cl))
(require 'pcvs-util)
+(autoload 'vc-find-version "vc")
(autoload 'vc-version-diff "vc")
(defvar cvs-minor-wrap-function)
(defconst log-view-file-re
(concat "^\\(?:Working file: \\(.+\\)" ;RCS and CVS.
- "\\|SCCS/s\\.\\(.+\\):" ;SCCS.
+ "\\|\\(?: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
(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)
(when (re-search-backward log-view-message-re nil t)
(let (rev)
;; Find the subgroup that matched.
- (dotimes (i (/ (match-data 'integers) 2))
+ (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))))))
(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