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