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