Mercurial > emacs
annotate lisp/log-view.el @ 85341:68048ac5712c
(server-process-filter): Only set display if X11 is
supported.
author | Dan Nicolaescu <dann@ics.uci.edu> |
---|---|
date | Wed, 17 Oct 2007 02:07:35 +0000 |
parents | 8ba0e30716a5 |
children | 30ad99e6b535 d38543a1c0f9 |
rev | line source |
---|---|
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
1 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
68651
3bd95f4f2941
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68370
diff
changeset
|
3 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, |
75347 | 4 ;; 2006, 2007 Free Software Foundation, Inc. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 |
70292
2b77fa42947f
Update my email address.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
6 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca> |
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
7 ;; Keywords: rcs sccs cvs log version-control |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78077
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 ;; any later version. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;;; Commentary: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27 |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
28 ;; Major mode to browse revision log histories. |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
29 ;; Currently supports the format output by: |
68098
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
30 ;; RCS, SCCS, CVS, Subversion, and DaRCS. |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
31 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
32 ;; Examples of log output: |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
33 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
34 ;;;; RCS/CVS: |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
36 ;; ---------------------------- |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
37 ;; revision 1.35 locked by: turlutut |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
38 ;; date: 2005-03-22 18:48:38 +0000; author: monnier; state: Exp; lines: +6 -8 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
39 ;; (gnus-display-time-event-handler): |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
40 ;; Check display-time-timer at runtime rather than only at load time |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
41 ;; in case display-time-mode is turned off in the mean time. |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
42 ;; ---------------------------- |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
43 ;; revision 1.34 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
44 ;; date: 2005-02-09 15:50:38 +0000; author: kfstorm; state: Exp; lines: +7 -7 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
45 ;; branches: 1.34.2; |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
46 ;; Change release version from 21.4 to 22.1 throughout. |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
47 ;; Change development version from 21.3.50 to 22.0.50. |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
48 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
49 ;;;; SCCS: |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
50 |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
51 ;;;; Subversion: |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
52 |
68098
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
53 ;;;; Darcs: |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
54 |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
55 ;; Changes to darcsum.el: |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
56 ;; |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
57 ;; Mon Nov 28 15:19:38 GMT 2005 Dave Love <fx@gnu.org> |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
58 ;; * Abstract process startup into darcsum-start-process. Use TERM=dumb. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
59 ;; TERM=dumb avoids escape characters, at least, for any old darcs that |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
60 ;; doesn't understand DARCS_DONT_COLOR & al. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
61 ;; |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
62 ;; Thu Nov 24 15:20:45 GMT 2005 Dave Love <fx@gnu.org> |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
63 ;; * darcsum-mode-related changes. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
64 ;; Don't call font-lock-mode (unnecessary) or use-local-map (redundant). |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
65 ;; Use mode-class 'special. Add :group. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
66 ;; Add trailing-whitespace option to mode hook and fix |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
67 ;; darcsum-display-changeset not to use trailing whitespace. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
68 |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
69 ;;; Todo: |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
70 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
71 ;; - add ability to modify a log-entry (via cvs-mode-admin ;-) |
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
72 ;; - remove references to cvs-* |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
73 ;; - make it easier to add support for new backends without changing the code. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
74 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75 ;;; Code: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 (eval-when-compile (require 'cl)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
78 (require 'pcvs-util) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
79 (autoload 'vc-find-revision "vc") |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
80 (autoload 'vc-version-diff "vc") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 |
65293
f3b1607acf96
(cvs-minor-wrap-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
82 (defvar cvs-minor-wrap-function) |
f3b1607acf96
(cvs-minor-wrap-function): Add defvar.
Juanma Barranquero <lekktu@gmail.com>
parents:
64762
diff
changeset
|
83 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
84 (defgroup log-view nil |
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
85 "Major mode for browsing log output of RCS/CVS/SCCS." |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
86 :group 'pcl-cvs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87 :prefix "log-view-") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
88 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
89 (easy-mmode-defmap log-view-mode-map |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
90 '(("q" . quit-window) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
91 ("z" . kill-this-buffer) |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
92 ("m" . log-view-toggle-mark-entry) |
49236
8df2e5ef3962
(log-view-message-re): The rev might be locked.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42456
diff
changeset
|
93 ;; ("e" . cvs-mode-edit-log) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
94 ("d" . log-view-diff) |
78867
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
95 ("a" . log-view-annotate-version) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
96 ("f" . log-view-find-revision) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
97 ("n" . log-view-msg-next) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
98 ("p" . log-view-msg-prev) |
78882
ccd0441c69e1
* pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78867
diff
changeset
|
99 ("\t" . log-view-msg-next) |
ccd0441c69e1
* pcvs-defs.el (cvs-mode-map): Bind TAB and backtab.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78867
diff
changeset
|
100 ([backtab] . log-view-msg-prev) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
101 ("N" . log-view-file-next) |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
102 ("P" . log-view-file-prev) |
40450
d29fac587062
(log-view-mode-map): Bind `M-n' and `M-p', not `M n'
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
34652
diff
changeset
|
103 ("\M-n" . log-view-file-next) |
d29fac587062
(log-view-mode-map): Bind `M-n' and `M-p', not `M n'
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
34652
diff
changeset
|
104 ("\M-p" . log-view-file-prev)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 "Log-View's keymap." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 :group 'log-view |
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
107 ;; Here I really need either buffer-local keymap-inheritance |
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
108 ;; or a minor-mode-map with lower precedence than the local map. |
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
109 :inherit (if (boundp 'cvs-mode-map) cvs-mode-map)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
110 |
78077
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
111 (easy-menu-define log-view-mode-menu log-view-mode-map |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
112 "Log-View Display Menu" |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
113 `("Log-View" |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
114 ;; XXX Do we need menu entries for these? |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
115 ;; ["Quit" quit-window] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
116 ;; ["Kill This Buffer" kill-this-buffer] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
117 ["Mark Log Entry for Diff" set-mark-command] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
118 ["Diff Revisions" log-view-diff] |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
119 ["Visit Version" log-view-find-revision] |
78867
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
120 ["Annotate Version" log-view-annotate-version] |
78077
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
121 ["Next Log Entry" log-view-msg-next] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
122 ["Previous Log Entry" log-view-msg-prev] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
123 ["Next File" log-view-file-next] |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
124 ["Previous File" log-view-file-prev])) |
442f874e0b22
(log-view-mode-menu): New menu.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
75347
diff
changeset
|
125 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 (defvar log-view-mode-hook nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 "Hook run at the end of `log-view-mode'.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 |
63203
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
129 (defface log-view-file |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 '((((class color) (background light)) |
42456
8a4077ab418c
(various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
42074
diff
changeset
|
131 (:background "grey70" :weight bold)) |
8a4077ab418c
(various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
42074
diff
changeset
|
132 (t (:weight bold))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
133 "Face for the file header line in `log-view-mode'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134 :group 'log-view) |
63203
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
135 ;; backward-compatibility alias |
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
136 (put 'log-view-file-face 'face-alias 'log-view-file) |
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
137 (defvar log-view-file-face 'log-view-file) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
138 |
63203
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
139 (defface log-view-message |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
140 '((((class color) (background light)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 (:background "grey85")) |
42456
8a4077ab418c
(various face definitions): Use :weight, not :bold.
Richard M. Stallman <rms@gnu.org>
parents:
42074
diff
changeset
|
142 (t (:weight bold))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 "Face for the message header line in `log-view-mode'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 :group 'log-view) |
63203
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
145 ;; backward-compatibility alias |
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
146 (put 'log-view-message-face 'face-alias 'log-view-message) |
ecbe83adff58
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-374
Miles Bader <miles@gnu.org>
parents:
60145
diff
changeset
|
147 (defvar log-view-message-face 'log-view-message) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 |
81511
9785d18889ed
(log-view-font-lock-keywords): Use `eval' to consult the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81330
diff
changeset
|
149 (defvar log-view-file-re |
81330
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
150 (concat "^\\(?:Working file: \\(?1:.+\\)" ;RCS and CVS. |
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
151 ;; Subversion has no such thing?? |
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
152 "\\|\\(?:SCCS/s\\.\\|Changes to \\)\\(?1:.+\\):" ;SCCS and Darcs. |
81567
0b055b6ebf6c
Add docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81511
diff
changeset
|
153 "\\)\n") ;Include the \n for font-lock reasons. |
0b055b6ebf6c
Add docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81511
diff
changeset
|
154 "Regexp matching the text identifying the file. |
0b055b6ebf6c
Add docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81511
diff
changeset
|
155 The match group number 1 should match the file name itself.") |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
156 |
81511
9785d18889ed
(log-view-font-lock-keywords): Use `eval' to consult the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81330
diff
changeset
|
157 (defvar log-view-message-re |
81330
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
158 (concat "^\\(?:revision \\(?1:[.0-9]+\\)\\(?:\t.*\\)?" ; RCS and CVS. |
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
159 "\\|r\\(?1:[0-9]+\\) | .* | .*" ; Subversion. |
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
160 "\\|D \\(?1:[.0-9]+\\) .*" ; SCCS. |
68098
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
161 ;; Darcs doesn't have revision names. VC-darcs uses patch names |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
162 ;; instead. Darcs patch names are hashcodes, which do not appear |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
163 ;; in the log output :-(, but darcs accepts any prefix of the log |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
164 ;; message as a patch name, so we match the first line of the log |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
165 ;; message. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
166 ;; First loosely match the date format. |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
167 (concat "\\|[^ \n].*[^0-9\n][0-9][0-9]:[0-9][0-9][^0-9\n].*[^ \n]" |
150225f41e97
(log-view-file-re, log-view-message-re): Add support for DaRCS output.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67775
diff
changeset
|
168 ;;Email of user and finally Msg, used as revision name. |
81330
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
169 " .*@.*\n\\(?: \\* \\(?1:.*\\)\\)?") |
78525
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
170 "\\)$") |
81567
0b055b6ebf6c
Add docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81511
diff
changeset
|
171 "Regexp matching the text identifying a revision. |
0b055b6ebf6c
Add docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81511
diff
changeset
|
172 The match group number 1 should match the revision number itself.") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173 |
78525
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
174 (defvar log-view-font-lock-keywords |
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
175 ;; We use `eval' so as to use the buffer-local value of log-view-file-re |
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
176 ;; and log-view-message-re, if applicable. |
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
177 '((eval . `(,log-view-file-re |
81511
9785d18889ed
(log-view-font-lock-keywords): Use `eval' to consult the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81330
diff
changeset
|
178 (1 (if (boundp 'cvs-filename-face) cvs-filename-face)) |
78525
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
179 (0 log-view-file-face append))) |
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
180 (eval . `(,log-view-message-re . log-view-message-face)))) |
33690fc4e175
(log-view-font-lock-keywords): Use `eval' so as to adapt to buffer settings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
181 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
182 (defconst log-view-font-lock-defaults |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
183 '(log-view-font-lock-keywords t nil nil nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
184 |
40954 | 185 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
186 ;;;; Actual code |
40954 | 187 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
188 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
189 ;;;###autoload |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
190 (define-derived-mode log-view-mode fundamental-mode "Log-View" |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
191 "Major mode for browsing CVS log output." |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
192 (setq buffer-read-only t) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
193 (set (make-local-variable 'font-lock-defaults) log-view-font-lock-defaults) |
78867
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
194 (set (make-local-variable 'beginning-of-defun-function) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
195 'log-view-beginning-of-defun) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
196 (set (make-local-variable 'end-of-defun-function) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
197 'log-view-end-of-defun) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
198 (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
199 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
200 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
201 ;;;; Navigation |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
202 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
204 ;; define log-view-{msg,file}-{next,prev} |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
205 (easy-mmode-define-navigation log-view-msg log-view-message-re "log message") |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
206 (easy-mmode-define-navigation log-view-file log-view-file-re "file") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
207 |
28861
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
208 (defun log-view-goto-rev (rev) |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
209 (goto-char (point-min)) |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
210 (ignore-errors |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
211 (while (not (equal rev (log-view-current-tag))) |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
212 (log-view-msg-next)) |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
213 t)) |
bab7620d1466
(log-view-goto-rev): New function for the new VC.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28251
diff
changeset
|
214 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
215 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
216 ;;;; Linkage to PCL-CVS (mostly copied from cvs-status.el) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
217 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
218 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
219 (defconst log-view-dir-re "^cvs[.ex]* [a-z]+: Logging \\(.+\\)$") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
220 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
221 (defun log-view-current-file () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
222 (save-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
223 (forward-line 1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
224 (or (re-search-backward log-view-file-re nil t) |
83843
bdd75f65c6cd
(log-view-current-file): Give a more explicit error if
Glenn Morris <rgm@gnu.org>
parents:
82852
diff
changeset
|
225 (re-search-forward log-view-file-re nil t) |
83845
0f772ae43706
(log-view-current-file): Balance parens.
Romain Francoise <romain@orebokech.com>
parents:
83843
diff
changeset
|
226 (error "Unable to determine the current file")) |
81330
f7754bd2e73f
(log-view-file-re, log-view-message-re): Use \(?1:...\).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
227 (let* ((file (match-string 1)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (cvsdir (and (re-search-backward log-view-dir-re nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 (match-string 1))) |
29041
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
230 (pcldir (and (boundp 'cvs-pcl-cvs-dirchange-re) |
49e8918cab44
Fix file description.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28861
diff
changeset
|
231 (re-search-backward cvs-pcl-cvs-dirchange-re nil t) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 (match-string 1))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 (dir "")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 (let ((default-directory "")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 (when pcldir (setq dir (expand-file-name pcldir dir))) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
236 (when cvsdir (setq dir (expand-file-name cvsdir dir)))) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
237 (expand-file-name file dir)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
239 (defun log-view-current-tag (&optional where) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
240 (save-excursion |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
241 (when where (goto-char where)) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
242 (forward-line 1) |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
243 (let ((pt (point))) |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
244 (when (re-search-backward log-view-message-re nil t) |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
245 (let ((rev (match-string-no-properties 1))) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
246 (unless (re-search-forward log-view-file-re pt t) |
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
247 rev)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
248 |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
249 (defun log-view-toggle-mark-entry () |
82852
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
250 "Toggle the marked state for the log entry at point. |
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
251 Individual log entries can be marked and unmarked. The marked |
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
252 entries are denoted by changing their background color. |
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
253 `log-view-get-marked' returns the list of tags for the marked |
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
254 log entries." |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
255 (interactive) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
256 (save-excursion |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
257 (forward-line 1) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
258 (let ((pt (point))) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
259 (when (re-search-backward log-view-message-re nil t) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
260 (let ((beg (match-beginning 0)) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
261 end ov ovlist found tag) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
262 (unless (re-search-forward log-view-file-re pt t) |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
263 ;; Look to see if the current entry is marked. |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
264 (setq found (get-char-property (point) 'log-view-self)) |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
265 (if found |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
266 (delete-overlay found) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
267 ;; Create an overlay that covers this entry and change |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
268 ;; it's color. |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
269 (setq tag (log-view-current-tag (point))) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
270 (forward-line 1) |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
271 (setq end |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
272 (if (re-search-forward log-view-message-re nil t) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
273 (match-beginning 0) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
274 (point-max))) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
275 (setq ov (make-overlay beg end)) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
276 (overlay-put ov 'face 'log-view-file) |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
277 ;; This is used to check if the overlay is present. |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
278 (overlay-put ov 'log-view-self ov) |
82826
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
279 (overlay-put ov 'log-view-marked tag)))))))) |
0d52789c865e
(log-view-toggle-mark-entry): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82365
diff
changeset
|
280 |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
281 (defun log-view-get-marked () |
82852
26de218dc2d9
(log-view-toggle-mark-entry): Add docstring.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82844
diff
changeset
|
282 "Return the list of tags for the marked log entries." |
82844
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
283 (save-excursion |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
284 (let ((pos (point-min)) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
285 marked-list ov) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
286 (while (setq pos (next-single-property-change pos 'face)) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
287 (when (setq ov (get-char-property pos 'log-view-self)) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
288 (push (overlay-get ov 'log-view-marked) marked-list) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
289 (setq pos (overlay-end ov)))) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
290 marked-list))) |
a25b7156354b
(log-view-marked-list): Delete variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82826
diff
changeset
|
291 |
78867
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
292 (defun log-view-beginning-of-defun () |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
293 ;; This assumes that a log entry starts with a line matching |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
294 ;; `log-view-message-re'. Modes that derive from `log-view-mode' |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
295 ;; for which this assumption is not valid will have to provide |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
296 ;; another implementation of this function. `log-view-msg-prev' |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
297 ;; does a similar job to this function, we can't use it here |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
298 ;; directly because it prints messages that are not appropriate in |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
299 ;; this context and it does not move to the beginning of the buffer |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
300 ;; when the point is before the first log entry. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
301 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
302 ;; `log-view-beginning-of-defun' and `log-view-end-of-defun' have |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
303 ;; been checked to work with logs produced by RCS, CVS, git, |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
304 ;; mercurial and subversion. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
305 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
306 (re-search-backward log-view-message-re nil 'move)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
307 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
308 (defun log-view-end-of-defun () |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
309 ;; The idea in this function is to search for the beginning of the |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
310 ;; next log entry using `log-view-message-re' and then go back one |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
311 ;; line when finding it. Modes that derive from `log-view-mode' for |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
312 ;; which this assumption is not valid will have to provide another |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
313 ;; implementation of this function. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
314 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
315 ;; Look back and if there is no entry there it means we are before |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
316 ;; the first log entry, so go forward until finding one. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
317 (unless (save-excursion (re-search-backward log-view-message-re nil t)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
318 (re-search-forward log-view-message-re nil t)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
319 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
320 ;; In case we are at the end of log entry going forward a line will |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
321 ;; make us find the next entry when searching. If we are inside of |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
322 ;; an entry going forward a line will still keep the point inside |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
323 ;; the same entry. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
324 (forward-line 1) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
325 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
326 ;; In case we are at the beginning of an entry, move past it. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
327 (when (looking-at log-view-message-re) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
328 (goto-char (match-end 0)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
329 (forward-line 1)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
330 |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
331 ;; Search for the start of the next log entry. Go to the end of the |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
332 ;; buffer if we could not find a next entry. |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
333 (when (re-search-forward log-view-message-re nil 'move) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
334 (goto-char (match-beginning 0)) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
335 (forward-line -1))) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
336 |
67709
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
337 (defvar cvs-minor-current-files) |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
338 (defvar cvs-branch-prefix) |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
339 (defvar cvs-secondary-branch-prefix) |
6f549652480e
(log-view-file-re, log-view-message-re): Use shy groups.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67569
diff
changeset
|
340 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
341 (defun log-view-minor-wrap (buf f) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
342 (let ((data (with-current-buffer buf |
68370
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
343 (let* ((beg (point)) |
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
344 (end (if mark-active (mark) (point))) |
68221
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
345 (fr (log-view-current-tag beg)) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
346 (to (log-view-current-tag end))) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
347 (when (string-equal fr to) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
348 (save-excursion |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
349 (goto-char end) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
350 (log-view-msg-next) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
351 (setq to (log-view-current-tag)))) |
4804f7b39bfe
(log-view-minor-wrap): Use the same logic to get revisions as `log-view-diff'.
Juri Linkov <juri@jurta.org>
parents:
68098
diff
changeset
|
352 (cons |
68370
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
353 ;; The first revision has to be the one at point, for |
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
354 ;; operations that only take one revision |
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
355 ;; (e.g. cvs-mode-edit). |
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
356 (cons (log-view-current-file) fr) |
89e7eb7d165b
(log-view-minor-wrap): First rev is the one at point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68221
diff
changeset
|
357 (cons (log-view-current-file) to)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
358 (let ((cvs-branch-prefix (cdar data)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (cvs-secondary-branch-prefix (and (cdar data) (cddr data))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360 (cvs-minor-current-files |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
361 (cons (caar data) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
362 (when (and (cadr data) (not (equal (caar data) (cadr data)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
363 (list (cadr data))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364 ;; FIXME: I need to force because the fileinfos are UNKNOWN |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 (cvs-force-command "/F")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 (funcall f)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
368 (defun log-view-find-revision (pos) |
41557
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
369 "Visit the version at point." |
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
370 (interactive "d") |
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
371 (save-excursion |
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
372 (goto-char pos) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
373 (switch-to-buffer (vc-find-revision (log-view-current-file) |
41557
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
374 (log-view-current-tag))))) |
be985e4c1430
(log-view-find-version): New function.
André Spiegel <spiegel@gnu.org>
parents:
41137
diff
changeset
|
375 |
78867
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
376 (defun log-view-annotate-version (pos) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
377 "Annotate the version at point." |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
378 (interactive "d") |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
379 (save-excursion |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
380 (goto-char pos) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
381 (switch-to-buffer (vc-annotate (log-view-current-file) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
382 (log-view-current-tag))))) |
82b0e30f9888
* files.el (file-name-sans-versions): Allow - and a-z in version
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78525
diff
changeset
|
383 |
42074
fdee0c7c3bf1
(log-view-message-re, log-view-current-tag):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41557
diff
changeset
|
384 ;; |
fdee0c7c3bf1
(log-view-message-re, log-view-current-tag):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41557
diff
changeset
|
385 ;; diff |
fdee0c7c3bf1
(log-view-message-re, log-view-current-tag):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
41557
diff
changeset
|
386 ;; |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
387 |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
388 (defun log-view-diff (beg end) |
67569 | 389 "Get the diff between two revisions. |
390 If the mark is not active or the mark is on the revision at point, | |
391 get the diff between the revision at point and its previous revision. | |
392 Otherwise, get the diff between the revisions where the region starts | |
393 and ends." | |
55175
e7a5be902830
(log-view-diff): Replace interactive code "r"
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
394 (interactive |
e7a5be902830
(log-view-diff): Replace interactive code "r"
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
395 (list (if mark-active (region-beginning) (point)) |
e7a5be902830
(log-view-diff): Replace interactive code "r"
Juri Linkov <juri@jurta.org>
parents:
52401
diff
changeset
|
396 (if mark-active (region-end) (point)))) |
40958
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
397 (let ((fr (log-view-current-tag beg)) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
398 (to (log-view-current-tag end))) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
399 (when (string-equal fr to) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
400 (save-excursion |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
401 (goto-char end) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
402 (log-view-msg-next) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
403 (setq to (log-view-current-tag)))) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
404 (vc-version-diff (log-view-current-file) to fr))) |
4b4504c5aa56
* vc.el (vc-print-log): Bind `inhibit-read-only' to t before and
Sam Steingold <sds@gnu.org>
parents:
40954
diff
changeset
|
405 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
406 (provide 'log-view) |
28251
21d27711125f
(log-view-(msg|file)-(prev|next)): Rename from
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
407 |
60145
e7ec1f80fc80
(log-view-message-re): Fix up Subversion regexp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55175
diff
changeset
|
408 ;; arch-tag: 0d64220b-ce7e-4f62-9c2a-6b04c2f81f4f |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
409 ;;; log-view.el ends here |