diff lisp/log-view.el @ 83455:8438f5473d99

Merged from [e-mail]--gnu-2005 (patch 174-181, 685-690) Patches applied: * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-685 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-686 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-687 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-688 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-689 Update from CVS * [e-mail]--gnu-2005/emacs--cvs-trunk--0--patch-690 Merge from gnus--rel--5.10 * [e-mail]--gnu-2005/gnus--rel--5.10--patch-174 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-175 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-176 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-177 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-178 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-179 Update from CVS: texi/gnus.texi (RSS): Addition. * [e-mail]--gnu-2005/gnus--rel--5.10--patch-180 Update from CVS * [e-mail]--gnu-2005/gnus--rel--5.10--patch-181 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-495

--- a/lisp/log-view.el	Wed Jan 11 14:51:51 2006 +0000
+++ b/lisp/log-view.el	Thu Jan 12 11:20:02 2006 +0000
@@ -27,7 +27,7 @@
 
 ;; 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:
 
@@ -50,6 +50,22 @@
 
 ;;;; Subversion:
 
+;;;; Darcs:
+
+;; Changes to darcsum.el:
+;; 
+;; Mon Nov 28 15:19:38 GMT 2005  Dave Love <[e-mail]>
+;;   * 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 <[e-mail]>
+;;   * 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 ;-)
@@ -114,13 +130,22 @@
 
 (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