Mercurial > emacs
annotate lisp/vc.el @ 2674:2579fa92c809
(main): Handle -display like -d.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Thu, 06 May 1993 17:04:56 +0000 |
parents | 62869d996485 |
children | be85636d8b6e |
rev | line source |
---|---|
904 | 1 ;;; vc.el --- drive a version-control system from within Emacs |
2 | |
3 ;; Copyright (C) 1992 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
6 ;; Version: 5.4 |
904 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to | |
22 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. | |
23 | |
24 ;;; Commentary: | |
25 | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
26 ;; This mode is fully documented in the Emacs user's manual. |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
27 ;; |
904 | 28 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>. |
29 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>, | |
30 ;; and Richard Stallman contributed valuable criticism, support, and testing. | |
31 ;; | |
32 ;; Supported version-control systems presently include SCCS and RCS; | |
33 ;; your RCS version should be 5.6.2 or later for proper operation of | |
34 ;; the lock-breaking code. | |
35 ;; | |
36 ;; The RCS code assumes strict locking. You can support the RCS -x option | |
37 ;; by adding pairs to the vc-master-templates list. | |
38 ;; | |
39 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
40 ;; to be installed somewhere on Emacs's path for executables. | |
41 ;; | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
42 ;; If your site uses the ChangeLog convention supported by Emacs, the |
2464
667050db93ca
(vc-comment-to-change-log): Renamed from vc-comment-to-changelog.
Roland McGrath <roland@gnu.org>
parents:
2419
diff
changeset
|
43 ;; function vc-comment-to-change-log should prove a useful checkin hook. |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
44 ;; |
904 | 45 ;; This code depends on call-process passing back the subprocess exit |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
46 ;; status. Thus, you need Emacs 18.58 or later to run it. For the |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
47 ;; vc-directory command to work properly, you need 19 |
904 | 48 ;; |
49 ;; The vc code maintains some internal state in order to reduce expensive | |
50 ;; version-control operations to a minimum. Some names are only computed | |
51 ;; once. If you perform version control operations with RCS/SCCS/CVS while | |
52 ;; vc's back is turned, or move/rename master files while vc is running, | |
53 ;; vc may get seriously confused. Don't do these things! | |
54 ;; | |
55 ;; Developer's notes on some concurrency issues are included at the end of | |
56 ;; the file. | |
57 | |
58 ;;; Code: | |
59 | |
60 (require 'vc-hooks) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
61 (require 'ring) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
62 (require 'dired) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
63 (require 'compile) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
64 (require 'sendmail) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
65 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
66 (if (not (assoc 'vc-parent-buffer minor-mode-alist)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
67 (setq minor-mode-alist |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
68 (cons '(vc-parent-buffer vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
69 minor-mode-alist))) |
904 | 70 |
71 ;; General customization | |
72 | |
73 (defvar vc-default-back-end nil | |
74 "*Back-end actually used by this interface; may be SCCS or RCS. | |
75 The value is only computed when needed to avoid an expensive search.") | |
76 (defvar vc-suppress-confirm nil | |
77 "*If non-nil, reat user as expert; suppress yes-no prompts on some things.") | |
78 (defvar vc-keep-workfiles t | |
79 "*If non-nil, don't delete working files after registering changes.") | |
80 (defvar vc-initial-comment nil | |
81 "*Prompt for initial comment when a file is registered.") | |
82 (defvar vc-command-messages nil | |
83 "*Display run messages from back-end commands.") | |
84 (defvar vc-mistrust-permissions 'file-symlink-p | |
85 "*Don't assume that permissions and ownership track version-control status.") | |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
86 (defvar vc-checkin-switches nil |
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
87 "*Extra switches passed to the checkin program by \\[vc-checkin].") |
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
88 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
89 (defconst vc-maximum-comment-ring-size 32 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
90 "Maximum number of saved comments in the comment ring.") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
91 |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
92 ;;;###autoload |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
93 (defvar vc-checkin-hook nil |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
94 "*List of functions called after a vc-checkin is done. See `run-hooks'.") |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
95 |
904 | 96 ;; Header-insertion hair |
97 | |
98 (defvar vc-header-alist | |
99 '((SCCS "\%W\%") (RCS "\$Id\$")) | |
100 "*Header keywords to be inserted when vc-insert-header is executed.") | |
101 (defconst vc-static-header-alist | |
102 '(("\\.c$" . | |
103 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) | |
104 "*Associate static header string templates with file types. A \%s in the | |
105 template is replaced with the first string associated with the file's | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
106 verson-control type in vc-header-alist.") |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
107 |
904 | 108 (defvar vc-comment-alist |
109 '((nroff-mode ".\\\"" "")) | |
110 "*Special comment delimiters to be used in generating vc headers only. | |
111 Add an entry in this list if you need to override the normal comment-start | |
112 and comment-end variables. This will only be necessary if the mode language | |
113 is sensitive to blank lines.") | |
114 | |
115 ;; Variables the user doesn't need to know about. | |
116 (defvar vc-log-entry-mode nil) | |
117 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
118 (defvar vc-log-after-operation-hook nil) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
119 (defvar vc-checkout-writeable-buffer-hook 'vc-checkout-writeable-buffer) |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
120 (defvar vc-parent-buffer nil) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
121 (defvar vc-parent-buffer-name nil) |
904 | 122 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
123 (defvar vc-log-file) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
124 (defvar vc-log-version) |
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
125 |
904 | 126 (defconst vc-name-assoc-file "VC-names") |
127 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
128 (defvar vc-dired-mode nil) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
129 (make-variable-buffer-local 'vc-dired-mode) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
130 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
131 (defvar vc-comment-ring nil) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
132 (defvar vc-comment-ring-index nil) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
133 (defvar vc-last-comment-match nil) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
134 |
904 | 135 ;; File property caching |
136 | |
137 (defun vc-file-clearprops (file) | |
138 ;; clear all properties of a given file | |
139 (setplist (intern file vc-file-prop-obarray) nil)) | |
140 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
141 (defun vc-clear-context () |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
142 "Clear all cached file properties and the comment ring." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
143 (interactive) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
144 (fillarray vc-file-prop-obarray nil) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
145 ;; Note: there is potential for minor lossage here if there is an open |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
146 ;; log buffer with a nonzero local value of vc-comment-ring-index. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
147 (setq vc-comment-ring nil)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
148 |
904 | 149 ;; Random helper functions |
150 | |
151 (defun vc-name (file) | |
152 "Return the master name of a file, nil if it is not registered" | |
153 (or (vc-file-getprop file 'vc-name) | |
154 (vc-file-setprop file 'vc-name | |
155 (let ((name-and-type (vc-registered file))) | |
156 (and name-and-type (car name-and-type)))))) | |
157 | |
158 (defvar vc-binary-assoc nil) | |
159 | |
160 (defun vc-find-binary (name) | |
161 "Look for a command anywhere on the subprocess-command search path." | |
162 (or (cdr (assoc name vc-binary-assoc)) | |
163 (let ((full nil)) | |
164 (catch 'found | |
165 (mapcar | |
166 (function (lambda (s) | |
167 (if (and s (file-exists-p (setq full (concat s "/" name)))) | |
168 (throw 'found nil)))) | |
169 exec-path)) | |
170 (if full | |
171 (setq vc-binary-assoc (cons (cons name full) vc-binary-assoc))) | |
172 full))) | |
173 | |
174 (defun vc-do-command (okstatus command file &rest flags) | |
175 "Execute a version-control command, notifying user and checking for errors. | |
176 The command is successful if its exit status does not exceed OKSTATUS. | |
177 Output from COMMAND goes to buffer *vc*. The last argument of the command is | |
178 the master name of FILE; this is appended to an optional list of FLAGS." | |
179 (setq file (expand-file-name file)) | |
180 (if vc-command-messages | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
181 (message "Running %s on %s..." command file)) |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
182 (let ((obuf (current-buffer)) (camefrom (current-buffer)) |
904 | 183 (squeezed nil) |
184 (vc-file (and file (vc-name file))) | |
185 status) | |
186 (set-buffer (get-buffer-create "*vc*")) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
187 (set (make-local-variable 'vc-parent-buffer) camefrom) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
188 (set (make-local-variable 'vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
189 (concat " from " (buffer-name camefrom))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
190 |
904 | 191 (erase-buffer) |
1674
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
192 |
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
193 ;; This is so that command arguments typed in the *vc* buffer will |
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
194 ;; have reasonable defaults. |
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
195 (setq default-directory (file-name-directory file)) |
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
196 |
904 | 197 (mapcar |
198 (function (lambda (s) (and s (setq squeezed (append squeezed (list s)))))) | |
199 flags) | |
200 (if vc-file | |
201 (setq squeezed (append squeezed (list vc-file)))) | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
202 (let ((default-directory (file-name-directory (or file "./")))) |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
203 (setq status (apply 'call-process command nil t nil squeezed))) |
904 | 204 (goto-char (point-max)) |
205 (previous-line 1) | |
206 (if (or (not (integerp status)) (< okstatus status)) | |
207 (progn | |
208 (previous-line 1) | |
209 (print (cons command squeezed)) | |
210 (next-line 1) | |
211 (pop-to-buffer "*vc*") | |
212 (vc-shrink-to-fit) | |
213 (goto-char (point-min)) | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
214 (error "Running %s...FAILED (%s)" command |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
215 (if (integerp status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
216 (format "status %d" status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
217 status)) |
904 | 218 ) |
219 (if vc-command-messages | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
220 (message "Running %s...OK" command)) |
904 | 221 ) |
222 (set-buffer obuf) | |
223 status) | |
224 ) | |
225 | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
226 ;;; Save a bit of the text around POSN in the current buffer, to help |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
227 ;;; us find the corresponding position again later. This works even |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
228 ;;; if all markers are destroyed or corrupted. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
229 (defun vc-position-context (posn) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
230 (list posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
231 (buffer-size) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
232 (buffer-substring posn |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
233 (min (point-max) (+ posn 100))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
234 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
235 ;;; Return the position of CONTEXT in the current buffer, or nil if we |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
236 ;;; couldn't find it. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
237 (defun vc-find-position-by-context (context) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
238 (let ((context-string (nth 2 context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
239 (if (equal "" context-string) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
240 (point-max) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
241 (save-excursion |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
242 (let ((diff (- (nth 1 context) (buffer-size)))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
243 (if (< diff 0) (setq diff (- diff))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
244 (goto-char (nth 0 context)) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
245 (if (or (search-forward context-string nil t) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
246 ;; Can't use search-backward since the match may continue |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
247 ;; after point. |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
248 (progn (goto-char (- (point) diff (length context-string))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
249 ;; goto-char doesn't signal an error at |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
250 ;; beginning of buffer like backward-char would |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
251 (search-forward context-string nil t))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
252 ;; to beginning of OSTRING |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
253 (- (point) (length context-string)))))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
254 |
904 | 255 (defun vc-revert-buffer1 (&optional arg no-confirm) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
256 ;; Most of this was shamelessly lifted from Sebastian Kremer's rcs.el mode. |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
257 ;; Revert buffer, try to keep point and mark where user expects them in spite |
904 | 258 ;; of changes because of expanded version-control key words. |
259 ;; This is quite important since otherwise typeahead won't work as expected. | |
260 (interactive "P") | |
261 (widen) | |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
262 (let ((point-context (vc-position-context (point))) |
2041
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
263 ;; Use mark-marker to avoid confusion in transient-mark-mode. |
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
264 (mark-context (if (eq (marker-buffer (mark-marker)) (current-buffer)) |
ccb75415543a
(vc-revert-buffer1): Use mark-marker; don't alter mark-active.
Richard M. Stallman <rms@gnu.org>
parents:
1905
diff
changeset
|
265 (vc-position-context (mark-marker)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
266 ;; Make the right thing happen in transient-mark-mode. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
267 (mark-active nil) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
268 ;; We may want to reparse the compilation buffer after revert |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
269 (reparse (and (boundp 'compilation-error-list) ;compile loaded |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
270 (let ((curbuf (current-buffer))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
271 ;; Construct a list; each elt is nil or a buffer |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
272 ;; iff that buffer is a compilation output buffer |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
273 ;; that contains markers into the current buffer. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
274 (save-excursion |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
275 (mapcar (lambda (buffer) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
276 (set-buffer buffer) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
277 (let ((errors (or |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
278 compilation-old-error-list |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
279 compilation-error-list)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
280 (buffer-error-marked-p nil)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
281 (while (and errors |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
282 (not buffer-error-marked-p)) |
2617
e2e5dfa162b4
(vc-revert-buffer1): Fix format of compilation-error-list.
Richard M. Stallman <rms@gnu.org>
parents:
2612
diff
changeset
|
283 (and (markerp (cdr (car errors))) |
2604
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
284 (eq buffer |
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
285 (marker-buffer |
2617
e2e5dfa162b4
(vc-revert-buffer1): Fix format of compilation-error-list.
Richard M. Stallman <rms@gnu.org>
parents:
2612
diff
changeset
|
286 (cdr (car errors)))) |
2604
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
287 (setq buffer-error-marked-p t)) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
288 (setq errors (cdr errors))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
289 (if buffer-error-marked-p buffer))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
290 (buffer-list))))))) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
291 |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
292 ;; the actual revisit |
904 | 293 (revert-buffer arg no-confirm) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
294 |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
295 ;; Reparse affected compilation buffers. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
296 (while reparse |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
297 (if (car reparse) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
298 (save-excursion |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
299 (set-buffer (car reparse)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
300 (let ((compilation-last-buffer (current-buffer)) ;select buffer |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
301 ;; Record the position in the compilation buffer of |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
302 ;; the last error next-error went to. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
303 (error-pos (marker-position |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
304 (car (car-safe compilation-error-list))))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
305 ;; Reparse the error messages as far as they were parsed before. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
306 (compile-reinitialize-errors '(4) compilation-parsing-end) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
307 ;; Move the pointer up to find the error we were at before |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
308 ;; reparsing. Now next-error should properly go to the next one. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
309 (while (and compilation-error-list |
2558
78a9cebdb22c
(vc-revert-buffer1): Typo fix in last change.
Roland McGrath <roland@gnu.org>
parents:
2555
diff
changeset
|
310 (/= error-pos (car (car compilation-error-list)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
311 (setq compilation-error-list (cdr compilation-error-list)))))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
312 (setq reparse (cdr reparse))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
313 |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
314 ;; Restore point and mark |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
315 (let ((new-point (vc-find-position-by-context point-context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
316 (if new-point (goto-char new-point))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
317 (if mark-context |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
318 (let ((new-mark (vc-find-position-by-context mark-context))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
319 (if new-mark (set-mark new-mark)))))) |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
320 |
904 | 321 |
322 (defun vc-buffer-sync () | |
323 ;; Make sure the current buffer and its working file are in sync | |
324 (if (and (buffer-modified-p) | |
325 (or | |
326 vc-suppress-confirm | |
327 (y-or-n-p (format "%s has been modified. Write it out? " | |
328 (buffer-name))))) | |
329 (save-buffer))) | |
330 | |
331 (defun vc-workfile-unchanged-p (file) | |
332 ;; Has the given workfile changed since last checkout? | |
333 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | |
334 (lastmod (nth 5 (file-attributes file)))) | |
335 (if checkout-time | |
336 (equal lastmod checkout-time) | |
337 (if (zerop (vc-backend-diff file nil)) | |
338 (progn | |
339 (vc-file-setprop file 'vc-checkout-time lastmod) | |
340 t) | |
341 (progn | |
342 (vc-file-setprop file 'vc-checkout-time '(0 . 0)) | |
343 nil | |
344 )) | |
345 ))) | |
346 | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
347 (defun vc-next-action-on-file (file verbose &optional comment) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
348 ;;; If comment is specified, it will be used as an admin or checkin comment. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
349 (let (owner version (vc-file (vc-name file))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
350 (cond |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
351 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
352 ;; if there is no master file corresponding, create one |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
353 ((not vc-file) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
354 (vc-register verbose comment) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
355 (if vc-initial-comment |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
356 (setq vc-log-after-operation-hook |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
357 'vc-checkout-writeable-buffer-hook) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
358 (vc-checkout-writeable-buffer file))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
359 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
360 ;; if there is no lock on the file, assert one and get it |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
361 ((not (setq owner (vc-locking-user file))) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
362 (vc-checkout-writeable-buffer file)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
363 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
364 ;; a checked-out version exists, but the user may not own the lock |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
365 ((not (string-equal owner (user-login-name))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
366 (if comment |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
367 (error "Sorry, you can't steal the lock on %s this way." file)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
368 (vc-steal-lock |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
369 file |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
370 (and verbose (read-string "Version to steal: ")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
371 owner)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
372 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
373 ;; OK, user owns the lock on the file |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
374 (t |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
375 (find-file file) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
376 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
377 ;; give luser a chance to save before checking in. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
378 (vc-buffer-sync) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
379 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
380 ;; Revert if file is unchanged and buffer is too. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
381 ;; If buffer is modified, that means the user just said no |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
382 ;; to saving it; in that case, don't revert, |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
383 ;; because the user might intend to save |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
384 ;; after finishing the log entry. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
385 (if (and (vc-workfile-unchanged-p file) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
386 (not (buffer-modified-p))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
387 (progn |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
388 (vc-backend-revert file) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
389 ;; DO NOT revert the file without asking the user! |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
390 (vc-resynch-window file t nil)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
391 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
392 ;; user may want to set nonstandard parameters |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
393 (if verbose |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
394 (setq version (read-string "New version level: "))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
395 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
396 ;; OK, let's do the checkin |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
397 (vc-checkin file version comment) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
398 ))))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
399 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
400 (defun vc-next-action-dired (file rev comment) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
401 ;; We've accepted a log comment, now do a vc-next-action using it on all |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
402 ;; marked files. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
403 (set-buffer vc-parent-buffer) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
404 (dired-map-over-marks |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
405 (save-window-excursion |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
406 (let ((file (dired-get-filename))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
407 (message "Processing %s..." file) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
408 (vc-next-action-on-file file nil comment) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
409 (message "Processing %s...done" file))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
410 nil t) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
411 ) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
412 |
927 | 413 ;; Here's the major entry point. |
904 | 414 |
927 | 415 ;;;###autoload |
904 | 416 (defun vc-next-action (verbose) |
417 "Do the next logical checkin or checkout operation on the current file. | |
418 If the file is not already registered, this registers it for version | |
419 control and then retrieves a writeable, locked copy for editing. | |
420 If the file is registered and not locked by anyone, this checks out | |
421 a writeable and locked file ready for editing. | |
422 If the file is checked out and locked by the calling user, this | |
423 first checks to see if the file has changed since checkout. If not, | |
424 it performs a revert. | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
425 If the file has been changed, this pops up a buffer for entry |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
426 of a log message; when the message has been entered, it checks in the |
904 | 427 resulting changes along with the log message as change commentary. If |
428 the variable vc-keep-workfiles is non-nil (which is its default), a | |
429 read-only copy of the changed file is left in place afterwards. | |
430 If the file is registered and locked by someone else, you are given | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
431 the option to steal the lock. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
432 If you call this from within a VC dired buffer with no files marked, |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
433 it will operate on the file in the current line. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
434 If you call this from within a VC dired buffer, and one or more |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
435 files are marked, it will accept a log message and then operate on |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
436 each one. The log message will be used as a comment for any register |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
437 or checkin operations, but ignored when doing checkouts. Attempted |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
438 lock steals will raise an error." |
904 | 439 (interactive "P") |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
440 (catch 'nogo |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
441 (if vc-dired-mode |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
442 (let ((files (dired-get-marked-files))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
443 (if (= (length files) 1) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
444 (find-file-other-window (dired-get-filename)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
445 (vc-start-entry nil nil nil |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
446 "Enter a change comment for the marked files." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
447 'vc-next-action-dired) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
448 (throw 'nogo)))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
449 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
450 (pop-to-buffer vc-parent-buffer)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
451 (if buffer-file-name |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
452 (vc-next-action-on-file buffer-file-name verbose) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
453 (error "There is no file associated with buffer %s" (buffer-name))))) |
904 | 454 |
455 ;;; These functions help the vc-next-action entry point | |
456 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
457 (defun vc-checkout-writeable-buffer (&optional file) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
458 "Retrieve a writeable copy of the latest version of the current buffer's file." |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
459 (vc-checkout (or file (buffer-file-name)) t) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
460 ) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
461 |
927 | 462 ;;;###autoload |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
463 (defun vc-register (&optional override comment) |
904 | 464 "Register the current file into your version-control system." |
465 (interactive "P") | |
466 (if (vc-name buffer-file-name) | |
467 (error "This file is already registered.")) | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
468 ;; Watch out for new buffers of size 0: the corresponding file |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
469 ;; does not exist yet, even though buffer-modified-p is nil. |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
470 (if (and (not (buffer-modified-p)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
471 (zerop (buffer-size)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
472 (not (file-exists-p buffer-file-name))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
473 (set-buffer-modified-p t)) |
904 | 474 (vc-buffer-sync) |
475 (vc-admin | |
476 buffer-file-name | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
477 (and override |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
478 (read-string |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
479 (format "Initial version level for %s: " buffer-file-name)))) |
904 | 480 ) |
481 | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
482 (defun vc-resynch-window (file &optional keep noquery) |
904 | 483 ;; If the given file is in the current buffer, |
484 ;; either revert on it so we see expanded keyworks, | |
485 ;; or unvisit it (depending on vc-keep-workfiles) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
486 ;; NOQUERY if non-nil inhibits confirmation for reverting. |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
487 ;; NOQUERY should be t *only* if it is known the only difference |
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
488 ;; between the buffer and the file is due to RCS rather than user editing! |
904 | 489 (and (string= buffer-file-name file) |
490 (if keep | |
491 (progn | |
1905
494dd05d460c
* files.el (revert-buffer): Reverse the sense of the first
Jim Blandy <jimb@redhat.com>
parents:
1674
diff
changeset
|
492 (vc-revert-buffer1 t noquery) |
904 | 493 (vc-mode-line buffer-file-name)) |
494 (progn | |
495 (delete-window) | |
496 (kill-buffer (current-buffer)))))) | |
497 | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
498 (defun vc-start-entry (file rev comment msg action) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
499 ;; Accept a comment for an operation on FILE revision REV. If COMMENT |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
500 ;; is nil, pop up a VC-log buffer, emit MSG, and set the |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
501 ;; action on close to ACTION; otherwise, do action immediately. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
502 ;; Remember the file's buffer in parent-buffer (current one if no file). |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
503 (let ((parent (if file (find-file-noselect file) (current-buffer)))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
504 (if comment |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
505 (set-buffer (get-buffer-create "*VC-log*")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
506 (pop-to-buffer (get-buffer-create "*VC-log*"))) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
507 (set (make-local-variable 'vc-parent-buffer) parent) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
508 (set (make-local-variable 'vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
509 (concat " from " (buffer-name vc-parent-buffer))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
510 (vc-mode-line (if file (file-name-nondirectory file) " (no file)")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
511 (vc-log-mode) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
512 (setq vc-log-operation action) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
513 (setq vc-log-file file) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
514 (setq vc-log-version rev) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
515 (if comment |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
516 (progn |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
517 (erase-buffer) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
518 (if (eq comment t) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
519 (vc-finish-logentry t) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
520 (insert comment) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
521 (vc-finish-logentry nil))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
522 (message "%s Type C-c C-c when done." msg)))) |
904 | 523 |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
524 (defun vc-admin (file rev &optional comment) |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
525 "Check a file into your version-control system. |
904 | 526 FILE is the unmodified name of the file. REV should be the base version |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
527 level to check it in under. COMMENT, if specified, is the checkin comment." |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
528 (vc-start-entry file rev |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
529 (or comment (not vc-initial-comment)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
530 "Enter initial comment." 'vc-backend-admin)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
531 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
532 (defun vc-checkout (file &optional writeable) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
533 "Retrieve a copy of the latest version of the given file." |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
534 ;; If ftp is on this system and the name matches the ange-ftp format |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
535 ;; for a remote file, the user is trying something that won't work. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
536 (if (and (string-match "^/[^/:]+:" file) (vc-find-binary "ftp")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
537 (error "Sorry, you can't check out files over FTP")) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
538 (vc-backend-checkout file writeable) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
539 (if (string-equal file buffer-file-name) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
540 (vc-resynch-window file t t)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
541 ) |
904 | 542 |
543 (defun vc-steal-lock (file rev &optional owner) | |
544 "Steal the lock on the current workfile." | |
545 (interactive) | |
546 (if (not owner) | |
547 (setq owner (vc-locking-user file))) | |
548 (if (not (y-or-n-p (format "Take the lock on %s:%s from %s?" file rev owner))) | |
549 (error "Steal cancelled.")) | |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
550 (pop-to-buffer (get-buffer-create "*VC-mail*")) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
551 (setq default-directory (expand-file-name "~/")) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
552 (auto-save-mode auto-save-default) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
553 (mail-mode) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
554 (erase-buffer) |
2087 | 555 (mail-setup owner (format "%s:%s" file rev) nil nil nil |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
556 (list (list 'vc-finish-steal file rev))) |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
557 (goto-char (point-max)) |
904 | 558 (insert |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
559 (format "I stole the lock on %s:%s, " file rev) |
904 | 560 (current-time-string) |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
561 ".\n") |
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
562 (message "Please explain why you stole the lock. Type C-c C-c when done.")) |
904 | 563 |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
564 ;; This is called when the notification has been sent. |
904 | 565 (defun vc-finish-steal (file version) |
566 (vc-backend-steal file version) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
567 (vc-resynch-window file t t)) |
904 | 568 |
569 (defun vc-checkin (file &optional rev comment) | |
570 "Check in the file specified by FILE. | |
571 The optional argument REV may be a string specifying the new version level | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
572 \(if nil increment the current level). The file is either retained with write |
904 | 573 permissions zeroed, or deleted (according to the value of vc-keep-workfiles). |
574 COMMENT is a comment string; if omitted, a buffer is | |
575 popped up to accept a comment." | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
576 (setq vc-log-after-operation-hook 'vc-checkin-hook) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
577 (vc-start-entry file rev comment "Enter a change comment." 'vc-backend-checkin)) |
904 | 578 |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
579 ;;; Here is a checkin hook that may prove useful to sites using the |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
580 ;;; ChangeLog facility supported by Emacs. |
2493
3af65d9b91e7
(vc-comment-to-change-log): Merged in the remainder of jimb's last
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2490
diff
changeset
|
581 (defun vc-comment-to-change-log (&optional file) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
582 "Update change log from VC change comments entered for the current file. |
2493
3af65d9b91e7
(vc-comment-to-change-log): Merged in the remainder of jimb's last
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2490
diff
changeset
|
583 Optional FILE specifies the change log file name; see `find-change-log'. |
3af65d9b91e7
(vc-comment-to-change-log): Merged in the remainder of jimb's last
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2490
diff
changeset
|
584 See `vc-update-change-log'." |
2555
9013d6e2b2e7
(vc-comment-to-change-log): Restored interactive spec. Why was it
Roland McGrath <roland@gnu.org>
parents:
2554
diff
changeset
|
585 (interactive) |
2493
3af65d9b91e7
(vc-comment-to-change-log): Merged in the remainder of jimb's last
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2490
diff
changeset
|
586 (let ((log (find-change-log file))) |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
587 (if log |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
588 (let ((default-directory (or (file-name-directory log) |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
589 default-directory))) |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
590 (vc-update-change-log |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
591 (file-relative-name buffer-file-name)))))) |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
592 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
593 (defun vc-finish-logentry (&optional nocomment) |
904 | 594 "Complete the operation implied by the current log entry." |
595 (interactive) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
596 ;; Check and record the comment, if any. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
597 (if (not nocomment) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
598 (progn |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
599 (goto-char (point-max)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
600 (if (not (bolp)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
601 (newline)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
602 ;; Comment too long? |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
603 (vc-backend-logentry-check vc-log-file) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
604 ;; Record the comment in the comment ring |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
605 (if (null vc-comment-ring) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
606 (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
607 (ring-insert vc-comment-ring (buffer-string)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
608 )) |
904 | 609 ;; OK, do it to it |
610 (if vc-log-operation | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
611 (save-excursion |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
612 (funcall vc-log-operation |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
613 vc-log-file |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
614 vc-log-version |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
615 (buffer-string))) |
904 | 616 (error "No log operation is pending.")) |
617 ;; Return to "parent" buffer of this checkin and remove checkin window | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
618 (pop-to-buffer vc-parent-buffer) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
619 (vc-error-occurred |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
620 (delete-window (get-buffer-window "*VC-log*"))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
621 (kill-buffer "*VC-log*") |
904 | 622 ;; Now make sure we see the expanded headers |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
623 (if buffer-file-name |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
624 (vc-resynch-window buffer-file-name vc-keep-workfiles t)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
625 (run-hooks vc-log-after-operation-hook)) |
904 | 626 |
627 ;; Code for access to the comment ring | |
628 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
629 (defun vc-previous-comment (arg) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
630 "Cycle backwards through comment history." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
631 (interactive "*p") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
632 (let ((len (ring-length vc-comment-ring))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
633 (cond ((<= len 0) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
634 (message "Empty comment ring") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
635 (ding)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
636 (t |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
637 (erase-buffer) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
638 ;; Initialize the index on the first use of this command |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
639 ;; so that the first M-p gets index 0, and the first M-n gets |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
640 ;; index -1. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
641 (if (null vc-comment-ring-index) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
642 (setq vc-comment-ring-index |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
643 (if (> arg 0) -1 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
644 (if (< arg 0) 1 0)))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
645 (setq vc-comment-ring-index |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
646 (ring-mod (+ vc-comment-ring-index arg) len)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
647 (message "%d" (1+ vc-comment-ring-index)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
648 (insert (ring-ref vc-comment-ring vc-comment-ring-index)))))) |
904 | 649 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
650 (defun vc-next-comment (arg) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
651 "Cycle forwards through comment history." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
652 (interactive "*p") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
653 (vc-previous-comment (- arg))) |
904 | 654 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
655 (defun vc-comment-search-reverse (str) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
656 "Searches backwards through comment history for substring match." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
657 (interactive "sComment substring: ") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
658 (if (string= str "") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
659 (setq str vc-last-comment-match) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
660 (setq vc-last-comment-match str)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
661 (if (null vc-comment-ring-index) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
662 (setq vc-comment-ring-index -1)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
663 (let ((str (regexp-quote str)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
664 (len (ring-length vc-comment-ring)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
665 (n (1+ vc-comment-ring-index))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
666 (while (and (< n len) (not (string-match str (ring-ref vc-comment-ring n)))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
667 (setq n (+ n 1))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
668 (cond ((< n len) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
669 (vc-previous-comment (- n vc-comment-ring-index))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
670 (t (error "Not found"))))) |
904 | 671 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
672 (defun vc-comment-search-forward (str) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
673 "Searches forwards through comment history for substring match." |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
674 (interactive "sComment substring: ") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
675 (if (string= str "") |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
676 (setq str vc-last-comment-match) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
677 (setq vc-last-comment-match str)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
678 (if (null vc-comment-ring-index) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
679 (setq vc-comment-ring-index 0)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
680 (let ((str (regexp-quote str)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
681 (len (ring-length vc-comment-ring)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
682 (n vc-comment-ring-index)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
683 (while (and (>= n 0) (not (string-match str (ring-ref vc-comment-ring n)))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
684 (setq n (- n 1))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
685 (cond ((>= n 0) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
686 (vc-next-comment (- n vc-comment-ring-index))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
687 (t (error "Not found"))))) |
904 | 688 |
689 ;; Additional entry points for examining version histories | |
690 | |
927 | 691 ;;;###autoload |
904 | 692 (defun vc-diff (historic) |
2667
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
693 "Display diffs between file versions. |
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
694 Normally this compares the current file and buffer with the most recent |
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
695 checked in version of that file. This uses no arguments. |
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
696 With a prefix argument, it reads the file name to use |
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
697 and two version designators specifying which versions to compare." |
904 | 698 (interactive "P") |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
699 (if vc-dired-mode |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
700 (set-buffer (find-file-noselect (dired-get-filename)))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
701 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
702 (pop-to-buffer vc-parent-buffer)) |
904 | 703 (if historic |
704 (call-interactively 'vc-version-diff) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
705 (if (or (null buffer-file-name) (null (vc-name buffer-file-name))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
706 (error "There is no version-control master associated with this buffer.")) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
707 (let ((file buffer-file-name) |
904 | 708 unchanged) |
709 (vc-buffer-sync) | |
710 (setq unchanged (vc-workfile-unchanged-p buffer-file-name)) | |
711 (if unchanged | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
712 (message "No changes to %s since latest version." file) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
713 (vc-backend-diff file nil) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
714 ;; Ideally, we'd like at this point to parse the diff so that |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
715 ;; the buffer effectively goes into compilation mode and we |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
716 ;; can visit the old and new change locations via next-error. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
717 ;; Unfortunately, this is just too painful to do. The basic |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
718 ;; problem is that the `old' file doesn't exist to be |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
719 ;; visited. This plays hell with numerous assumptions in |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
720 ;; the diff.el and compile.el machinery. |
904 | 721 (pop-to-buffer "*vc*") |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
722 (vc-shrink-to-fit) |
904 | 723 (goto-char (point-min)) |
724 ) | |
725 (not unchanged) | |
726 ) | |
727 ) | |
728 ) | |
729 | |
730 (defun vc-version-diff (file rel1 rel2) | |
731 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | |
732 If FILE is a directory, generate diffs between versions for all registered | |
733 files in or below it." | |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
734 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ") |
904 | 735 (if (string-equal rel1 "") (setq rel1 nil)) |
736 (if (string-equal rel2 "") (setq rel2 nil)) | |
737 (if (file-directory-p file) | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
738 (let ((camefrom (current-buffer))) |
904 | 739 (set-buffer (get-buffer-create "*vc-status*")) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
740 (set (make-local-variable 'vc-parent-buffer) camefrom) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
741 (set (make-local-variable 'vc-parent-buffer-name) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
742 (concat " from " (buffer-name camefrom))) |
904 | 743 (erase-buffer) |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
744 (insert "Diffs between " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
745 (or rel1 "last version checked in") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
746 " and " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
747 (or rel2 "current workfile(s)") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
748 ":\n\n") |
904 | 749 (set-buffer (get-buffer-create "*vc*")) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
750 (cd file) |
904 | 751 (vc-file-tree-walk |
752 (function (lambda (f) | |
2219
a729b16f7427
(vc-version-diff): Use (message ...), not (message (format ...)).
Paul Eggert <eggert@twinsun.com>
parents:
2212
diff
changeset
|
753 (message "Looking at %s" f) |
904 | 754 (and |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
755 (not (file-directory-p f)) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
756 (vc-registered f) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
757 (vc-backend-diff f rel1 rel2) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
758 (append-to-buffer "*vc-status*" (point-min) (point-max))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
759 ))) |
904 | 760 (pop-to-buffer "*vc-status*") |
761 (insert "\nEnd of diffs.\n") | |
762 (goto-char (point-min)) | |
763 (set-buffer-modified-p nil) | |
764 ) | |
765 (progn | |
766 (vc-backend-diff file rel1 rel2) | |
767 (goto-char (point-min)) | |
768 (if (equal (point-min) (point-max)) | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
769 (message "No changes to %s between %s and %s." file rel1 rel2) |
904 | 770 (pop-to-buffer "*vc*") |
771 (goto-char (point-min)) | |
772 ) | |
773 ) | |
774 ) | |
775 ) | |
776 | |
777 ;; Header-insertion code | |
778 | |
927 | 779 ;;;###autoload |
904 | 780 (defun vc-insert-headers () |
781 "Insert headers in a file for use with your version-control system. | |
782 Headers desired are inserted at the start of the buffer, and are pulled from | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
783 the variable vc-header-alist" |
904 | 784 (interactive) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
785 (if vc-dired-mode |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
786 (find-file-other-window (dired-get-filename))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
787 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
788 (pop-to-buffer vc-parent-buffer)) |
904 | 789 (save-excursion |
790 (save-restriction | |
791 (widen) | |
792 (if (or (not (vc-check-headers)) | |
793 (y-or-n-p "Version headers already exist. Insert another set?")) | |
794 (progn | |
795 (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
796 (comment-start-vc (or (car delims) comment-start "#")) | |
797 (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
798 (hdstrings (cdr (assoc (vc-backend-deduce (buffer-file-name)) vc-header-alist)))) | |
799 (mapcar (function (lambda (s) | |
800 (insert comment-start-vc "\t" s "\t" | |
801 comment-end-vc "\n"))) | |
802 hdstrings) | |
803 (if vc-static-header-alist | |
804 (mapcar (function (lambda (f) | |
805 (if (string-match (car f) buffer-file-name) | |
806 (insert (format (cdr f) (car hdstrings)))))) | |
807 vc-static-header-alist)) | |
808 ) | |
809 ))))) | |
810 | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
811 ;; The VC directory submode. Coopt Dired for this. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
812 ;; All VC commands get mapped into logical equivalents. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
813 |
2664
334f3eeb459d
(vc-dired-prefix-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
2617
diff
changeset
|
814 (defvar vc-dired-prefix-map (make-sparse-keymap)) |
334f3eeb459d
(vc-dired-prefix-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
2617
diff
changeset
|
815 (define-key vc-dired-prefix-map "\C-xv" vc-prefix-map) |
334f3eeb459d
(vc-dired-prefix-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
2617
diff
changeset
|
816 |
2665
531099c93082
(minor-mode-map-alist): Don't use it if it's void.
Richard M. Stallman <rms@gnu.org>
parents:
2664
diff
changeset
|
817 (or (not (boundp 'minor-mode-map-alist)) |
531099c93082
(minor-mode-map-alist): Don't use it if it's void.
Richard M. Stallman <rms@gnu.org>
parents:
2664
diff
changeset
|
818 (assq 'vc-dired-mode minor-mode-map-alist) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
819 (setq minor-mode-map-alist |
2665
531099c93082
(minor-mode-map-alist): Don't use it if it's void.
Richard M. Stallman <rms@gnu.org>
parents:
2664
diff
changeset
|
820 (cons '(vc-dired-mode . vc-dired-prefix-map) |
2664
334f3eeb459d
(vc-dired-prefix-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
2617
diff
changeset
|
821 minor-mode-map-alist))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
822 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
823 (defun vc-dired-mode () |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
824 "The augmented Dired minor mode used in VC directory buffers. |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
825 All Dired commands operate normally. Users currently locking listed files |
2664
334f3eeb459d
(vc-dired-prefix-map): New keymap.
Richard M. Stallman <rms@gnu.org>
parents:
2617
diff
changeset
|
826 are listed in place of the file's owner and group. |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
827 Keystrokes bound to VC commands will execute as though they had been called |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
828 on a buffer attached to the file named in the current Dired buffer line." |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
829 (setq vc-dired-mode t) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
830 (setq vc-mode " under VC")) |
904 | 831 |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
832 (defun vc-dired-reformat-line (x) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
833 ;; Hack a directory-listing line, plugging in locking-user info in |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
834 ;; place of the user and group info. Should have the beneficial |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
835 ;; side-effect of shortening the listing line. Each call starts with |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
836 ;; point immediately following the dired mark area on the line to be |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
837 ;; hacked. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
838 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
839 ;; Simplest possible one: |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
840 ;; (insert (concat x "\t"))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
841 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
842 ;; This code, like dired, assumes UNIX -l format. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
843 (forward-word 1) ;; skip over any extra field due to -ibs options |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
844 (if x (setq x (concat "(" x ")"))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
845 (if (re-search-forward "\\([0-9]+ \\).................\\( .*\\)" nil 0) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
846 (let ((rep (substring (concat x " ") 0 9))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
847 (replace-match (concat "\\1" rep "\\2") t))) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
848 ) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
849 |
927 | 850 ;;;###autoload |
904 | 851 (defun vc-directory (verbose) |
852 "Show version-control status of all files under the current directory." | |
853 (interactive "P") | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
854 (let (nonempty |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
855 (dl (length default-directory)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
856 (filelist nil) (userlist nil) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
857 dired-buf |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
858 dired-buf-mod-count) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
859 (vc-file-tree-walk |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
860 (function (lambda (f) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
861 (if (vc-registered f) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
862 (let ((user (vc-locking-user f))) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
863 (and (or verbose user) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
864 (setq filelist (cons (substring f dl) filelist)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
865 (setq userlist (cons user userlist)))))))) |
904 | 866 (save-excursion |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
867 ;; This uses a semi-documented featre of dired; giving a switch |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
868 ;; argument forces the buffer to refresh each time. |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
869 (dired |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
870 (cons default-directory (nreverse filelist)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
871 dired-listing-switches) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
872 (setq dired-buf (current-buffer)) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
873 (setq nonempty (not (zerop (buffer-size))))) |
904 | 874 (if nonempty |
875 (progn | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
876 (pop-to-buffer dired-buf) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
877 (vc-dired-mode) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
878 (goto-char (point-min)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
879 (setq buffer-read-only nil) |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
880 (forward-line 1) ;; Skip header line |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
881 (mapcar |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
882 (lambda (x) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
883 (forward-char 2) ;; skip dired's mark area |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
884 (vc-dired-reformat-line x) |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
885 (forward-line 1)) ;; go to next line |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
886 (nreverse userlist)) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
887 (setq buffer-read-only t) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
888 (goto-char (point-min)) |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
889 ) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
890 (message "No files are currently %s under %s" |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
891 (if verbose "registered" "locked") default-directory)) |
904 | 892 )) |
893 | |
894 ;; Named-configuration support for SCCS | |
895 | |
896 (defun vc-add-triple (name file rev) | |
897 (save-excursion | |
898 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file)) | |
899 (goto-char (point-max)) | |
900 (insert name "\t:\t" file "\t" rev "\n") | |
901 (basic-save-buffer) | |
902 (kill-buffer (current-buffer)) | |
903 )) | |
904 | |
905 (defun vc-record-rename (file newname) | |
906 (save-excursion | |
907 (find-file (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file)) | |
908 (goto-char (point-min)) | |
909 (replace-regexp (concat ":" (regexp-quote file) "$") (concat ":" newname)) | |
910 (basic-save-buffer) | |
911 (kill-buffer (current-buffer)) | |
912 )) | |
913 | |
914 (defun vc-lookup-triple (file name) | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
915 ;; Return the numeric version corresponding to a named snapshot of file |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
916 ;; If name is nil or a version number string it's just passed through |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
917 (cond ((null name) "") |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
918 ((let ((firstchar (aref name 0))) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
919 (and (>= firstchar ?0) (<= firstchar ?9))) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
920 name) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
921 (t |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
922 (car (vc-master-info |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
923 (concat (vc-backend-subdirectory-name file) "/" vc-name-assoc-file) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
924 (list (concat name "\t:\t" file "\t\\(.+\\)")))) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
925 ))) |
904 | 926 |
927 ;; Named-configuration entry points | |
928 | |
929 (defun vc-quiescent-p () | |
930 ;; Is the current directory ready to be snapshot? | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
931 (catch 'quiet |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
932 (vc-file-tree-walk |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
933 (function (lambda (f) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
934 (if (and (vc-registered f) (vc-locking-user f)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
935 (throw 'quiet nil))))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
936 t)) |
904 | 937 |
927 | 938 ;;;###autoload |
904 | 939 (defun vc-create-snapshot (name) |
940 "Make a snapshot called NAME. | |
941 The snapshot is made from all registered files at or below the current | |
942 directory. For each file, the version level of its latest | |
943 version becomes part of the named configuration." | |
944 (interactive "sNew snapshot name: ") | |
945 (if (not (vc-quiescent-p)) | |
946 (error "Can't make a snapshot, locked files are in the way.") | |
947 (vc-file-tree-walk | |
948 (function (lambda (f) (and | |
949 (vc-name f) | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
950 (vc-backend-assign-name f name))))) |
904 | 951 )) |
952 | |
927 | 953 ;;;###autoload |
904 | 954 (defun vc-retrieve-snapshot (name) |
955 "Retrieve the snapshot called NAME. | |
956 This function fails if any files are locked at or below the current directory | |
957 Otherwise, all registered files are checked out (unlocked) at their version | |
958 levels in the snapshot." | |
959 (interactive "sSnapshot name to retrieve: ") | |
960 (if (not (vc-quiescent-p)) | |
961 (error "Can't retrieve a snapshot, locked files are in the way.") | |
962 (vc-file-tree-walk | |
963 (function (lambda (f) (and | |
964 (vc-name f) | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
965 (vc-error-occurred (vc-backend-checkout f nil name)))))) |
904 | 966 )) |
967 | |
968 ;; Miscellaneous other entry points | |
969 | |
927 | 970 ;;;###autoload |
904 | 971 (defun vc-print-log () |
972 "List the change log of the current buffer in a window." | |
973 (interactive) | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
974 (if vc-dired-mode |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
975 (set-buffer (find-file-noselect (dired-get-filename)))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
976 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
977 (pop-to-buffer vc-parent-buffer)) |
904 | 978 (if (and buffer-file-name (vc-name buffer-file-name)) |
979 (progn | |
980 (vc-backend-print-log buffer-file-name) | |
981 (pop-to-buffer (get-buffer-create "*vc*")) | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
982 (vc-shrink-to-fit) |
904 | 983 (goto-char (point-min)) |
984 ) | |
985 (error "There is no version-control master associated with this buffer") | |
986 ) | |
987 ) | |
988 | |
927 | 989 ;;;###autoload |
904 | 990 (defun vc-revert-buffer () |
952 | 991 "Revert the current buffer's file back to the latest checked-in version. |
992 This asks for confirmation if the buffer contents are not identical | |
993 to that version." | |
904 | 994 (interactive) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
995 (if vc-dired-mode |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
996 (find-file-other-window (dired-get-filename))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
997 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
998 (pop-to-buffer vc-parent-buffer)) |
904 | 999 (let ((file buffer-file-name) |
1000 (obuf (current-buffer)) (changed (vc-diff nil))) | |
952 | 1001 (if (and changed (or vc-suppress-confirm |
1002 (not (yes-or-no-p "Discard changes? ")))) | |
904 | 1003 (progn |
1004 (delete-window) | |
1005 (error "Revert cancelled.")) | |
1006 (set-buffer obuf)) | |
1007 (if changed | |
1008 (delete-window)) | |
1009 (vc-backend-revert file) | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
1010 (vc-resynch-window file t t) |
904 | 1011 ) |
1012 ) | |
1013 | |
927 | 1014 ;;;###autoload |
904 | 1015 (defun vc-cancel-version (norevert) |
2666 | 1016 "Get rid of the version most recently checked in by anyone." |
904 | 1017 (interactive "P") |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1018 (if vc-dired-mode |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1019 (find-file-other-window (dired-get-filename))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
1020 (while vc-parent-buffer |
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
1021 (pop-to-buffer vc-parent-buffer)) |
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
1022 (let* ((target (concat (vc-latest-version (buffer-file-name)))) |
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
1023 (yours (concat (vc-your-latest-version (buffer-file-name)))) |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1024 (prompt (if (string-equal yours target) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1025 "Remove your version %s from master?" |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1026 "Version %s was not your change. Remove it anyway?"))) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1027 (if (null (yes-or-no-p (format prompt target))) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1028 nil |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1029 (vc-backend-uncheck (buffer-file-name) target) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1030 (if norevert |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1031 (vc-mode-line (buffer-file-name)) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1032 (vc-checkout (buffer-file-name) nil))) |
2419
77a67b7a1cce
(vc-next-action, vc-peint-log, vc-diff, vc-revert-buffer) improved
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2402
diff
changeset
|
1033 )) |
904 | 1034 |
1035 (defun vc-rename-file (old new) | |
1036 "Rename a file, taking its master files with it." | |
1037 (interactive "fOld name: \nFNew name: ") | |
1038 (let ((oldbuf (get-file-buffer old))) | |
1039 (if (buffer-modified-p oldbuf) | |
1040 (error "Please save files before moving them.")) | |
1041 (if (get-file-buffer new) | |
1042 (error "Already editing new file name.")) | |
1043 (let ((oldmaster (vc-name old))) | |
1044 (if oldmaster | |
1045 (if (vc-locking-user old) | |
1046 (error "Please check in files before moving them.")) | |
1047 (if (or (file-symlink-p oldmaster) | |
1243
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
1048 ;; This had FILE, I changed it to OLD. -- rms. |
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
1049 (file-symlink-p (vc-backend-subdirectory-name old))) |
904 | 1050 (error "This is not a safe thing to do in the presence of symbolic links.")) |
1051 (rename-file oldmaster (vc-name new))) | |
1052 (if (or (not oldmaster) (file-exists-p old)) | |
1053 (rename-file old new))) | |
1054 ; ?? Renaming a file might change its contents due to keyword expansion. | |
1055 ; We should really check out a new copy if the old copy was precisely equal | |
1056 ; to some checked in version. However, testing for this is tricky.... | |
1057 (if oldbuf | |
1058 (save-excursion | |
1059 (set-buffer oldbuf) | |
1060 (set-visited-file-name new) | |
1061 (set-buffer-modified-p nil)))) | |
1243
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
1062 ;; This had FILE, I changed it to OLD. -- rms. |
de79e26e67cf
(vc-rename-file): Use OLD, not FILE which is unbound.
Richard M. Stallman <rms@gnu.org>
parents:
1232
diff
changeset
|
1063 (vc-backend-dispatch old |
904 | 1064 (vc-record-rename old new) |
1065 nil) | |
1066 ) | |
1067 | |
927 | 1068 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1069 (defun vc-update-change-log (&rest args) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1070 "Find change log file and add entries from recent RCS logs. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1071 The mark is left at the end of the text prepended to the change log. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1072 With prefix arg of C-u, only find log entries for the current buffer's file. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1073 With any numeric prefix arg, find log entries for all files currently visited. |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1074 From a program, any arguments are passed to the `rcs2log' script." |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1075 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1076 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1077 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1078 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1079 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1080 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1081 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1082 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1083 (setq file (buffer-file-name (car buffers))) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1084 (and file (vc-backend-deduce file) |
1232
2c56a159c9b6
(vc-update-change-log): Use file-relative-name.
Roland McGrath <roland@gnu.org>
parents:
1227
diff
changeset
|
1085 (setq files (cons (file-relative-name file) files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1086 (setq buffers (cdr buffers))) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1087 files)))) |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1088 (find-file-other-window "ChangeLog") |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1089 (barf-if-buffer-read-only) |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1090 (vc-buffer-sync) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1091 (undo-boundary) |
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1092 (goto-char (point-min)) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1093 (push-mark) |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1094 (message "Computing change log entries...") |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1095 (message "Computing change log entries... %s" |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1096 (if (eq 0 (apply 'call-process "rcs2log" nil t nil args)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1097 "done" "failed"))) |
904 | 1098 |
1099 ;; Functions for querying the master and lock files. | |
1100 | |
2612
f9f844a39a29
(vc-match-substring): Renamed from match-substring.
Richard M. Stallman <rms@gnu.org>
parents:
2604
diff
changeset
|
1101 (defun vc-match-substring (bn) |
904 | 1102 (buffer-substring (match-beginning bn) (match-end bn))) |
1103 | |
1104 (defun vc-parse-buffer (patterns &optional file properties) | |
1105 ;; Use PATTERNS to parse information out of the current buffer | |
1106 ;; by matching each regular expression in the list and returning \\1. | |
1107 ;; If a regexp has two tag brackets, assume the second is a date | |
1108 ;; field and we want the most recent entry matching the template. | |
1109 ;; If FILE and PROPERTIES are given, the latter must be a list of | |
1110 ;; properties of the same length as PATTERNS; each property is assigned | |
1111 ;; the corresponding value. | |
1112 (mapcar (function (lambda (p) | |
1113 (goto-char (point-min)) | |
1114 (if (string-match "\\\\(.*\\\\(" p) | |
1115 (let ((latest-date "") (latest-val)) | |
1116 (while (re-search-forward p nil t) | |
2612
f9f844a39a29
(vc-match-substring): Renamed from match-substring.
Richard M. Stallman <rms@gnu.org>
parents:
2604
diff
changeset
|
1117 (let ((date (vc-match-substring 2))) |
904 | 1118 (if (string< latest-date date) |
1119 (progn | |
1120 (setq latest-date date) | |
1121 (setq latest-val | |
2612
f9f844a39a29
(vc-match-substring): Renamed from match-substring.
Richard M. Stallman <rms@gnu.org>
parents:
2604
diff
changeset
|
1122 (vc-match-substring 1)))))) |
904 | 1123 latest-val)) |
1124 (prog1 | |
1125 (and (re-search-forward p nil t) | |
2612
f9f844a39a29
(vc-match-substring): Renamed from match-substring.
Richard M. Stallman <rms@gnu.org>
parents:
2604
diff
changeset
|
1126 (let ((value (vc-match-substring 1))) |
904 | 1127 (if file |
1128 (vc-file-setprop file (car properties) value)) | |
1129 value)) | |
1130 (setq properties (cdr properties))))) | |
1131 patterns) | |
1132 ) | |
1133 | |
1134 (defun vc-master-info (file fields &optional rfile properties) | |
1135 ;; Search for information in a master file. | |
1136 (if (and file (file-exists-p file)) | |
1137 (save-excursion | |
1138 (let ((buf)) | |
1139 (setq buf (create-file-buffer file)) | |
1140 (set-buffer buf)) | |
1141 (erase-buffer) | |
1142 (insert-file-contents file nil) | |
1143 (set-buffer-modified-p nil) | |
1144 (auto-save-mode nil) | |
1145 (prog1 | |
1146 (vc-parse-buffer fields rfile properties) | |
1147 (kill-buffer (current-buffer))) | |
1148 ) | |
1149 (if rfile | |
1150 (mapcar | |
1151 (function (lambda (p) (vc-file-setprop rfile p nil))) | |
1152 properties)) | |
1153 ) | |
1154 ) | |
1155 | |
1156 (defun vc-log-info (command file patterns &optional properties) | |
1157 ;; Search for information in log program output | |
1158 (if (and file (file-exists-p file)) | |
1159 (save-excursion | |
1160 (let ((buf)) | |
1161 (setq buf (get-buffer-create "*vc*")) | |
1162 (set-buffer buf)) | |
1163 (apply 'vc-do-command 0 command file nil) | |
1164 (set-buffer-modified-p nil) | |
1165 (prog1 | |
1166 (vc-parse-buffer patterns file properties) | |
1167 (kill-buffer (current-buffer)) | |
1168 ) | |
1169 ) | |
1170 (if file | |
1171 (mapcar | |
1172 (function (lambda (p) (vc-file-setprop file p nil))) | |
1173 properties)) | |
1174 ) | |
1175 ) | |
1176 | |
1177 (defun vc-locking-user (file) | |
1178 "Return the name of the person currently holding a lock on FILE. | |
1179 Return nil if there is no such person." | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1180 (setq file (expand-file-name file)) ;; ??? Work around bug in 19.0.4 |
904 | 1181 (if (or (not vc-keep-workfiles) |
1182 (eq vc-mistrust-permissions 't) | |
1183 (and vc-mistrust-permissions | |
1184 (funcall vc-mistrust-permissions (vc-backend-subdirectory-name file)))) | |
1185 (vc-true-locking-user file) | |
1186 ;; This implementation assumes that any file which is under version | |
1187 ;; control and has -rw-r--r-- is locked by its owner. This is true | |
1188 ;; for both RCS and SCCS, which keep unlocked files at -r--r--r--. | |
1189 ;; We have to be careful not to exclude files with execute bits on; | |
1190 ;; scripts can be under version control too. The advantage of this | |
1191 ;; hack is that calls to the very expensive vc-fetch-properties | |
1192 ;; function only have to be made if (a) the file is locked by someone | |
1193 ;; other than the current user, or (b) some untoward manipulation | |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1194 ;; behind vc's back has changed the owner or the `group' or `other' |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
1195 ;; write bits. |
904 | 1196 (let ((attributes (file-attributes file))) |
1197 (cond ((string-match ".r-.r-.r-." (nth 8 attributes)) | |
1198 nil) | |
1199 ((and (= (nth 2 attributes) (user-uid)) | |
1200 (string-match ".rw.r-.r-." (nth 8 attributes))) | |
1201 (user-login-name)) | |
1202 (t | |
1203 (vc-true-locking-user file)))))) | |
1204 | |
1205 (defun vc-true-locking-user (file) | |
1206 ;; The slow but reliable version | |
1207 (vc-fetch-properties file) | |
1208 (vc-file-getprop file 'vc-locking-user)) | |
1209 | |
1210 (defun vc-latest-version (file) | |
1211 ;; Return version level of the latest version of FILE | |
1212 (vc-fetch-properties file) | |
1213 (vc-file-getprop file 'vc-latest-version)) | |
1214 | |
1215 (defun vc-your-latest-version (file) | |
1216 ;; Return version level of the latest version of FILE checked in by you | |
1217 (vc-fetch-properties file) | |
1218 (vc-file-getprop file 'vc-your-latest-version)) | |
1219 | |
1220 ;; Collect back-end-dependent stuff here | |
1221 ;; | |
1222 ;; Everything eventually funnels through these functions. To implement | |
1223 ;; support for a new version-control system, add another branch to the | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1224 ;; vc-backend-dispatch macro and fill it in in each call. The variable |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1225 ;; vc-master-templates in vc-hooks.el will also have to change. |
904 | 1226 |
1227 (defmacro vc-backend-dispatch (f s r) | |
1228 "Execute FORM1 or FORM2 depending on whether we're using SCCS or RCS." | |
1229 (list 'let (list (list 'type (list 'vc-backend-deduce f))) | |
1230 (list 'cond | |
1231 (list (list 'eq 'type (quote 'SCCS)) s) ;; SCCS | |
1232 (list (list 'eq 'type (quote 'RCS)) r) ;; RCS | |
1233 ))) | |
1234 | |
1235 (defun vc-lock-file (file) | |
1236 ;; Generate lock file name corresponding to FILE | |
1237 (let ((master (vc-name file))) | |
1238 (and | |
1239 master | |
1240 (string-match "\\(.*/\\)s\\.\\(.*\\)" master) | |
1241 (concat | |
1242 (substring master (match-beginning 1) (match-end 1)) | |
1243 "p." | |
1244 (substring master (match-beginning 2) (match-end 2)))))) | |
1245 | |
1246 | |
1247 (defun vc-fetch-properties (file) | |
1248 ;; Re-fetch all properties associated with the given file. | |
1249 ;; Currently these properties are: | |
1250 ;; vc-locking-user | |
1251 ;; vc-locked-version | |
1252 ;; vc-latest-version | |
1253 ;; vc-your-latest-version | |
1254 (vc-backend-dispatch | |
1255 file | |
1256 ;; SCCS | |
1257 (progn | |
1258 (vc-master-info (vc-lock-file file) | |
1259 (list | |
1260 "^[^ ]+ [^ ]+ \\([^ ]+\\)" | |
1261 "^\\([^ ]+\\)") | |
1262 file | |
1263 '(vc-locking-user vc-locked-version)) | |
1264 (vc-master-info (vc-name file) | |
1265 (list | |
1266 "^\001d D \\([^ ]+\\)" | |
1267 (concat "^\001d D \\([^ ]+\\) .* " | |
1268 (regexp-quote (user-login-name)) " ") | |
1269 ) | |
1270 file | |
1271 '(vc-latest-version vc-your-latest-version)) | |
1272 ) | |
1273 ;; RCS | |
1274 (vc-log-info "rlog" file | |
1275 (list | |
1276 "^locks: strict\n\t\\([^:]+\\)" | |
1277 "^locks: strict\n\t[^:]+: \\(.+\\)" | |
1278 "^revision[\t ]+\\([0-9.]+\\).*\ndate: \\([ /0-9:]+\\);" | |
1279 (concat | |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1280 "^revision[\t ]+\\([0-9.]+\\)\n.*author: " |
904 | 1281 (regexp-quote (user-login-name)) |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1282 ";")) |
904 | 1283 '(vc-locking-user vc-locked-version |
1284 vc-latest-version vc-your-latest-version)) | |
1285 )) | |
1286 | |
1287 (defun vc-backend-subdirectory-name (&optional file) | |
1288 ;; Where the master and lock files for the current directory are kept | |
1289 (symbol-name | |
1290 (or | |
1291 (and file (vc-backend-deduce file)) | |
1292 vc-default-back-end | |
1293 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))))) | |
1294 | |
1295 (defun vc-backend-admin (file &optional rev comment) | |
1296 ;; Register a file into the version-control system | |
1297 ;; Automatically retrieves a read-only version of the file with | |
1298 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
1299 ;; it deletes the workfile. | |
1300 (vc-file-clearprops file) | |
1301 (or vc-default-back-end | |
1302 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))) | |
1303 (message "Registering %s..." file) | |
1304 (let ((backend | |
1305 (cond | |
1306 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end) | |
1307 ((file-exists-p "RCS") 'RCS) | |
1308 ((file-exists-p "SCCS") 'SCCS) | |
1309 (t vc-default-back-end)))) | |
1310 (cond ((eq backend 'SCCS) | |
1311 (vc-do-command 0 "admin" file ;; SCCS | |
1312 (and rev (concat "-r" rev)) | |
1313 "-fb" | |
1314 (concat "-i" file) | |
1315 (and comment (concat "-y" comment)) | |
1316 (format | |
1317 (car (rassq 'SCCS vc-master-templates)) | |
1318 (or (file-name-directory file) "") | |
1319 (file-name-nondirectory file))) | |
1320 (delete-file file) | |
1321 (if vc-keep-workfiles | |
1322 (vc-do-command 0 "get" file))) | |
1323 ((eq backend 'RCS) | |
1324 (vc-do-command 0 "ci" file ;; RCS | |
1325 (concat (if vc-keep-workfiles "-u" "-r") rev) | |
1326 (and comment (concat "-t-" comment)) | |
1327 file) | |
1328 ))) | |
1329 (message "Registering %s...done" file) | |
1330 ) | |
1331 | |
1332 (defun vc-backend-checkout (file &optional writeable rev) | |
1333 ;; Retrieve a copy of a saved version into a workfile | |
2219
a729b16f7427
(vc-version-diff): Use (message ...), not (message (format ...)).
Paul Eggert <eggert@twinsun.com>
parents:
2212
diff
changeset
|
1334 (message "Checking out %s..." file) |
904 | 1335 (vc-backend-dispatch file |
1336 (progn | |
1337 (vc-do-command 0 "get" file ;; SCCS | |
1338 (if writeable "-e") | |
1339 (and rev (concat "-r" (vc-lookup-triple file rev)))) | |
1340 ) | |
1341 (vc-do-command 0 "co" file ;; RCS | |
1342 (if writeable "-l") | |
1343 (and rev (concat "-r" rev))) | |
1344 ) | |
1345 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file))) | |
1346 (message "Checking out %s...done" file) | |
1347 ) | |
1348 | |
1349 (defun vc-backend-logentry-check (file) | |
1350 (vc-backend-dispatch file | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1351 (if (>= (buffer-size) 512) ;; SCCS |
904 | 1352 (progn |
1353 (goto-char 512) | |
1354 (error | |
1355 "Log must be less than 512 characters. Point is now at char 512."))) | |
1356 nil) | |
1357 ) | |
1358 | |
1359 (defun vc-backend-checkin (file &optional rev comment) | |
1360 ;; Register changes to FILE as level REV with explanatory COMMENT. | |
1361 ;; Automatically retrieves a read-only version of the file with | |
1362 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
1363 ;; it deletes the workfile. | |
1364 (message "Checking in %s..." file) | |
1337
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1365 (save-excursion |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1366 ;; Change buffers to get local value of vc-checkin-switches. |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1367 (set-buffer (or (get-file-buffer file) (current-buffer))) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1368 (vc-backend-dispatch file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1369 (progn |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1370 (apply 'vc-do-command 0 "delta" file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1371 (if rev (concat "-r" rev)) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1372 (concat "-y" comment) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1373 vc-checkin-switches) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1374 (if vc-keep-workfiles |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1375 (vc-do-command 0 "get" file)) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1376 ) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1377 (apply 'vc-do-command 0 "ci" file |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1378 (concat (if vc-keep-workfiles "-u" "-r") rev) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1379 (concat "-m" comment) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1380 vc-checkin-switches) |
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
1381 )) |
904 | 1382 (vc-file-setprop file 'vc-locking-user nil) |
1383 (message "Checking in %s...done" file) | |
1384 ) | |
1385 | |
1386 (defun vc-backend-revert (file) | |
1387 ;; Revert file to latest checked-in version. | |
1388 (message "Reverting %s..." file) | |
1389 (vc-backend-dispatch | |
1390 file | |
1391 (progn ;; SCCS | |
1392 (vc-do-command 0 "unget" file nil) | |
1393 (vc-do-command 0 "get" file nil)) | |
1394 (progn | |
1395 (delete-file file) ;; RCS | |
1396 (vc-do-command 0 "co" file "-u"))) | |
1397 (vc-file-setprop file 'vc-locking-user nil) | |
1398 (message "Reverting %s...done" file) | |
1399 ) | |
1400 | |
1401 (defun vc-backend-steal (file &optional rev) | |
1402 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M. | |
1403 (message "Stealing lock on %s..." file) | |
1404 (progn | |
1405 (vc-do-command 0 "unget" file "-n" (if rev (concat "-r" rev))) | |
1406 (vc-do-command 0 "get" file "-g" (if rev (concat "-r" rev))) | |
1407 ) | |
1408 (progn | |
1344
8d047d2d2592
(vc-backend-steal): Put filename after options in rcs commands.
Richard M. Stallman <rms@gnu.org>
parents:
1343
diff
changeset
|
1409 (vc-do-command 0 "rcs" "-M" (concat "-u" rev) file) |
1352
a8623439066b
(vc-backend-steal): Delete the workfile after the rcs -M -u.
Richard M. Stallman <rms@gnu.org>
parents:
1344
diff
changeset
|
1410 (delete-file file) |
1344
8d047d2d2592
(vc-backend-steal): Put filename after options in rcs commands.
Richard M. Stallman <rms@gnu.org>
parents:
1343
diff
changeset
|
1411 (vc-do-command 0 "rcs" (concat "-l" rev) file) |
904 | 1412 ) |
1413 (vc-file-setprop file 'vc-locking-user (user-login-name)) | |
1414 (message "Stealing lock on %s...done" file) | |
1415 ) | |
1416 | |
1417 (defun vc-backend-uncheck (file target) | |
1418 ;; Undo the latest checkin. Note: this code will have to get a lot | |
1419 ;; smarter when we support multiple branches. | |
1420 (message "Removing last change from %s..." file) | |
1421 (vc-backend-dispatch file | |
1422 (vc-do-command 0 "rmdel" file (concat "-r" target)) | |
1423 (vc-do-command 0 "rcs" file (concat "-o" target)) | |
1424 ) | |
1425 (message "Removing last change from %s...done" file) | |
1426 ) | |
1427 | |
1428 (defun vc-backend-print-log (file) | |
1429 ;; Print change log associated with FILE to buffer *vc*. | |
1430 (vc-do-command 0 | |
1431 (vc-backend-dispatch file "prs" "rlog") | |
1432 file) | |
1433 ) | |
1434 | |
1435 (defun vc-backend-assign-name (file name) | |
1436 ;; Assign to a FILE's latest version a given NAME. | |
1437 (vc-backend-dispatch file | |
1438 (vc-add-triple name file (vc-latest-version file)) ;; SCCS | |
1439 (vc-do-command 0 "rcs" file (concat "-n" name ":")) ;; RCS | |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1440 ) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1441 ) |
904 | 1442 |
1443 (defun vc-backend-diff (file oldvers &optional newvers) | |
1444 ;; Get a difference report between two versions | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1445 (if (eq (vc-backend-deduce file) 'SCCS) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1446 (setq oldvers (vc-lookup-triple file oldvers)) |
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1447 (setq newvers (vc-lookup-triple file newvers))) |
904 | 1448 (apply 'vc-do-command 1 |
1449 (or (vc-backend-dispatch file "vcdiff" "rcsdiff") | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1450 (error "File %s is not under version control." file)) |
904 | 1451 file |
1452 (and oldvers (concat "-r" oldvers)) | |
1453 (and newvers (concat "-r" newvers)) | |
2667
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
1454 diff-switches |
904 | 1455 )) |
1456 | |
1457 (defun vc-check-headers () | |
1458 "Check if the current file has any headers in it." | |
1459 (interactive) | |
1460 (save-excursion | |
1461 (goto-char (point-min)) | |
1462 (vc-backend-dispatch buffer-file-name | |
1463 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS | |
1464 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS | |
1465 ) | |
1466 )) | |
1467 | |
1468 ;; Back-end-dependent stuff ends here. | |
1469 | |
1470 ;; Set up key bindings for use while editing log messages | |
1471 | |
1472 (defun vc-log-mode () | |
1473 "Minor mode for driving version-control tools. | |
1474 These bindings are added to the global keymap when you enter this mode: | |
1475 \\[vc-next-action] perform next logical version-control operation on current file | |
1476 \\[vc-register] register current file | |
1477 \\[vc-toggle-read-only] like next-action, but won't register files | |
1478 \\[vc-insert-headers] insert version-control headers in current file | |
1479 \\[vc-print-log] display change history of current file | |
1480 \\[vc-revert-buffer] revert buffer to latest version | |
1481 \\[vc-cancel-version] undo latest checkin | |
1482 \\[vc-diff] show diffs between file versions | |
1483 \\[vc-directory] show all files locked by any user in or below . | |
1484 \\[vc-update-change-log] add change log entry from recent checkins | |
1485 | |
1486 While you are entering a change log message for a version, the following | |
1487 additional bindings will be in effect. | |
1488 | |
1489 \\[vc-finish-logentry] proceed with check in, ending log message entry | |
1490 | |
1491 Whenever you do a checkin, your log comment is added to a ring of | |
1492 saved comments. These can be recalled as follows: | |
1493 | |
1494 \\[vc-next-comment] replace region with next message in comment ring | |
1495 \\[vc-previous-comment] replace region with previous message in comment ring | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1496 \\[vc-comment-search-reverse] search backward for regexp in the comment ring |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1497 \\[vc-comment-search-forward] search backward for regexp in the comment ring |
904 | 1498 |
1499 Entry to the change-log submode calls the value of text-mode-hook, then | |
1500 the value of vc-log-mode-hook. | |
1501 | |
1502 Global user options: | |
1503 vc-initial-comment If non-nil, require user to enter a change | |
1504 comment upon first checkin of the file. | |
1505 | |
1506 vc-keep-workfiles Non-nil value prevents workfiles from being | |
1507 deleted when changes are checked in | |
1508 | |
1509 vc-suppress-confirm Suppresses some confirmation prompts, | |
1510 notably for reversions. | |
1511 | |
2226
b2216b3b8f57
(vc-header-strings) Name changed to vc-header-alist, to match the
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2219
diff
changeset
|
1512 vc-header-alist Which keywords to insert when adding headers |
904 | 1513 with \\[vc-insert-headers]. Defaults to |
1514 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under RCS. | |
1515 | |
1516 vc-static-header-alist By default, version headers inserted in C files | |
1517 get stuffed in a static string area so that | |
1518 ident(RCS) or what(SCCS) can see them in the | |
1519 compiled object code. You can override this | |
1520 by setting this variable to nil, or change | |
1521 the header template by changing it. | |
1522 | |
1523 vc-command-messages if non-nil, display run messages from the | |
1524 actual version-control utilities (this is | |
1525 intended primarily for people hacking vc | |
1526 itself). | |
1527 " | |
1528 (interactive) | |
1529 (set-syntax-table text-mode-syntax-table) | |
1530 (use-local-map vc-log-entry-mode) | |
1531 (setq local-abbrev-table text-mode-abbrev-table) | |
1532 (setq major-mode 'vc-log-mode) | |
1533 (setq mode-name "VC-Log") | |
1534 (make-local-variable 'vc-log-file) | |
1535 (make-local-variable 'vc-log-version) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1536 (make-local-variable 'vc-comment-ring-index) |
904 | 1537 (set-buffer-modified-p nil) |
1538 (setq buffer-file-name nil) | |
1539 (run-hooks 'text-mode-hook 'vc-log-mode-hook) | |
1540 ) | |
1541 | |
1542 ;; Initialization code, to be done just once at load-time | |
1543 (if vc-log-entry-mode | |
1544 nil | |
1545 (setq vc-log-entry-mode (make-sparse-keymap)) | |
1546 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment) | |
1547 (define-key vc-log-entry-mode "\M-p" 'vc-previous-comment) | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1548 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse) |
904 | 1549 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward) |
1550 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry) | |
1551 ) | |
1552 | |
1553 ;;; These things should probably be generally available | |
1554 | |
1555 (defun vc-shrink-to-fit () | |
1556 "Shrink a window vertically until it's just large enough to contain its text" | |
1557 (let ((minsize (1+ (count-lines (point-min) (point-max))))) | |
1558 (if (< minsize (window-height)) | |
1559 (let ((window-min-height 2)) | |
1560 (shrink-window (- (window-height) minsize)))))) | |
1561 | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1562 (defun vc-file-tree-walk (func &rest args) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1563 "Walk recursively through default directory, |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1564 invoking FUNC f ARGS on all non-directory files f underneath it." |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1565 (vc-file-tree-walk-internal default-directory func args) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1566 (message "Traversing directory %s...done" default-directory)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1567 |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1568 (defun vc-file-tree-walk-internal (file func args) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1569 (if (not (file-directory-p file)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1570 (apply func file args) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1571 (message "Traversing directory %s..." file) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1572 (let ((dir (file-name-as-directory file))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1573 (mapcar |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1574 (function |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1575 (lambda (f) (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1576 (string-equal f ".") |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1577 (string-equal f "..") |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1578 (let ((dirf (concat dir f))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1579 (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1580 (file-symlink-p dirf) ;; Avoid possible loops |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1581 (vc-file-tree-walk-internal dirf func args)))))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1582 (directory-files dir))))) |
904 | 1583 |
1584 (provide 'vc) | |
1585 | |
1586 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE | |
1587 ;;; | |
1588 ;;; These may be useful to anyone who has to debug or extend the package. | |
1589 ;;; | |
1590 ;;; A fundamental problem in VC is that there are time windows between | |
1591 ;;; vc-next-action's computations of the file's version-control state and | |
1592 ;;; the actions that change it. This is a window open to lossage in a | |
1593 ;;; multi-user environment; someone else could nip in and change the state | |
1594 ;;; of the master during it. | |
1595 ;;; | |
1596 ;;; The performance problem is that rlog/prs calls are very expensive; we want | |
1597 ;;; to avoid them as much as possible. | |
1598 ;;; | |
1599 ;;; ANALYSIS: | |
1600 ;;; | |
1601 ;;; The performance problem, it turns out, simplifies in practice to the | |
1602 ;;; problem of making vc-locking-user fast. The two other functions that call | |
1603 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one | |
1604 ;;; makes snapshots, the other deletes the calling user's last change in the | |
1605 ;;; master. | |
1606 ;;; | |
1607 ;;; The race condition implies that we have to either (a) lock the master | |
1608 ;;; during the entire execution of vc-next-action, or (b) detect and | |
1609 ;;; recover from errors resulting from dispatch on an out-of-date state. | |
1610 ;;; | |
1611 ;;; Alternative (a) appears to be unfeasible. The problem is that we can't | |
1612 ;;; guarantee that the lock will ever be removed. Suppose a user starts a | |
1613 ;;; checkin, the change message buffer pops up, and the user, having wandered | |
1614 ;;; off to do something else, simply forgets about it? | |
1615 ;;; | |
1616 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up | |
1617 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/ | |
1618 ;;; unlocked state and its current owner from its permissions. | |
1619 ;;; | |
1620 ;;; This shortcut will fail if someone has manually changed the workfile's | |
1621 ;;; permissions; also if developers are munging the workfile in several | |
1622 ;;; directories, with symlinks to a master (in this latter case, the | |
1623 ;;; permissions shortcut will fail to detect a lock asserted from another | |
1624 ;;; directory). | |
1625 ;;; | |
1626 ;;; Note that these cases correspond exactly to the errors which could happen | |
1627 ;;; because of a competing checkin/checkout race in between two instances of | |
1628 ;;; vc-next-action. | |
1629 ;;; | |
1630 ;;; For VC's purposes, a workfile/master pair may have the following states: | |
1631 ;;; | |
1632 ;;; A. Unregistered. There is a workfile, there is no master. | |
1633 ;;; | |
1634 ;;; B. Registered and not locked by anyone. | |
1635 ;;; | |
1636 ;;; C. Locked by calling user and unchanged. | |
1637 ;;; | |
1638 ;;; D. Locked by the calling user and changed. | |
1639 ;;; | |
1640 ;;; E. Locked by someone other than the calling user. | |
1641 ;;; | |
1642 ;;; This makes for 25 states and 20 error conditions. Here's the matrix: | |
1643 ;;; | |
1644 ;;; VC's idea of state | |
1645 ;;; | | |
1646 ;;; V Actual state RCS action SCCS action Effect | |
1647 ;;; A B C D E | |
1648 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
1649 ;;; B 5 . 6 7 8 co -l get -e checkout | |
1650 ;;; C 9 10 . 11 12 co -u unget; get revert | |
1651 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin | |
1652 ;;; E 17 18 19 20 . rcs -u -M ; rcs -l unget -n ; get -g steal lock | |
1653 ;;; | |
1654 ;;; All commands take the master file name as a last argument (not shown). | |
1655 ;;; | |
1656 ;;; In the discussion below, a "self-race" is a pathological situation in | |
1657 ;;; which VC operations are being attempted simultaneously by two or more | |
1658 ;;; Emacsen running under the same username. | |
1659 ;;; | |
1660 ;;; The vc-next-action code has the following windows: | |
1661 ;;; | |
1662 ;;; Window P: | |
1663 ;;; Between the check for existence of a master file and the call to | |
1664 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
1665 ;;; never close if the initial-comment feature is on. | |
1666 ;;; | |
1667 ;;; Window Q: | |
1668 ;;; Between the call to vc-workfile-unchanged-p in and the immediately | |
1669 ;;; following revert (apparent state C). | |
1670 ;;; | |
1671 ;;; Window R: | |
1672 ;;; Between the call to vc-workfile-unchanged-p in and the following | |
1673 ;;; checkin (apparent state D). This window may never close. | |
1674 ;;; | |
1675 ;;; Window S: | |
1676 ;;; Between the unlock and the immediately following checkout during a | |
1677 ;;; revert operation (apparent state C). Included in window Q. | |
1678 ;;; | |
1679 ;;; Window T: | |
1680 ;;; Between vc-locking-user and the following checkout (apparent state B). | |
1681 ;;; | |
1682 ;;; Window U: | |
1683 ;;; Between vc-locking-user and the following revert (apparent state C). | |
1684 ;;; Includes windows Q and S. | |
1685 ;;; | |
1686 ;;; Window V: | |
1687 ;;; Between vc-locking-user and the following checkin (apparent state | |
1688 ;;; D). This window may never be closed if the user fails to complete the | |
1689 ;;; checkin message. Includes window R. | |
1690 ;;; | |
1691 ;;; Window W: | |
1692 ;;; Between vc-locking-user and the following steal-lock (apparent | |
1693 ;;; state E). This window may never cloce if the user fails to complete | |
1694 ;;; the steal-lock message. Includes window X. | |
1695 ;;; | |
1696 ;;; Window X: | |
1697 ;;; Between the unlock and the immediately following re-lock during a | |
1698 ;;; steal-lock operation (apparent state E). This window may never cloce | |
1699 ;;; if the user fails to complete the steal-lock message. | |
1700 ;;; | |
1701 ;;; Errors: | |
1702 ;;; | |
1703 ;;; Apparent state A --- | |
1704 ;;; | |
1705 ;;; 1. File looked unregistered but is actually registered and not locked. | |
1706 ;;; | |
1707 ;;; Potential cause: someone else's admin during window P, with | |
1708 ;;; caller's admin happening before their checkout. | |
1709 ;;; | |
1710 ;;; RCS: ci will fail with a "no lock set by <user>" message. | |
1711 ;;; SCCS: admin will fail with error (ad19). | |
1712 ;;; | |
1713 ;;; We can let these errors be passed up to the user. | |
1714 ;;; | |
1715 ;;; 2. File looked unregistered but is actually locked by caller, unchanged. | |
1716 ;;; | |
1717 ;;; Potential cause: self-race during window P. | |
1718 ;;; | |
1719 ;;; RCS: will revert the file to the last saved version and unlock it. | |
1720 ;;; SCCS: will fail with error (ad19). | |
1721 ;;; | |
1722 ;;; Either of these consequences is acceptable. | |
1723 ;;; | |
1724 ;;; 3. File looked unregistered but is actually locked by caller, changed. | |
1725 ;;; | |
1726 ;;; Potential cause: self-race during window P. | |
1727 ;;; | |
1728 ;;; RCS: will register the caller's workfile as a delta with a | |
1729 ;;; null change comment (the -t- switch will be ignored). | |
1730 ;;; SCCS: will fail with error (ad19). | |
1731 ;;; | |
1732 ;;; 4. File looked unregistered but is locked by someone else. | |
1733 ;;; | |
1734 ;;; Potential cause: someone else's admin during window P, with | |
1735 ;;; caller's admin happening *after* their checkout. | |
1736 ;;; | |
1737 ;;; RCS: will fail with a "no lock set by <user>" message. | |
1738 ;;; SCCS: will fail with error (ad19). | |
1739 ;;; | |
1740 ;;; We can let these errors be passed up to the user. | |
1741 ;;; | |
1742 ;;; Apparent state B --- | |
1743 ;;; | |
1744 ;;; 5. File looked registered and not locked, but is actually unregistered. | |
1745 ;;; | |
1746 ;;; Potential cause: master file got nuked during window P. | |
1747 ;;; | |
1748 ;;; RCS: will fail with "RCS/<file>: No such file or directory" | |
1749 ;;; SCCS: will fail with error ut4. | |
1750 ;;; | |
1751 ;;; We can let these errors be passed up to the user. | |
1752 ;;; | |
1753 ;;; 6. File looked registered and not locked, but is actually locked by the | |
1754 ;;; calling user and unchanged. | |
1755 ;;; | |
1756 ;;; Potential cause: self-race during window T. | |
1757 ;;; | |
1758 ;;; RCS: in the same directory as the previous workfile, co -l will fail | |
1759 ;;; with "co error: writable foo exists; checkout aborted". In any other | |
1760 ;;; directory, checkout will succeed. | |
1761 ;;; SCCS: will fail with ge17. | |
1762 ;;; | |
1763 ;;; Either of these consequences is acceptable. | |
1764 ;;; | |
1765 ;;; 7. File looked registered and not locked, but is actually locked by the | |
1766 ;;; calling user and changed. | |
1767 ;;; | |
1768 ;;; As case 6. | |
1769 ;;; | |
1770 ;;; 8. File looked registered and not locked, but is actually locked by another | |
1771 ;;; user. | |
1772 ;;; | |
1773 ;;; Potential cause: someone else checks it out during window T. | |
1774 ;;; | |
1775 ;;; RCS: co error: revision 1.3 already locked by <user> | |
1776 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
1777 ;;; | |
1778 ;;; We can let these errors be passed up to the user. | |
1779 ;;; | |
1780 ;;; Apparent state C --- | |
1781 ;;; | |
1782 ;;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
1783 ;;; | |
1784 ;;; As case 5. | |
1785 ;;; | |
1786 ;;; 10. File looks locked by calling user and unchanged, but is actually not | |
1787 ;;; locked. | |
1788 ;;; | |
1789 ;;; Potential cause: a self-race in window U, or by the revert's | |
1790 ;;; landing during window X of some other user's steal-lock or window S | |
1791 ;;; of another user's revert. | |
1792 ;;; | |
1793 ;;; RCS: succeeds, refreshing the file from the identical version in | |
1794 ;;; the master. | |
1795 ;;; SCCS: fails with error ut4 (p file nonexistent). | |
1796 ;;; | |
1797 ;;; Either of these consequences is acceptable. | |
1798 ;;; | |
1799 ;;; 11. File is locked by calling user. It looks unchanged, but is actually | |
1800 ;;; changed. | |
1801 ;;; | |
1802 ;;; Potential cause: the file would have to be touched by a self-race | |
1803 ;;; during window Q. | |
1804 ;;; | |
1805 ;;; The revert will succeed, removing whatever changes came with | |
1806 ;;; the touch. It is theoretically possible that work could be lost. | |
1807 ;;; | |
1808 ;;; 12. File looks like it's locked by the calling user and unchanged, but | |
1809 ;;; it's actually locked by someone else. | |
1810 ;;; | |
1811 ;;; Potential cause: a steal-lock in window V. | |
1812 ;;; | |
1813 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u | |
1814 ;;; SCCS: fails with error un2 | |
1815 ;;; | |
1816 ;;; We can pass these errors up to the user. | |
1817 ;;; | |
1818 ;;; Apparent state D --- | |
1819 ;;; | |
1820 ;;; 13. File looks like it's locked by the calling user and changed, but it's | |
1821 ;;; actually unregistered. | |
1822 ;;; | |
1823 ;;; Potential cause: master file got nuked during window P. | |
1824 ;;; | |
1825 ;;; RCS: Checks in the user's version as an initial delta. | |
1826 ;;; SCCS: will fail with error ut4. | |
1827 ;;; | |
1828 ;;; This case is kind of nasty. It means VC may fail to detect the | |
1829 ;;; loss of previous version information. | |
1830 ;;; | |
1831 ;;; 14. File looks like it's locked by the calling user and changed, but it's | |
1832 ;;; actually unlocked. | |
1833 ;;; | |
1834 ;;; Potential cause: self-race in window V, or the checkin happening | |
1835 ;;; during the window X of someone else's steal-lock or window S of | |
1836 ;;; someone else's revert. | |
1837 ;;; | |
1838 ;;; RCS: ci will fail with "no lock set by <user>". | |
1839 ;;; SCCS: delta will fail with error ut4. | |
1840 ;;; | |
1841 ;;; 15. File looks like it's locked by the calling user and changed, but it's | |
1842 ;;; actually locked by the calling user and unchanged. | |
1843 ;;; | |
1844 ;;; Potential cause: another self-race --- a whole checkin/checkout | |
1845 ;;; sequence by the calling user would have to land in window R. | |
1846 ;;; | |
1847 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. | |
1848 ;;; RCS: reverts to the file state as of the second user's checkin, leaving | |
1849 ;;; the file unlocked. | |
1850 ;;; | |
1851 ;;; It is theoretically possible that work could be lost under RCS. | |
1852 ;;; | |
1853 ;;; 16. File looks like it's locked by the calling user and changed, but it's | |
1854 ;;; actually locked by a different user. | |
1855 ;;; | |
1856 ;;; RCS: ci error: no lock set by <user> | |
1857 ;;; SCCS: unget will fail with error un2 | |
1858 ;;; | |
1859 ;;; We can pass these errors up to the user. | |
1860 ;;; | |
1861 ;;; Apparent state E --- | |
1862 ;;; | |
1863 ;;; 17. File looks like it's locked by some other user, but it's actually | |
1864 ;;; unregistered. | |
1865 ;;; | |
1866 ;;; As case 13. | |
1867 ;;; | |
1868 ;;; 18. File looks like it's locked by some other user, but it's actually | |
1869 ;;; unlocked. | |
1870 ;;; | |
1871 ;;; Potential cause: someone released a lock during window W. | |
1872 ;;; | |
1873 ;;; RCS: The calling user will get the lock on the file. | |
1874 ;;; SCCS: unget -n will fail with cm4. | |
1875 ;;; | |
1876 ;;; Either of these consequences will be OK. | |
1877 ;;; | |
1878 ;;; 19. File looks like it's locked by some other user, but it's actually | |
1879 ;;; locked by the calling user and unchanged. | |
1880 ;;; | |
1881 ;;; Potential cause: the other user relinquishing a lock followed by | |
1882 ;;; a self-race, both in window W. | |
1883 ;;; | |
1884 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making | |
1885 ;;; the sequence a no-op. | |
1886 ;;; | |
1887 ;;; 20. File looks like it's locked by some other user, but it's actually | |
1888 ;;; locked by the calling user and changed. | |
1889 ;;; | |
1890 ;;; As case 19. | |
1891 ;;; | |
1892 ;;; PROBLEM CASES: | |
1893 ;;; | |
1894 ;;; In order of decreasing severity: | |
1895 ;;; | |
1896 ;;; Cases 11 and 15 under RCS are the only one that potentially lose work. | |
1897 ;;; They would require a self-race for this to happen. | |
1898 ;;; | |
1899 ;;; Case 13 in RCS loses information about previous deltas, retaining | |
1900 ;;; only the information in the current workfile. This can only happen | |
1901 ;;; if the master file gets nuked in window P. | |
1902 ;;; | |
1903 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with | |
1904 ;;; no change comment in the master. This would require a self-race in | |
1905 ;;; window P or R respectively. | |
1906 ;;; | |
1907 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes. | |
1908 ;;; | |
1909 ;;; Unfortunately, it appears to me that no recovery is possible in these | |
1910 ;;; cases. They don't yield error messages, so there's no way to tell that | |
1911 ;;; a race condition has occurred. | |
1912 ;;; | |
1913 ;;; All other cases don't change either the workfile or the master, and | |
1914 ;;; trigger command errors which the user will see. | |
1915 ;;; | |
1916 ;;; Thus, there is no explicit recovery code. | |
1917 | |
1918 ;;; vc.el ends here |