diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-01-09 18:21:06 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2006-01-09 18:21:06 +0000 |
| commit | 62c5f375b19025777a5c839536154bf86420d706 (patch) | |
| tree | be64d93f285e5d12ed593270f283df343b2b2301 /lisp | |
| parent | f6db182ba9ad412df9caa01889c885d413ff23b2 (diff) | |
| download | emacs-62c5f375b19025777a5c839536154bf86420d706.tar.gz | |
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 9 | ||||
| -rw-r--r-- | lisp/log-view.el | 29 |
2 files changed, 34 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b0f39f42cc0..0cfbd8e8c63 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-01-09 Stefan Monnier <monnier@iro.umontreal.ca> + + * log-view.el (log-view-file-re, log-view-message-re): Add support + for DaRCS output. + 2006-01-09 Alex Schroeder <alex@gnu.org> * mail/rmail.el (rmail-reply-regexp): Also ignore mailing list @@ -21,8 +26,8 @@ (rmail-current-subject-regexp): New function. (rmail-next-same-subject): Use it. - * mail/rmailsum.el (rmail-summary-by-topic): Use - rmail-current-subject and rmail-current-subject-regexp. + * mail/rmailsum.el (rmail-summary-by-topic): + Use rmail-current-subject and rmail-current-subject-regexp. (rmail-summary-next-same-subject): Ditto. * net/rcirc.el (rcirc-send-input): No longer check whether the diff --git a/lisp/log-view.el b/lisp/log-view.el index ac82c984084..7025a893287 100644 --- a/lisp/log-view.el +++ b/lisp/log-view.el @@ -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 <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 ;-) @@ -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 |