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