Mercurial > emacs
annotate lisp/vc.el @ 15668:194145c1a2c0
Added Richard's diffs to this file, fixed a couple of small bugs
texinfo related bugs.
author | Daniel Hagerty <hag@gnu.org> |
---|---|
date | Sun, 14 Jul 1996 01:59:42 +0000 |
parents | 8d23d63f1eee |
children | d5dd4b891c3e |
rev | line source |
---|---|
904 | 1 ;;; vc.el --- drive a version-control system from within Emacs |
2 | |
14734 | 3 ;; Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. |
904 | 4 |
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
6 ;; Modified by: |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
7 ;; ttn@netcom.com |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
8 ;; Per Cederqvist <ceder@lysator.liu.edu> |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
9 ;; Andre Spiegel <spiegel@berlin.informatik.uni-stuttgart.de> |
904 | 10 |
11 ;; This file is part of GNU Emacs. | |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
904 | 27 |
28 ;;; Commentary: | |
29 | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
30 ;; 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
|
31 ;; |
904 | 32 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>. |
33 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>, | |
34 ;; and Richard Stallman contributed valuable criticism, support, and testing. | |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
35 ;; CVS support was added by Per Cederqvist <ceder@lysator.liu.se> |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
36 ;; in Jan-Feb 1994. |
904 | 37 ;; |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
38 ;; Supported version-control systems presently include SCCS, RCS, and CVS. |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
39 ;; |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
40 ;; Some features will not work with old RCS versions. Where |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
41 ;; appropriate, VC finds out which version you have, and allows or |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
42 ;; disallows those features (stealing locks, for example, works only |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
43 ;; from 5.6.2 onwards). |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
44 ;; Even initial checkins will fail if your RCS version is so old that ci |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
45 ;; doesn't understand -t-; this has been known to happen to people running |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
46 ;; NExTSTEP 3.0. |
904 | 47 ;; |
12926
ecb9cf000265
Removed the comment that said we assume strict locking.
André Spiegel <spiegel@gnu.org>
parents:
12915
diff
changeset
|
48 ;; You can support the RCS -x option by adding pairs to the |
ecb9cf000265
Removed the comment that said we assume strict locking.
André Spiegel <spiegel@gnu.org>
parents:
12915
diff
changeset
|
49 ;; vc-master-templates list. |
904 | 50 ;; |
51 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
52 ;; to be installed somewhere on Emacs's path for executables. | |
53 ;; | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
54 ;; 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
|
55 ;; 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
|
56 ;; |
904 | 57 ;; 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
|
58 ;; 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
|
59 ;; 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
|
60 ;; You also need Emacs 19's ring.el. |
904 | 61 ;; |
62 ;; The vc code maintains some internal state in order to reduce expensive | |
63 ;; 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
|
64 ;; once. If you perform version control operations with RCS/SCCS/CVS while |
904 | 65 ;; vc's back is turned, or move/rename master files while vc is running, |
66 ;; vc may get seriously confused. Don't do these things! | |
67 ;; | |
68 ;; Developer's notes on some concurrency issues are included at the end of | |
69 ;; the file. | |
70 | |
71 ;;; Code: | |
72 | |
73 (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
|
74 (require 'ring) |
8290
f95e050e272f
At compile time, require dired.
Richard M. Stallman <rms@gnu.org>
parents:
8237
diff
changeset
|
75 (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
|
76 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
77 (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
|
78 (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
|
79 (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
|
80 minor-mode-alist))) |
904 | 81 |
12280
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
82 ;; To implement support for a new version-control system, add another |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
83 ;; branch to the vc-backend-dispatch macro and fill it in in each |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
84 ;; call. The variable vc-master-templates in vc-hooks.el will also |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
85 ;; have to change. |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
86 |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
87 (defmacro vc-backend-dispatch (f s r c) |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
88 "Execute FORM1, FORM2 or FORM3 for SCCS, RCS or CVS respectively. |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
89 If FORM3 is `RCS', use FORM2 for CVS as well as RCS. |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
90 \(CVS shares some code with RCS)." |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
91 (list 'let (list (list 'type (list 'vc-backend f))) |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
92 (list 'cond |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
93 (list (list 'eq 'type (quote 'SCCS)) s) ;; SCCS |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
94 (list (list 'eq 'type (quote 'RCS)) r) ;; RCS |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
95 (list (list 'eq 'type (quote 'CVS)) ;; CVS |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
96 (if (eq c 'RCS) r c)) |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
97 ))) |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
98 |
904 | 99 ;; General customization |
100 | |
101 (defvar vc-suppress-confirm nil | |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
102 "*If non-nil, treat user as expert; suppress yes-no prompts on some things.") |
904 | 103 (defvar vc-initial-comment nil |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
104 "*If non-nil, prompt for initial comment when a file is registered.") |
904 | 105 (defvar vc-command-messages nil |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
106 "*If non-nil, display run messages from back-end commands.") |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
107 (defvar vc-checkin-switches nil |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
108 "*A string or list of strings specifying extra switches passed |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
109 to the checkin program by \\[vc-checkin].") |
10045
a29e447fb7f7
(vc-checkout-switches): New variable.
Roland McGrath <roland@gnu.org>
parents:
9827
diff
changeset
|
110 (defvar vc-checkout-switches nil |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
111 "*A string or list of strings specifying extra switches passed |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
112 to the checkout program by \\[vc-checkout].") |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
113 (defvar vc-directory-exclusion-list '("SCCS" "RCS" "CVS") |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
114 "*A list of directory names ignored by functions that recursively |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
115 walk file trees.") |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
116 |
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
|
117 (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
|
118 "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
|
119 |
2705
b4587e7ff4e5
(diff-switches): Define var here as well as in diff.el.
Richard M. Stallman <rms@gnu.org>
parents:
2692
diff
changeset
|
120 ;;; 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
|
121 (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
|
122 "*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
|
123 |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
124 ;;;###autoload |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
125 (defvar vc-checkin-hook nil |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
126 "*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
|
127 |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
128 (defvar vc-make-buffer-writable-hook nil |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
129 "*List of functions called when a buffer is made writable. See `run-hooks.' |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
130 This hook is only used when the version control system is CVS. It |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
131 might be useful for sites who uses locking with CVS, or who uses link |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
132 farms to gold trees.") |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
133 |
904 | 134 ;; Header-insertion hair |
135 | |
136 (defvar vc-header-alist | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
137 '((SCCS "\%W\%") (RCS "\$Id\$") (CVS "\$Id\$")) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
138 "*Header keywords to be inserted by `vc-insert-headers'. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
139 Must be a list of two-element lists, the first element of each must |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
140 be `RCS', `CVS', or `SCCS'. The second element is the string to |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
141 be inserted for this particular backend.") |
5015
368dd7e8095d
vc-static-header-alist shouldn't have been declared const.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
4991
diff
changeset
|
142 (defvar vc-static-header-alist |
904 | 143 '(("\\.c$" . |
144 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) | |
145 "*Associate static header string templates with file types. A \%s in the | |
146 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
|
147 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
|
148 |
904 | 149 (defvar vc-comment-alist |
150 '((nroff-mode ".\\\"" "")) | |
151 "*Special comment delimiters to be used in generating vc headers only. | |
152 Add an entry in this list if you need to override the normal comment-start | |
153 and comment-end variables. This will only be necessary if the mode language | |
154 is sensitive to blank lines.") | |
155 | |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
156 ;; 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
|
157 (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
|
158 "*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
|
159 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
|
160 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
|
161 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
162 (defvar vc-rcs-release nil |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
163 "*The release number of your RCS installation, as a string. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
164 If nil, VC itself computes this value when it is first needed.") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
165 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
166 (defvar vc-sccs-release nil |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
167 "*The release number of your SCCS installation, as a string. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
168 If nil, VC itself computes this value when it is first needed.") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
169 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
170 (defvar vc-cvs-release nil |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
171 "*The release number of your CVS installation, as a string. |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
172 If nil, VC itself computes this value when it is first needed.") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
173 |
904 | 174 ;; Variables the user doesn't need to know about. |
175 (defvar vc-log-entry-mode nil) | |
176 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
177 (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
|
178 (defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer) |
8350 | 179 ;; In a log entry buffer, this is a local variable |
180 ;; that points to the buffer for which it was made | |
181 ;; (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
|
182 (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
|
183 (defvar vc-parent-buffer-name nil) |
904 | 184 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
185 (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
|
186 (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
|
187 |
904 | 188 (defconst vc-name-assoc-file "VC-names") |
189 | |
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
|
190 (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
|
191 (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
|
192 |
15036
e782b987fbdb
(vc-comment-ring): Initialise using make-ring.
Richard M. Stallman <rms@gnu.org>
parents:
14855
diff
changeset
|
193 (defvar vc-comment-ring (make-ring vc-maximum-comment-ring-size)) |
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
|
194 (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
|
195 (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
|
196 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
197 ;; Back-portability to Emacs 18 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
198 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
199 (defun file-executable-p-18 (f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
200 (let ((modes (file-modes f))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
201 (and modes (not (zerop (logand 292)))))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
202 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
203 (defun file-regular-p-18 (f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
204 (let ((attributes (file-attributes f))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
205 (and attributes (not (car attributes))))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
206 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
207 ; Conditionally rebind some things for Emacs 18 compatibility |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
208 (if (not (boundp 'minor-mode-map-alist)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
209 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
210 (setq compilation-old-error-list nil) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
211 (fset 'file-executable-p 'file-executable-p-18) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
212 (fset 'shrink-window-if-larger-than-buffer 'beginning-of-buffer) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
213 )) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
214 |
12897
ee3f21f562b8
(file-regular-p-18): Fix test for whether to use this.
Richard M. Stallman <rms@gnu.org>
parents:
12885
diff
changeset
|
215 (if (not (fboundp 'file-regular-p)) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
216 (fset 'file-regular-p 'file-regular-p-18)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
217 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
218 ;;; Find and compare backend releases |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
219 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
220 (defun vc-backend-release (backend) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
221 ;; Returns which backend release is installed on this system. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
222 (cond |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
223 ((eq backend 'RCS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
224 (or vc-rcs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
225 (and (zerop (vc-do-command nil 2 "rcs" nil nil "-V")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
226 (save-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
227 (set-buffer (get-buffer "*vc*")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
228 (setq vc-rcs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
229 (car (vc-parse-buffer |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
230 '(("^RCS version \\([0-9.]+ *.*\\)" 1))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
231 (setq vc-rcs-release 'unknown))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
232 ((eq backend 'CVS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
233 (or vc-cvs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
234 (and (zerop (vc-do-command nil 1 "cvs" nil nil "-v")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
235 (save-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
236 (set-buffer (get-buffer "*vc*")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
237 (setq vc-cvs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
238 (car (vc-parse-buffer |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
239 '(("^Concurrent Versions System (CVS) \\([0-9.]+\\)" |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
240 1))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
241 (setq vc-cvs-release 'unknown))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
242 ((eq backend 'SCCS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
243 vc-sccs-release))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
244 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
245 (defun vc-release-greater-or-equal (r1 r2) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
246 ;; Compare release numbers, represented as strings. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
247 ;; Release components are assumed cardinal numbers, not decimal |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
248 ;; fractions (5.10 is a higher release than 5.9). Omitted fields |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
249 ;; are considered lower (5.6.7 is earlier than 5.6.7.1). |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
250 ;; Comparison runs till the end of the string is found, or a |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
251 ;; non-numeric component shows up (5.6.7 is earlier than "5.6.7 beta", |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
252 ;; which is probably not what you want in some cases). |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
253 ;; This code is suitable for existing RCS release numbers. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
254 ;; CVS releases are handled reasonably, too (1.3 < 1.4* < 1.5). |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
255 (let (v1 v2 i1 i2) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
256 (catch 'done |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
257 (or (and (string-match "^\\.?\\([0-9]+\\)" r1) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
258 (setq i1 (match-end 0)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
259 (setq v1 (string-to-number (match-string 1 r1))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
260 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
261 (setq i2 (match-end 0)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
262 (setq v2 (string-to-number (match-string 1 r2))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
263 (if (> v1 v2) (throw 'done t) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
264 (if (< v1 v2) (throw 'done nil) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
265 (throw 'done |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
266 (vc-release-greater-or-equal |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
267 (substring r1 i1) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
268 (substring r2 i2))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
269 (throw 'done t))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
270 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
271 (throw 'done nil)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
272 (throw 'done t))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
273 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
274 (defun vc-backend-release-p (backend release) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
275 ;; Return t if we have RELEASE of BACKEND or better |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
276 (let (i r (ri 0) (ii 0) is rs (installation (vc-backend-release backend))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
277 (if (not (eq installation 'unknown)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
278 (cond |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
279 ((or (eq backend 'RCS) (eq backend 'CVS)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
280 (vc-release-greater-or-equal installation release)))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
281 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
282 ;;; functions that operate on RCS revision numbers |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
283 |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
284 (defun vc-trunk-p (rev) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
285 ;; return t if REV is a revision on the trunk |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
286 (not (eq nil (string-match "\\`[0-9]+\\.[0-9]+\\'" rev)))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
287 |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
288 (defun vc-branch-part (rev) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
289 ;; return the branch part of a revision number REV |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
290 (substring rev 0 (string-match "\\.[0-9]+\\'" rev))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
291 |
904 | 292 ;; File property caching |
293 | |
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
|
294 (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
|
295 "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
|
296 (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
|
297 (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
|
298 ;; 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
|
299 ;; log buffer with a nonzero local value of vc-comment-ring-index. |
15036
e782b987fbdb
(vc-comment-ring): Initialise using make-ring.
Richard M. Stallman <rms@gnu.org>
parents:
14855
diff
changeset
|
300 (setq vc-comment-ring (make-ring vc-maximum-comment-ring-size))) |
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
|
301 |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
302 (defun vc-file-clear-masterprops (file) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
303 ;; clear all properties of FILE that were retrieved |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
304 ;; from the master file |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
305 (vc-file-setprop file 'vc-latest-version nil) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
306 (vc-file-setprop file 'vc-your-latest-version nil) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
307 (vc-backend-dispatch file |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
308 (progn ;; SCCS |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
309 (vc-file-setprop file 'vc-master-locks nil)) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
310 (progn ;; RCS |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
311 (vc-file-setprop file 'vc-default-branch nil) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
312 (vc-file-setprop file 'vc-head-version nil) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
313 (vc-file-setprop file 'vc-master-workfile-version nil) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
314 (vc-file-setprop file 'vc-master-locks nil)) |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
315 (progn |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
316 (vc-file-setprop file 'vc-cvs-status nil)))) |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
317 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
318 (defun vc-head-version (file) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
319 ;; Return the RCS head version of FILE |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
320 (cond ((vc-file-getprop file 'vc-head-version)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
321 (t (vc-fetch-master-properties file) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
322 (vc-file-getprop file 'vc-head-version)))) |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
323 |
904 | 324 ;; Random helper functions |
325 | |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
326 (defun vc-latest-on-branch-p (file) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
327 ;; return t iff the current workfile version of FILE is |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
328 ;; the latest on its branch. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
329 (vc-backend-dispatch file |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
330 ;; SCCS |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
331 (string= (vc-workfile-version file) (vc-latest-version file)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
332 ;; RCS |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
333 (let ((workfile-version (vc-workfile-version file)) tip-version) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
334 (if (vc-trunk-p workfile-version) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
335 (progn |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
336 ;; Re-fetch the head version number. This is to make |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
337 ;; sure that no-one has checked in a new version behind |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
338 ;; our back. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
339 (vc-fetch-master-properties file) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
340 (string= (vc-file-getprop file 'vc-head-version) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
341 workfile-version)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
342 ;; If we are not on the trunk, we need to examine the |
12875
33a7a6329aa5
Changed references to vc-top-version into vc-master-workfile-version.
André Spiegel <spiegel@gnu.org>
parents:
12873
diff
changeset
|
343 ;; whole current branch. (vc-master-workfile-version |
33a7a6329aa5
Changed references to vc-top-version into vc-master-workfile-version.
André Spiegel <spiegel@gnu.org>
parents:
12873
diff
changeset
|
344 ;; is not what we need.) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
345 (save-excursion |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
346 (set-buffer (get-buffer-create "*vc-info*")) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
347 (vc-insert-file (vc-name file) "^desc") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
348 (setq tip-version (car (vc-parse-buffer (list (list |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
349 (concat "^\\(" (regexp-quote (vc-branch-part workfile-version)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
350 "\\.[0-9]+\\)\ndate[ \t]+\\([0-9.]+\\);") 1 2))))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
351 (if (get-buffer "*vc-info*") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
352 (kill-buffer (get-buffer "*vc-info*"))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
353 (string= tip-version workfile-version)))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
354 ;; CVS |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
355 t)) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
356 |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
357 (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
|
358 (if file |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
359 (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
|
360 (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
|
361 |
904 | 362 (defvar vc-binary-assoc nil) |
363 | |
364 (defun vc-find-binary (name) | |
365 "Look for a command anywhere on the subprocess-command search path." | |
366 (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
|
367 (catch 'found |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
368 (mapcar |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
369 (function |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
370 (lambda (s) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
371 (if s |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
372 (let ((full (concat s "/" name))) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
373 (if (file-executable-p full) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
374 (progn |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
375 (setq vc-binary-assoc |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
376 (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
|
377 (throw 'found full))))))) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
378 exec-path) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
379 nil))) |
904 | 380 |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
381 (defun vc-do-command (buffer okstatus command file last &rest flags) |
904 | 382 "Execute a version-control command, notifying user and checking for errors. |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
383 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil. |
904 | 384 The command is successful if its exit status does not exceed OKSTATUS. |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
385 The last argument of the command is the master name of FILE if LAST is |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
386 `MASTER', or the workfile of FILE if LAST is `WORKFILE'; this is appended |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
387 to an optional list of FLAGS." |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
388 (and file (setq file (expand-file-name file))) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
389 (if (not buffer) (setq buffer "*vc*")) |
904 | 390 (if vc-command-messages |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
391 (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
|
392 (let ((obuf (current-buffer)) (camefrom (current-buffer)) |
904 | 393 (squeezed nil) |
394 (vc-file (and file (vc-name file))) | |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
395 (olddir default-directory) |
904 | 396 status) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
397 (set-buffer (get-buffer-create 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
|
398 (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
|
399 (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
|
400 (concat " from " (buffer-name camefrom))) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
401 (setq default-directory olddir) |
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
|
402 |
904 | 403 (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
|
404 |
904 | 405 (mapcar |
406 (function (lambda (s) (and s (setq squeezed (append squeezed (list s)))))) | |
407 flags) | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
408 (if (and vc-file (eq last 'MASTER)) |
904 | 409 (setq squeezed (append squeezed (list vc-file)))) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
410 (if (eq last 'WORKFILE) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
411 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
412 (let* ((pwd (expand-file-name default-directory)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
413 (preflen (length pwd))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
414 (if (string= (substring file 0 preflen) pwd) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
415 (setq file (substring file preflen)))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
416 (setq squeezed (append squeezed (list file))))) |
10862
b905092475a7
(vc-do-command): Search vc-path first, not last.
Richard M. Stallman <rms@gnu.org>
parents:
10786
diff
changeset
|
417 (let ((exec-path (append vc-path exec-path)) |
8726
fcf64871aa14
(vc-do-command): Temporarily add vc-path to the end of PATH.
Richard M. Stallman <rms@gnu.org>
parents:
8627
diff
changeset
|
418 ;; 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
|
419 (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
|
420 (cons (concat "PATH=" (getenv "PATH") |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
421 path-separator |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
422 (mapconcat 'identity vc-path path-separator)) |
8726
fcf64871aa14
(vc-do-command): Temporarily add vc-path to the end of PATH.
Richard M. Stallman <rms@gnu.org>
parents:
8627
diff
changeset
|
423 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
|
424 (setq status (apply 'call-process command nil t nil squeezed))) |
904 | 425 (goto-char (point-max)) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
426 (set-buffer-modified-p nil) |
4770
987685f55edd
(vc-do-command): Remove debugging output. Use (forward-line -1) instead
Brian Fox <bfox@gnu.org>
parents:
4725
diff
changeset
|
427 (forward-line -1) |
904 | 428 (if (or (not (integerp status)) (< okstatus status)) |
429 (progn | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
430 (pop-to-buffer buffer) |
904 | 431 (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
|
432 (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
|
433 (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
|
434 (if (integerp status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
435 (format "status %d" status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
436 status)) |
904 | 437 ) |
438 (if vc-command-messages | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
439 (message "Running %s...OK" command)) |
904 | 440 ) |
441 (set-buffer obuf) | |
442 status) | |
443 ) | |
444 | |
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
|
445 ;;; 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
|
446 ;;; 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
|
447 ;;; if all markers are destroyed or corrupted. |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
448 ;;; A lot 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
|
449 (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
|
450 (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
|
451 (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
|
452 (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
|
453 (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
|
454 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
455 ;;; 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
|
456 ;;; 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
|
457 (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
|
458 (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
|
459 (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
|
460 (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
|
461 (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
|
462 (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
|
463 (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
|
464 (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
|
465 (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
|
466 ;; 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
|
467 ;; 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
|
468 (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
|
469 ;; 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
|
470 ;; 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
|
471 (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
|
472 ;; 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
|
473 (- (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
|
474 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
475 (defun vc-buffer-context () |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
476 ;; Return a list '(point-context mark-context reparse); from which |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
477 ;; vc-restore-buffer-context can later restore the context. |
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
|
478 (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
|
479 ;; 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
|
480 (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
|
481 (vc-position-context (mark-marker)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
482 ;; 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
|
483 (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
|
484 ;; 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
|
485 (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
|
486 (let ((curbuf (current-buffer))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
487 ;; 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
|
488 ;; 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
|
489 ;; 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
|
490 (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
|
491 (mapcar (function |
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
492 (lambda (buffer) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
493 (set-buffer buffer) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
494 (let ((errors (or |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
495 compilation-old-error-list |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
496 compilation-error-list)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
497 (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
|
498 (while (and (consp errors) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
499 (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
|
500 (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
|
501 (eq buffer |
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
502 (marker-buffer |
2617
e2e5dfa162b4
(vc-revert-buffer1): Fix format of compilation-error-list.
Richard M. Stallman <rms@gnu.org>
parents:
2612
diff
changeset
|
503 (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
|
504 (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
|
505 (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
|
506 (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
|
507 (buffer-list))))))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
508 (list point-context mark-context reparse))) |
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
|
509 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
510 (defun vc-restore-buffer-context (context) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
511 ;; Restore point/mark, and reparse any affected compilation buffers. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
512 ;; CONTEXT is that which vc-buffer-context returns. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
513 (let ((point-context (nth 0 context)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
514 (mark-context (nth 1 context)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
515 (reparse (nth 2 context))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
516 ;; Reparse affected compilation buffers. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
517 (while reparse |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
518 (if (car reparse) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
519 (save-excursion |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
520 (set-buffer (car reparse)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
521 (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
|
522 ;; 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
|
523 ;; 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
|
524 (error-pos (marker-position |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
525 (car (car-safe compilation-error-list))))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
526 ;; 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
|
527 (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
|
528 ;; 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
|
529 ;; 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
|
530 (while (and compilation-error-list |
2558
78a9cebdb22c
(vc-revert-buffer1): Typo fix in last change.
Roland McGrath <roland@gnu.org>
parents:
2555
diff
changeset
|
531 (/= 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
|
532 (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
|
533 (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
|
534 |
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
|
535 ;; 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
|
536 (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
|
537 (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
|
538 (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
|
539 (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
|
540 (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
|
541 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
542 (defun vc-revert-buffer1 (&optional arg no-confirm) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
543 ;; Revert buffer, try to keep point and mark where user expects them in spite |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
544 ;; of changes because of expanded version-control key words. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
545 ;; This is quite important since otherwise typeahead won't work as expected. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
546 (interactive "P") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
547 (widen) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
548 (let ((context (vc-buffer-context))) |
13858
faf3e1b6f976
(vc-revert-buffer1): Pass t as preserve-modes to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
13852
diff
changeset
|
549 ;; t means don't call normal-mode; that's to preserve various minor modes. |
faf3e1b6f976
(vc-revert-buffer1): Pass t as preserve-modes to revert-buffer.
Richard M. Stallman <rms@gnu.org>
parents:
13852
diff
changeset
|
550 (revert-buffer arg no-confirm t) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
551 (vc-restore-buffer-context context))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
552 |
904 | 553 |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
554 (defun vc-buffer-sync (&optional not-urgent) |
904 | 555 ;; 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
|
556 ;; 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
|
557 (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
|
558 (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
|
559 (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
|
560 (save-buffer) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
561 (if not-urgent |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
562 nil |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
563 (error "Aborted"))))) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
564 |
904 | 565 |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
566 (defun vc-workfile-unchanged-p (file &optional want-differences-if-changed) |
904 | 567 ;; Has the given workfile changed since last checkout? |
568 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | |
569 (lastmod (nth 5 (file-attributes file)))) | |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
570 (or (equal checkout-time lastmod) |
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
571 (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
|
572 (let ((unchanged (zerop (vc-backend-diff file nil nil |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
573 (not want-differences-if-changed))))) |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
574 ;; 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
|
575 (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
|
576 unchanged))))) |
904 | 577 |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
578 (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
|
579 ;;; If comment is specified, it will be used as an admin or checkin comment. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
580 (let ((vc-file (vc-name file)) |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
581 (vc-type (vc-backend file)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
582 owner version 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
|
583 (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
|
584 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
585 ;; 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
|
586 ((not vc-file) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
587 (vc-register verbose comment) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
588 (if vc-initial-comment |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
589 (setq vc-log-after-operation-hook |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
590 'vc-checkout-writable-buffer-hook) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
591 (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
|
592 |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
593 ;; CVS: changes to the master file need to be |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
594 ;; merged back into the working file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
595 ((and (eq vc-type 'CVS) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
596 (or (eq (vc-cvs-status file) 'needs-checkout) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
597 (eq (vc-cvs-status file) 'needs-merge))) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
598 (if (or vc-dired-mode |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
599 (yes-or-no-p |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
600 (format "%s is not up-to-date. Merge in changes now? " |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
601 (buffer-name)))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
602 (progn |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
603 (if vc-dired-mode |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
604 (and (setq buffer (get-file-buffer file)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
605 (buffer-modified-p buffer) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
606 (switch-to-buffer-other-window buffer) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
607 (vc-buffer-sync t)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
608 (setq buffer (current-buffer)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
609 (vc-buffer-sync t)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
610 (if (and buffer (buffer-modified-p buffer) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
611 (not (yes-or-no-p |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
612 (format |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
613 "Buffer %s modified; merge file on disc anyhow? " |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
614 (buffer-name buffer))))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
615 (error "Merge aborted")) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
616 (if (not (zerop (vc-backend-merge-news file))) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
617 ;; Overlaps detected - what now? Should use some |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
618 ;; fancy RCS conflict resolving package, or maybe |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
619 ;; emerge, but for now, simply warn the user with a |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
620 ;; message. |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
621 (message "Conflicts detected!")) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
622 (and buffer |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
623 (vc-resynch-buffer file t (not (buffer-modified-p buffer))))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
624 (error "%s needs update" (buffer-name)))) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
625 |
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
|
626 ;; if there is no lock on the file, assert one and get it |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
627 ((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
|
628 (if (and vc-checkout-carefully |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
629 (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
|
630 (if (save-window-excursion |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
631 (pop-to-buffer "*vc-diff*") |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
632 (goto-char (point-min)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
633 (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
|
634 file)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
635 (not (beep)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
636 (yes-or-no-p |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
637 (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
|
638 "claim lock retaining changes? "))) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
639 (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
|
640 (vc-mode-line file)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
641 (if (not (yes-or-no-p "Revert to checked-in version, instead? ")) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
642 (error "Checkout aborted") |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
643 (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
|
644 (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
|
645 ) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
646 (if verbose |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
647 (if (not (eq vc-type 'SCCS)) |
12876
fedbe59f374e
(vc-next-action-on-file): Moved the setting of the default branch to
André Spiegel <spiegel@gnu.org>
parents:
12875
diff
changeset
|
648 (vc-checkout file nil |
fedbe59f374e
(vc-next-action-on-file): Moved the setting of the default branch to
André Spiegel <spiegel@gnu.org>
parents:
12875
diff
changeset
|
649 (read-string "Branch or version to move to: ")) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
650 (error "Sorry, this is not implemented for SCCS")) |
12873
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
651 (if (vc-latest-on-branch-p file) |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
652 (vc-checkout-writable-buffer file) |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
653 (if (yes-or-no-p |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
654 "This is not the latest version. Really lock it? ") |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
655 (vc-checkout-writable-buffer file) |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
656 (if (yes-or-no-p "Lock the latest version instead? ") |
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
657 (vc-checkout-writable-buffer file |
13111
f7fca58643bc
(vc-next-action-on-file): When locking the latest trunk version,
André Spiegel <spiegel@gnu.org>
parents:
13012
diff
changeset
|
658 (if (vc-trunk-p (vc-workfile-version file)) |
f7fca58643bc
(vc-next-action-on-file): When locking the latest trunk version,
André Spiegel <spiegel@gnu.org>
parents:
13012
diff
changeset
|
659 "" ;; this means check out latest on trunk |
f7fca58643bc
(vc-next-action-on-file): When locking the latest trunk version,
André Spiegel <spiegel@gnu.org>
parents:
13012
diff
changeset
|
660 (vc-branch-part (vc-workfile-version file))))))) |
12873
03d3b7d60f67
(vc-next-action-on-file): Query when trying to lock non-latest
André Spiegel <spiegel@gnu.org>
parents:
12872
diff
changeset
|
661 ))) |
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
|
662 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
663 ;; a checked-out version exists, but the user may not own the lock |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
664 ((and (not (eq vc-type 'CVS)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
665 (not (string-equal owner (user-login-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
|
666 (if comment |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
667 (error "Sorry, you can't steal the lock on %s this way" file)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
668 (and (eq vc-type 'RCS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
669 (not (vc-backend-release-p 'RCS "5.6.2")) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
670 (error "File is locked by %s" owner)) |
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
|
671 (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
|
672 file |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
673 (if verbose (read-string "Version to steal: ") |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
674 (vc-workfile-version 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
|
675 owner)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
676 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
677 ;; 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
|
678 (t |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
679 (if vc-dired-mode |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
680 (find-file-other-window file) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
681 (find-file 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
|
682 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
683 ;; 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
|
684 (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
|
685 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
686 ;; 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
|
687 ;; 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
|
688 ;; 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
|
689 ;; 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
|
690 ;; after finishing the log entry. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
691 (if (and (vc-workfile-unchanged-p 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
|
692 (not (buffer-modified-p))) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
693 ;; DO NOT revert the file without asking the user! |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
694 (cond |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
695 ((yes-or-no-p "Revert to master version? ") |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
696 (vc-backend-revert file) |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
697 (vc-resynch-window file t 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
|
698 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
699 ;; 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
|
700 (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
|
701 (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
|
702 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
703 ;; 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
|
704 (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
|
705 ))))) |
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
|
706 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
707 (defun vc-next-action-dired (file rev comment) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
708 ;; Do a vc-next-action-on-file on all the marked files, possibly |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
709 ;; passing on the log comment we've just entered. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
710 (let ((configuration (current-window-configuration)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
711 (dired-buffer (current-buffer)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
712 (dired-dir default-directory)) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
713 (dired-map-over-marks |
14297
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
714 (let ((file (dired-get-filename)) p |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
715 (default-directory default-directory)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
716 (message "Processing %s..." file) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
717 ;; Adjust the default directory so that checkouts |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
718 ;; go to the right place. |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
719 (setq default-directory (file-name-directory file)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
720 (vc-next-action-on-file file nil comment) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
721 (set-buffer dired-buffer) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
722 (setq default-directory dired-dir) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
723 (vc-dired-update-line file) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
724 (set-window-configuration configuration) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
725 (message "Processing %s...done" file)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
726 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
|
727 |
927 | 728 ;; Here's the major entry point. |
904 | 729 |
927 | 730 ;;;###autoload |
904 | 731 (defun vc-next-action (verbose) |
732 "Do the next logical checkin or checkout operation on the current file. | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
733 If you call this from within a VC dired buffer with no files marked, |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
734 it will operate on the file in the current line. |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
735 If you call this from within a VC dired buffer, and one or more |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
736 files are marked, it will accept a log message and then operate on |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
737 each one. The log message will be used as a comment for any register |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
738 or checkin operations, but ignored when doing checkouts. Attempted |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
739 lock steals will raise an error. |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
740 A prefix argument lets you specify the version number to use. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
741 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
742 For RCS and SCCS files: |
904 | 743 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
|
744 control and then retrieves a writable, locked copy for editing. |
904 | 745 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
|
746 a writable and locked file ready for editing. |
904 | 747 If the file is checked out and locked by the calling user, this |
748 first checks to see if the file has changed since checkout. If not, | |
749 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
|
750 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
|
751 of a log message; when the message has been entered, it checks in the |
904 | 752 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
|
753 the variable `vc-keep-workfiles' is non-nil (which is its default), a |
904 | 754 read-only copy of the changed file is left in place afterwards. |
755 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
|
756 the option to steal the lock. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
757 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
758 For CVS files: |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
759 If the file is not already registered, this registers it for version |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
760 control. This does a \"cvs add\", but no \"cvs commit\". |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
761 If the file is added but not committed, it is committed. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
762 If your working file is changed, but the repository file is |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
763 unchanged, this pops up a buffer for entry of a log message; when the |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
764 message has been entered, it checks in the resulting changes along |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
765 with the logmessage as change commentary. A writable file is retained. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
766 If the repository file is changed, you are asked if you want to |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
767 merge in the changes into your working copy." |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
768 |
904 | 769 (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
|
770 (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
|
771 (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
|
772 (let ((files (dired-get-marked-files))) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
773 (if (string= "" |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
774 (mapconcat |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
775 (function (lambda (f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
776 (if (eq (vc-backend f) 'CVS) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
777 (if (or (eq (vc-cvs-status f) 'locally-modified) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
778 (eq (vc-cvs-status f) 'locally-added)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
779 "@" "") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
780 (if (vc-locking-user f) "@" "")))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
781 files "")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
782 (vc-next-action-dired nil nil "dummy") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
783 (vc-start-entry nil nil nil |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
784 "Enter a change comment for the marked files." |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
785 'vc-next-action-dired)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
786 (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
|
787 (while vc-parent-buffer |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
788 (pop-to-buffer vc-parent-buffer)) |
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
|
789 (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
|
790 (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
|
791 (vc-registration-error nil)))) |
904 | 792 |
793 ;;; These functions help the vc-next-action entry point | |
794 | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
795 (defun vc-checkout-writable-buffer (&optional file rev) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
796 "Retrieve a writable copy of the latest version of the current buffer's file." |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
797 (vc-checkout (or file (buffer-file-name)) t rev) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
798 ) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
799 |
927 | 800 ;;;###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
|
801 (defun vc-register (&optional override comment) |
904 | 802 "Register the current file into your version-control system." |
803 (interactive "P") | |
12152
19ced24c2963
(vc-register): Check for a visited file first thing.
Karl Heuer <kwzh@gnu.org>
parents:
12107
diff
changeset
|
804 (or buffer-file-name |
19ced24c2963
(vc-register): Check for a visited file first thing.
Karl Heuer <kwzh@gnu.org>
parents:
12107
diff
changeset
|
805 (error "No visited file")) |
9216
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
806 (let ((master (vc-name buffer-file-name))) |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
807 (and master (file-exists-p master) |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
808 (error "This file is already registered")) |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
809 (and master |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
810 (not (y-or-n-p "Previous master file has vanished. Make a new one? ")) |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
811 (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
|
812 ;; 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
|
813 ;; 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
|
814 (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
|
815 (zerop (buffer-size)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
816 (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
|
817 (set-buffer-modified-p t)) |
904 | 818 (vc-buffer-sync) |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
819 (cond ((not vc-make-backup-files) |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
820 ;; inhibit backup for this buffer |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
821 (make-local-variable 'backup-inhibited) |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
822 (setq backup-inhibited t))) |
904 | 823 (vc-admin |
824 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
|
825 (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
|
826 (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
|
827 (format "Initial version level for %s: " buffer-file-name)))) |
904 | 828 ) |
829 | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
830 (defun vc-resynch-window (file &optional keep noquery) |
904 | 831 ;; If the given file is in the current buffer, |
14040 | 832 ;; either revert on it so we see expanded keywords, |
904 | 833 ;; 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
|
834 ;; 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
|
835 ;; 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
|
836 ;; between the buffer and the file is due to RCS rather than user editing! |
904 | 837 (and (string= buffer-file-name file) |
838 (if keep | |
839 (progn | |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
840 ;; temporarily remove vc-find-file-hook, so that |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
841 ;; we don't lose the properties |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
842 (remove-hook 'find-file-hooks 'vc-find-file-hook) |
1905
494dd05d460c
* files.el (revert-buffer): Reverse the sense of the first
Jim Blandy <jimb@redhat.com>
parents:
1674
diff
changeset
|
843 (vc-revert-buffer1 t noquery) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
844 (add-hook 'find-file-hooks 'vc-find-file-hook) |
904 | 845 (vc-mode-line buffer-file-name)) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
846 (kill-buffer (current-buffer))))) |
904 | 847 |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
848 (defun vc-resynch-buffer (file &optional keep noquery) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
849 ;; if FILE is currently visited, resynch its buffer |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
850 (let ((buffer (get-file-buffer file))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
851 (if buffer |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
852 (save-excursion |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
853 (set-buffer buffer) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
854 (vc-resynch-window file keep noquery))))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
855 |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
856 (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
|
857 ;; 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
|
858 ;; 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
|
859 ;; 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
|
860 ;; 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
|
861 ;; 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
|
862 (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
|
863 (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
|
864 (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
|
865 (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
|
866 (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
|
867 (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
|
868 (concat " from " (buffer-name vc-parent-buffer))) |
12393
7d4615a12286
(vc-start-entry): Prevent lossage when doing a mass checkin from
Richard M. Stallman <rms@gnu.org>
parents:
12365
diff
changeset
|
869 (if file (vc-mode-line 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
|
870 (vc-log-mode) |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
871 (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
|
872 (if after-hook |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
873 (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
|
874 (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
|
875 (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
|
876 (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
|
877 (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
|
878 (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
|
879 (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
|
880 (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
|
881 (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
|
882 (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
|
883 (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
|
884 (message "%s Type C-c C-c when done." msg)))) |
904 | 885 |
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 (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
|
887 "Check a file into your version-control system. |
904 | 888 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
|
889 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
|
890 (vc-start-entry file rev |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
891 (or comment (not vc-initial-comment)) |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
892 "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
|
893 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
|
894 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
895 (defun vc-checkout (file &optional writable rev) |
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
|
896 "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
|
897 ;; 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
|
898 ;; 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
|
899 (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
|
900 (error "Sorry, you can't check out files over FTP")) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
901 (vc-backend-checkout file writable rev) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
902 (vc-resynch-buffer file t t)) |
904 | 903 |
904 (defun vc-steal-lock (file rev &optional owner) | |
905 "Steal the lock on the current workfile." | |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
906 (let (file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
907 (if (not owner) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
908 (setq owner (vc-locking-user file))) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
909 (if rev |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
910 (setq file-description (format "%s:%s" file rev)) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
911 (setq file-description file)) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
912 (if (not (y-or-n-p (format "Take the lock on %s from %s? " |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
913 file-description owner))) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
914 (error "Steal cancelled")) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
915 (pop-to-buffer (get-buffer-create "*VC-mail*")) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
916 (setq default-directory (expand-file-name "~/")) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
917 (auto-save-mode auto-save-default) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
918 (mail-mode) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
919 (erase-buffer) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
920 (mail-setup owner (format "Stolen lock on %s" file-description) nil nil nil |
9045
989c8e13c115
(vc-finish-steal): Do vc-resynch-window in the right buffer.
Richard M. Stallman <rms@gnu.org>
parents:
9044
diff
changeset
|
921 (list (list 'vc-finish-steal file rev))) |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
922 (goto-char (point-max)) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
923 (insert |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
924 (format "I stole the lock on %s, " file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
925 (current-time-string) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
926 ".\n") |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
927 (message "Please explain why you stole the lock. Type C-c C-c when done."))) |
904 | 928 |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
929 ;; This is called when the notification has been sent. |
904 | 930 (defun vc-finish-steal (file version) |
931 (vc-backend-steal file version) | |
9045
989c8e13c115
(vc-finish-steal): Do vc-resynch-window in the right buffer.
Richard M. Stallman <rms@gnu.org>
parents:
9044
diff
changeset
|
932 (if (get-file-buffer file) |
989c8e13c115
(vc-finish-steal): Do vc-resynch-window in the right buffer.
Richard M. Stallman <rms@gnu.org>
parents:
9044
diff
changeset
|
933 (save-excursion |
9046
09fb6d81f449
(vc-finish-steal): Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9045
diff
changeset
|
934 (set-buffer (get-file-buffer file)) |
9045
989c8e13c115
(vc-finish-steal): Do vc-resynch-window in the right buffer.
Richard M. Stallman <rms@gnu.org>
parents:
9044
diff
changeset
|
935 (vc-resynch-window file t t)))) |
904 | 936 |
937 (defun vc-checkin (file &optional rev comment) | |
938 "Check in the file specified by FILE. | |
939 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
|
940 \(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
|
941 permissions zeroed, or deleted (according to the value of `vc-keep-workfiles'). |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
942 If the back-end is CVS, a writable workfile is always kept. |
904 | 943 COMMENT is a comment string; if omitted, a buffer is |
944 popped up to accept a comment." | |
6581
3a0db3b2366c
(vc-checkin): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
6563
diff
changeset
|
945 (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
|
946 "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
|
947 'vc-checkin-hook)) |
904 | 948 |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
949 ;;; 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
|
950 ;;; 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
|
951 (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
|
952 "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
|
953 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
|
954 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
|
955 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
|
956 (interactive (if current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
957 (list current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
958 (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
|
959 ;; 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
|
960 ;; before binding it. |
49029e28ed2c
(vc-comment-to-change-log): Load add-log before binding
Karl Heuer <kwzh@gnu.org>
parents:
5732
diff
changeset
|
961 (require 'add-log) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
962 (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
|
963 (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
|
964 ;; 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
|
965 (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
|
966 end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
967 ;; 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
|
968 (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
|
969 ;; 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
|
970 (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
|
971 (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
|
972 ;; 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
|
973 ;; 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
|
974 (delete-char -2)) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
975 ;; 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
|
976 (just-one-space) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
977 ;; 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
|
978 (let ((indentation (current-indentation))) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
979 (save-excursion |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
980 (while (< (point) end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
981 (forward-line 1) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
982 (indent-to indentation)) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
983 (setq end (point)))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
984 ;; Fill the inserted text, preserving open-parens at bol. |
10900
5b375fee0e1f
(vc-comment-to-change-log): Remove ^ from paragraph-start & paragraph-separate.
Boris Goldowsky <boris@gnu.org>
parents:
10862
diff
changeset
|
985 (let ((paragraph-separate (concat paragraph-separate "\\|\\s *\\s(")) |
5b375fee0e1f
(vc-comment-to-change-log): Remove ^ from paragraph-start & paragraph-separate.
Boris Goldowsky <boris@gnu.org>
parents:
10862
diff
changeset
|
986 (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
|
987 (beginning-of-line) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
988 (fill-region (point) end)) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
989 ;; 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
|
990 ;; 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
|
991 (skip-syntax-forward " " end) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
992 (delete-char (- (skip-syntax-backward " "))) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
993 (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
|
994 (insert "\n")))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
995 |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
996 |
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
|
997 (defun vc-finish-logentry (&optional nocomment) |
904 | 998 "Complete the operation implied by the current log entry." |
999 (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
|
1000 ;; 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
|
1001 (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
|
1002 (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
|
1003 (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
|
1004 (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
|
1005 (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
|
1006 ;; 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
|
1007 (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
|
1008 ;; 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
|
1009 (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
|
1010 )) |
5428
e66b058ec9f6
(vc-finish-logentry): Sync the buffer in case the user modified it while
Paul Eggert <eggert@twinsun.com>
parents:
5338
diff
changeset
|
1011 ;; 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
|
1012 ;; 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
|
1013 (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
|
1014 (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
|
1015 (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
|
1016 (vc-buffer-sync))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1017 (if (not vc-log-operation) (error "No log operation is pending")) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1018 ;; save the parameters held in buffer-local variables |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1019 (let ((log-operation vc-log-operation) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1020 (log-file vc-log-file) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1021 (log-version vc-log-version) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1022 (log-entry (buffer-string)) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1023 (after-hook vc-log-after-operation-hook)) |
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
|
1024 ;; 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
|
1025 (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
|
1026 (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
|
1027 (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
|
1028 (kill-buffer logbuf)) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1029 ;; OK, do it to it |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1030 (save-excursion |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1031 (funcall log-operation |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1032 log-file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1033 log-version |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1034 log-entry)) |
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
|
1035 ;; 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
|
1036 (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
|
1037 (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
|
1038 (run-hooks after-hook))) |
904 | 1039 |
1040 ;; Code for access to the comment ring | |
1041 | |
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
|
1042 (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
|
1043 "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
|
1044 (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
|
1045 (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
|
1046 (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
|
1047 (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
|
1048 (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
|
1049 (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
|
1050 (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
|
1051 ;; 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
|
1052 ;; 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
|
1053 ;; 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
|
1054 (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
|
1055 (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
|
1056 (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
|
1057 (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
|
1058 (setq vc-comment-ring-index |
4509
aeef9d07f78d
(vc-previous-comment): Use `mod', not `ring-mod'.
Paul Eggert <eggert@twinsun.com>
parents:
4480
diff
changeset
|
1059 (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
|
1060 (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
|
1061 (insert (ring-ref vc-comment-ring vc-comment-ring-index)))))) |
904 | 1062 |
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
|
1063 (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
|
1064 "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
|
1065 (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
|
1066 (vc-previous-comment (- arg))) |
904 | 1067 |
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
|
1068 (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
|
1069 "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
|
1070 (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
|
1071 (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
|
1072 (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
|
1073 (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
|
1074 (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
|
1075 (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
|
1076 (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
|
1077 (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
|
1078 (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
|
1079 (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
|
1080 (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
|
1081 (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
|
1082 (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
|
1083 (t (error "Not found"))))) |
904 | 1084 |
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
|
1085 (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
|
1086 "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
|
1087 (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
|
1088 (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
|
1089 (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
|
1090 (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
|
1091 (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
|
1092 (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
|
1093 (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
|
1094 (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
|
1095 (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
|
1096 (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
|
1097 (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
|
1098 (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
|
1099 (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
|
1100 (t (error "Not found"))))) |
904 | 1101 |
1102 ;; Additional entry points for examining version histories | |
1103 | |
927 | 1104 ;;;###autoload |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1105 (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
|
1106 "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
|
1107 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
|
1108 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
|
1109 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
|
1110 and two version designators specifying which versions to compare." |
14376
eb8910a353fc
(vc-diff): Make NOT-URGENT default to t.
Richard M. Stallman <rms@gnu.org>
parents:
14297
diff
changeset
|
1111 (interactive (list current-prefix-arg 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
|
1112 (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
|
1113 (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
|
1114 (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
|
1115 (pop-to-buffer vc-parent-buffer)) |
904 | 1116 (if historic |
1117 (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
|
1118 (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
|
1119 (error |
208145c77950
* vc.el (vc-diff, vc-directory-18): Add missing paren to end of
Jim Blandy <jimb@redhat.com>
parents:
4362
diff
changeset
|
1120 "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
|
1121 (let ((file buffer-file-name) |
904 | 1122 unchanged) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1123 (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
|
1124 (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
|
1125 (vc-buffer-sync not-urgent) |
904 | 1126 (setq unchanged (vc-workfile-unchanged-p buffer-file-name)) |
1127 (if unchanged | |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1128 (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
|
1129 (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
|
1130 ;; 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
|
1131 ;; 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
|
1132 ;; 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
|
1133 ;; 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
|
1134 ;; 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
|
1135 ;; 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
|
1136 ;; the diff.el and compile.el machinery. |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1137 (set-buffer "*vc-diff*") |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1138 (setq default-directory (file-name-directory file)) |
3895
0710180efd8b
(vc-diff): If `diff' gives empty output, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
3804
diff
changeset
|
1139 (if (= 0 (buffer-size)) |
0710180efd8b
(vc-diff): If `diff' gives empty output, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
3804
diff
changeset
|
1140 (progn |
0710180efd8b
(vc-diff): If `diff' gives empty output, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
3804
diff
changeset
|
1141 (setq unchanged t) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1142 (message "No changes to %s since latest version" file)) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1143 (pop-to-buffer "*vc-diff*") |
4362
2c0ac46d5d5b
(vc-shrink-to-fit): Deleted. All callers changed to use
Richard M. Stallman <rms@gnu.org>
parents:
4281
diff
changeset
|
1144 (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
|
1145 (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
|
1146 (not unchanged)))) |
904 | 1147 |
1148 (defun vc-version-diff (file rel1 rel2) | |
1149 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | |
1150 If FILE is a directory, generate diffs between versions for all registered | |
1151 files in or below it." | |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1152 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ") |
904 | 1153 (if (string-equal rel1 "") (setq rel1 nil)) |
1154 (if (string-equal rel2 "") (setq rel2 nil)) | |
1155 (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
|
1156 (let ((camefrom (current-buffer))) |
904 | 1157 (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
|
1158 (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
|
1159 (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
|
1160 (concat " from " (buffer-name camefrom))) |
904 | 1161 (erase-buffer) |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1162 (insert "Diffs between " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1163 (or rel1 "last version checked in") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1164 " and " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1165 (or rel2 "current workfile(s)") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1166 ":\n\n") |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1167 (set-buffer (get-buffer-create "*vc-diff*")) |
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 (cd file) |
904 | 1169 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1170 default-directory |
904 | 1171 (function (lambda (f) |
2219
a729b16f7427
(vc-version-diff): Use (message ...), not (message (format ...)).
Paul Eggert <eggert@twinsun.com>
parents:
2212
diff
changeset
|
1172 (message "Looking at %s" f) |
904 | 1173 (and |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1174 (not (file-directory-p f)) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1175 (vc-registered f) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1176 (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
|
1177 (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
|
1178 ))) |
904 | 1179 (pop-to-buffer "*vc-status*") |
1180 (insert "\nEnd of diffs.\n") | |
1181 (goto-char (point-min)) | |
1182 (set-buffer-modified-p nil) | |
1183 ) | |
2769
209f745babd1
(vc-version-diff): Don't move point in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
2760
diff
changeset
|
1184 (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
|
1185 (message "No changes to %s between %s and %s." file rel1 rel2) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1186 (pop-to-buffer "*vc-diff*")))) |
904 | 1187 |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1188 ;;;###autoload |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1189 (defun vc-version-other-window (rev) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1190 "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
|
1191 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
|
1192 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
|
1193 (interactive "sVersion to visit (default is latest version): ") |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1194 (if vc-dired-mode |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1195 (set-buffer (find-file-noselect (dired-get-filename)))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1196 (while vc-parent-buffer |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1197 (pop-to-buffer vc-parent-buffer)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1198 (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
|
1199 (let* ((version (if (string-equal rev "") |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1200 (vc-latest-version buffer-file-name) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1201 rev)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1202 (filename (concat buffer-file-name ".~" version "~"))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1203 (or (file-exists-p filename) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1204 (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
|
1205 (find-file-other-window filename)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1206 (vc-registration-error buffer-file-name))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1207 |
904 | 1208 ;; Header-insertion code |
1209 | |
927 | 1210 ;;;###autoload |
904 | 1211 (defun vc-insert-headers () |
1212 "Insert headers in a file for use with your version-control system. | |
1213 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
|
1214 the variable `vc-header-alist'." |
904 | 1215 (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
|
1216 (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
|
1217 (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
|
1218 (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
|
1219 (pop-to-buffer vc-parent-buffer)) |
904 | 1220 (save-excursion |
1221 (save-restriction | |
1222 (widen) | |
1223 (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
|
1224 (y-or-n-p "Version headers already exist. Insert another set? ")) |
904 | 1225 (progn |
1226 (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
1227 (comment-start-vc (or (car delims) comment-start "#")) | |
1228 (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
1229 (hdstrings (cdr (assoc (vc-backend (buffer-file-name)) vc-header-alist)))) |
904 | 1230 (mapcar (function (lambda (s) |
1231 (insert comment-start-vc "\t" s "\t" | |
1232 comment-end-vc "\n"))) | |
1233 hdstrings) | |
1234 (if vc-static-header-alist | |
1235 (mapcar (function (lambda (f) | |
1236 (if (string-match (car f) buffer-file-name) | |
1237 (insert (format (cdr f) (car hdstrings)))))) | |
1238 vc-static-header-alist)) | |
1239 ) | |
1240 ))))) | |
1241 | |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1242 (defun vc-clear-headers () |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1243 ;; Clear all version headers in the current buffer, i.e. reset them |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1244 ;; to the nonexpanded form. Only implemented for RCS, yet. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1245 ;; Don't lose point and mark during this. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1246 (let ((context (vc-buffer-context))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1247 (goto-char (point-min)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1248 (while (re-search-forward "\\$\\([A-Za-z]+\\): [^\\$]+\\$" nil t) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1249 (replace-match "$\\1$")) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1250 (vc-restore-buffer-context context))) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1251 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1252 ;; The VC directory major mode. Coopt Dired for this. |
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
|
1253 ;; 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
|
1254 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1255 (define-derived-mode vc-dired-mode dired-mode "Dired under VC" |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1256 "The major mode used in VC directory buffers. It is derived from Dired. |
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
|
1257 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
|
1258 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
|
1259 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
|
1260 on a buffer attached to the file named in the current Dired buffer line." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1261 (setq vc-dired-mode t)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1262 |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1263 (define-key vc-dired-mode-map "\C-xv" vc-prefix-map) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1264 (define-key vc-dired-mode-map "g" 'vc-dired-update) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1265 (define-key vc-dired-mode-map "=" 'vc-diff) |
904 | 1266 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1267 (defun vc-dired-state-info (file) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1268 ;; Return the string that indicates the version control status |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1269 ;; on a VC dired line. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1270 (let ((cvs-state (and (eq (vc-backend file) 'CVS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1271 (vc-cvs-status file)))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1272 (if cvs-state |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1273 (cond ((eq cvs-state 'up-to-date) nil) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1274 ((eq cvs-state 'needs-checkout) "patch") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1275 ((eq cvs-state 'locally-modified) "modified") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1276 ((eq cvs-state 'needs-merge) "merge") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1277 ((eq cvs-state 'unresolved-conflict) "conflict") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1278 ((eq cvs-state 'locally-added) "added")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1279 (vc-locking-user file)))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1280 |
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
|
1281 (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
|
1282 ;; 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
|
1283 ;; 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
|
1284 ;; 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
|
1285 ;; 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
|
1286 ;; 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
|
1287 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1288 ;; 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
|
1289 ;; (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
|
1290 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1291 ;; This code, like dired, assumes UNIX -l format. |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1292 (let ((pos (point)) limit perm owner date-and-file) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1293 (end-of-line) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1294 (setq limit (point)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1295 (goto-char pos) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1296 (cond |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1297 ((or |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1298 (re-search-forward ;; owner and group |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1299 "\\([drwxlts-]+ \\) *[0-9]+ \\([^ ]+\\) +[^ ]+ +[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)" |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1300 limit t) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1301 (re-search-forward ;; only owner displayed |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1302 "\\([drwxlts-]+ \\) *[0-9]+ \\([^ ]+\\) +[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)" |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1303 limit t)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1304 (setq perm (match-string 1) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1305 owner (match-string 2) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1306 date-and-file (match-string 3))) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1307 ((re-search-forward ;; OS/2 -l format, no links, owner, group |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1308 "\\([drwxlts-]+ \\) *[0-9]+\\( [^ 0-9]+ [0-9 ][0-9] .*\\)" |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1309 limit t) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1310 (setq perm (match-string 1) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1311 date-and-file (match-string 2)))) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1312 (if (numberp x) (setq x (or owner (number-to-string x)))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1313 (if x (setq x (concat "(" x ")"))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1314 (let ((rep (substring (concat x " ") 0 10))) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1315 (replace-match (concat perm rep date-and-file))))) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1316 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1317 (defun vc-dired-update-line (file) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1318 ;; Update the vc-dired listing line of file -- it is assumed |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1319 ;; that point is already on this line. Don't use dired-do-redisplay |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1320 ;; for this, because it cannot handle the way vc-dired deals with |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1321 ;; subdirectories. |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1322 (beginning-of-line) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1323 (forward-char 2) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1324 (let ((start (point))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1325 (forward-line 1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1326 (beginning-of-line) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1327 (delete-region start (point)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1328 (insert-directory file dired-listing-switches) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1329 (forward-line -1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1330 (end-of-line) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1331 (delete-char (- (length file))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1332 (insert (substring file (length (expand-file-name default-directory)))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1333 (goto-char start)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1334 (vc-dired-reformat-line (vc-dired-state-info 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
|
1335 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1336 (defun vc-dired-update (verbose) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1337 (interactive "P") |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1338 (vc-directory default-directory verbose)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1339 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1340 ;;; Note in Emacs 18 the following defun gets overridden |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1341 ;;; with the symbol 'vc-directory-18. See below. |
927 | 1342 ;;;###autoload |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1343 (defun vc-directory (dirname verbose) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1344 "Show version-control status of the current directory and subdirectories. |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1345 Normally it creates a Dired buffer that lists only the locked files |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1346 in all these directories. With a prefix argument, it lists all files." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1347 (interactive "DDired under VC (directory): \nP") |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1348 (require 'dired) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1349 (setq dirname (expand-file-name dirname)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1350 ;; force a trailing slash |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1351 (if (not (eq (elt dirname (1- (length dirname))) ?/)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1352 (setq dirname (concat dirname "/"))) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1353 (let (nonempty |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1354 (dl (length dirname)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1355 (filelist nil) (statelist nil) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1356 (old-dir default-directory) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1357 dired-buf |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1358 dired-buf-mod-count) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1359 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1360 dirname |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1361 (function |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1362 (lambda (f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1363 (if (vc-registered f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1364 (let ((state (vc-dired-state-info f))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1365 (and (or verbose state) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1366 (setq filelist (cons (substring f dl) filelist)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1367 (setq statelist (cons state statelist)))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1368 (save-window-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1369 (save-excursion |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1370 ;; This uses a semi-documented feature of dired; giving a switch |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1371 ;; argument forces the buffer to refresh each time. |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1372 (setq dired-buf |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1373 (dired-internal-noselect |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1374 (cons dirname (nreverse filelist)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1375 dired-listing-switches 'vc-dired-mode)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1376 (setq nonempty (not (eq 0 (length filelist)))))) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1377 (switch-to-buffer dired-buf) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1378 ;; Make a few modifications to the header |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1379 (setq buffer-read-only nil) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1380 (goto-char (point-min)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1381 (forward-line 1) ;; Skip header line |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1382 (let ((start (point))) ;; Erase (but don't remove) the |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1383 (end-of-line) ;; "wildcard" line. |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1384 (delete-region start (point))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1385 (beginning-of-line) |
904 | 1386 (if nonempty |
1387 (progn | |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1388 ;; Plug the version information into the individual lines |
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 (mapcar |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1390 (function |
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1391 (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
|
1392 (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
|
1393 (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
|
1394 (forward-line 1))) ;; go to next line |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1395 (nreverse statelist)) |
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
|
1396 (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
|
1397 (goto-char (point-min)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1398 (dired-next-line 2) |
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
|
1399 ) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1400 (dired-next-line 1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1401 (insert " ") |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1402 (setq buffer-read-only t) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1403 (message "No files are currently %s under %s" |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1404 (if verbose "registered" "locked") dirname)) |
904 | 1405 )) |
1406 | |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1407 ;; Emacs 18 version |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1408 (defun vc-directory-18 (verbose) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1409 "Show version-control status of all files under the current directory." |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1410 (interactive "P") |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1411 (let (nonempty (dir default-directory)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1412 (save-excursion |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1413 (set-buffer (get-buffer-create "*vc-status*")) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1414 (erase-buffer) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1415 (cd dir) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1416 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1417 default-directory |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1418 (function (lambda (f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1419 (if (vc-registered f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1420 (let ((user (vc-locking-user f))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1421 (if (or user verbose) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1422 (insert (format |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1423 "%s %s\n" |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1424 (concat user) f)))))))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1425 (setq nonempty (not (zerop (buffer-size))))) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1426 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1427 (if nonempty |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1428 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1429 (pop-to-buffer "*vc-status*" t) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1430 (goto-char (point-min)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1431 (shrink-window-if-larger-than-buffer))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1432 (message "No files are currently %s under %s" |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1433 (if verbose "registered" "locked") default-directory)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1434 ) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1435 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1436 (or (boundp 'minor-mode-map-alist) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1437 (fset 'vc-directory 'vc-directory-18)) |
10475
2d9590603a06
Revert Jan 15 and Jan 5 changes.
Richard M. Stallman <rms@gnu.org>
parents:
10431
diff
changeset
|
1438 |
904 | 1439 ;; Named-configuration support for SCCS |
1440 | |
1441 (defun vc-add-triple (name file rev) | |
1442 (save-excursion | |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1443 (find-file (expand-file-name |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1444 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1445 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1446 (expand-file-name (vc-backend-subdirectory-name file) |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1447 (file-name-directory file))))) |
904 | 1448 (goto-char (point-max)) |
1449 (insert name "\t:\t" file "\t" rev "\n") | |
1450 (basic-save-buffer) | |
1451 (kill-buffer (current-buffer)) | |
1452 )) | |
1453 | |
1454 (defun vc-record-rename (file newname) | |
1455 (save-excursion | |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1456 (find-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1457 (expand-file-name |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1458 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1459 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1460 (expand-file-name (vc-backend-subdirectory-name file) |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1461 (file-name-directory file))))) |
904 | 1462 (goto-char (point-min)) |
5263
f12548cb6e0b
(vc-record-rename): Don't use replace-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
5212
diff
changeset
|
1463 ;; (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
|
1464 (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
|
1465 (replace-match (concat ":" newname) nil nil)) |
904 | 1466 (basic-save-buffer) |
1467 (kill-buffer (current-buffer)) | |
1468 )) | |
1469 | |
1470 (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
|
1471 ;; 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
|
1472 ;; 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
|
1473 (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
|
1474 ((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
|
1475 (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
|
1476 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
|
1477 (t |
12281
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1478 (save-excursion |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1479 (set-buffer (get-buffer-create "*vc-info*")) |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1480 (vc-insert-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1481 (expand-file-name |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1482 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1483 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1484 (expand-file-name (vc-backend-subdirectory-name file) |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1485 (file-name-directory file))))) |
12281
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1486 (prog1 |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1487 (car (vc-parse-buffer |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1488 (list (list (concat name "\t:\t" file "\t\\(.+\\)") 1)))) |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1489 (kill-buffer "*vc-info*")))) |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1490 )) |
904 | 1491 |
1492 ;; Named-configuration entry points | |
1493 | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1494 (defun vc-snapshot-precondition () |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1495 ;; Scan the tree below the current directory. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1496 ;; If any files are locked, return the name of the first such file. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1497 ;; (This means, neither snapshot creation nor retrieval is allowed.) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1498 ;; If one or more of the files are currently visited, return `visited'. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1499 ;; Otherwise, return nil. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1500 (let ((status nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1501 (catch 'vc-locked-example |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1502 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1503 default-directory |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1504 (function (lambda (f) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1505 (and (vc-registered f) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1506 (if (vc-locking-user f) (throw 'vc-locked-example f) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1507 (if (get-file-buffer f) (setq status 'visited))))))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1508 status))) |
904 | 1509 |
927 | 1510 ;;;###autoload |
904 | 1511 (defun vc-create-snapshot (name) |
1512 "Make a snapshot called NAME. | |
1513 The snapshot is made from all registered files at or below the current | |
1514 directory. For each file, the version level of its latest | |
1515 version becomes part of the named configuration." | |
1516 (interactive "sNew snapshot name: ") | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1517 (let ((result (vc-snapshot-precondition))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1518 (if (stringp result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1519 (error "File %s is locked" result) |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1520 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1521 default-directory |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1522 (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
|
1523 (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
|
1524 (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
|
1525 ))) |
904 | 1526 |
927 | 1527 ;;;###autoload |
904 | 1528 (defun vc-retrieve-snapshot (name) |
1529 "Retrieve the snapshot called NAME. | |
1530 This function fails if any files are locked at or below the current directory | |
1531 Otherwise, all registered files are checked out (unlocked) at their version | |
1532 levels in the snapshot." | |
1533 (interactive "sSnapshot name to retrieve: ") | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1534 (let ((result (vc-snapshot-precondition)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1535 (update nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1536 (if (stringp result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1537 (error "File %s is locked" result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1538 (if (eq result 'visited) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1539 (setq update (yes-or-no-p "Update the affected buffers? "))) |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1540 (vc-file-tree-walk |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1541 default-directory |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1542 (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
|
1543 (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
|
1544 (vc-error-occurred |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1545 (vc-backend-checkout f nil name) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1546 (if update (vc-resynch-buffer f t t))))))) |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1547 ))) |
904 | 1548 |
1549 ;; Miscellaneous other entry points | |
1550 | |
927 | 1551 ;;;###autoload |
904 | 1552 (defun vc-print-log () |
1553 "List the change log of the current buffer in a window." | |
1554 (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
|
1555 (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
|
1556 (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
|
1557 (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
|
1558 (pop-to-buffer vc-parent-buffer)) |
904 | 1559 (if (and buffer-file-name (vc-name buffer-file-name)) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1560 (let ((file buffer-file-name)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1561 (vc-backend-print-log file) |
904 | 1562 (pop-to-buffer (get-buffer-create "*vc*")) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1563 (setq default-directory (file-name-directory file)) |
4770
987685f55edd
(vc-do-command): Remove debugging output. Use (forward-line -1) instead
Brian Fox <bfox@gnu.org>
parents:
4725
diff
changeset
|
1564 (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
|
1565 (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
|
1566 (forward-line -1)) |
904 | 1567 (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
|
1568 (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
|
1569 (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
|
1570 (shrink-window-if-larger-than-buffer) |
904 | 1571 ) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1572 (vc-registration-error buffer-file-name) |
904 | 1573 ) |
1574 ) | |
1575 | |
927 | 1576 ;;;###autoload |
904 | 1577 (defun vc-revert-buffer () |
952 | 1578 "Revert the current buffer's file back to the latest checked-in version. |
1579 This asks for confirmation if the buffer contents are not identical | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1580 to that version. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1581 If the back-end is CVS, this will give you the most recent revision of |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1582 the file on the branch you are editing." |
904 | 1583 (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
|
1584 (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
|
1585 (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
|
1586 (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
|
1587 (pop-to-buffer vc-parent-buffer)) |
904 | 1588 (let ((file buffer-file-name) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1589 ;; This operation should always ask for confirmation. |
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1590 (vc-suppress-confirm nil) |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1591 (obuf (current-buffer)) (changed (vc-diff nil t))) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1592 (if (and changed (not (yes-or-no-p "Discard changes? "))) |
904 | 1593 (progn |
12806
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1594 (if (and (window-dedicated-p (selected-window)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1595 (one-window-p t 'selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1596 (make-frame-invisible (selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1597 (delete-window)) |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
1598 (error "Revert cancelled")) |
904 | 1599 (set-buffer obuf)) |
1600 (if changed | |
12806
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1601 (if (and (window-dedicated-p (selected-window)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1602 (one-window-p t 'selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1603 (make-frame-invisible (selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1604 (delete-window))) |
904 | 1605 (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
|
1606 (vc-resynch-window file t t) |
904 | 1607 ) |
1608 ) | |
1609 | |
927 | 1610 ;;;###autoload |
904 | 1611 (defun vc-cancel-version (norevert) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1612 "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
|
1613 A prefix argument means do not revert the buffer afterwards." |
904 | 1614 (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
|
1615 (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
|
1616 (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
|
1617 (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
|
1618 (pop-to-buffer vc-parent-buffer)) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1619 (cond |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1620 ((not (vc-registered (buffer-file-name))) |
15336
8d23d63f1eee
(vc-cancel-version): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
15227
diff
changeset
|
1621 (vc-registration-error (buffer-file-name))) |
8d23d63f1eee
(vc-cancel-version): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
15227
diff
changeset
|
1622 ((eq (vc-backend (buffer-file-name)) 'CVS) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1623 (error "Unchecking files under CVS is dangerous and not supported in VC")) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1624 ((vc-locking-user (buffer-file-name)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1625 (error "This version is locked; use vc-revert-buffer to discard changes")) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1626 ((not (vc-latest-on-branch-p (buffer-file-name))) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1627 (error "This is not the latest version--VC cannot cancel it"))) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1628 (let* ((target (vc-workfile-version (buffer-file-name))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1629 (recent (if (vc-trunk-p target) "" (vc-branch-part target))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1630 (config (current-window-configuration)) done) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1631 (if (null (yes-or-no-p (format "Remove version %s from master? " target))) |
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
|
1632 nil |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1633 (setq norevert (or norevert (not |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1634 (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
|
1635 (vc-backend-uncheck (buffer-file-name) target) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1636 ;; Check out the most recent remaining version. If it fails, because |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1637 ;; the whole branch got deleted, do a double-take and check out the |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1638 ;; version where the branch started. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1639 (while (not done) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1640 (condition-case err |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1641 (progn |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1642 (if norevert |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1643 ;; Check out locked, but only to disc, and keep |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1644 ;; modifications in the buffer. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1645 (vc-backend-checkout (buffer-file-name) t recent) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1646 ;; Check out unlocked, and revert buffer. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1647 (vc-checkout (buffer-file-name) nil recent)) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1648 (setq done t)) |
14141
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1649 ;; If the checkout fails, vc-do-command signals an error. |
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1650 ;; We catch this error, check the reason, correct the |
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1651 ;; version number, and try a second time. |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1652 (error (set-buffer "*vc*") |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1653 (goto-char (point-min)) |
14141
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1654 (if (search-forward "no side branches present for" nil t) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1655 (progn (setq recent (vc-branch-part recent)) |
14141
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1656 ;; vc-do-command popped up a window with |
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1657 ;; the error message. Get rid of it, by |
dc502b9c237c
(vc-cancel-version): Use search-forward to scan error message. Added
André Spiegel <spiegel@gnu.org>
parents:
14053
diff
changeset
|
1658 ;; restoring the old window configuration. |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1659 (set-window-configuration config)) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1660 ;; No, it was some other error: re-signal it. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1661 (signal (car err) (cdr err)))))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1662 ;; If norevert, clear version headers and mark the buffer modified. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1663 (if norevert |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1664 (progn |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1665 (set-visited-file-name (buffer-file-name)) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1666 (if (not vc-make-backup-files) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1667 ;; inhibit backup for this buffer |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1668 (progn (make-local-variable 'backup-inhibited) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1669 (setq backup-inhibited t))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1670 (if (eq (vc-backend (buffer-file-name)) 'RCS) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1671 (progn (setq buffer-read-only nil) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1672 (vc-clear-headers))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1673 (vc-mode-line (buffer-file-name)))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1674 (message "Version %s has been removed from the master" target) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1675 ))) |
904 | 1676 |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1677 ;;;###autoload |
904 | 1678 (defun vc-rename-file (old new) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1679 "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
|
1680 (interactive "fVC rename file: \nFRename to: ") |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1681 ;; There are several ways of renaming files under CVS 1.3, but they all |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1682 ;; have serious disadvantages. See the FAQ (available from think.com in |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1683 ;; pub/cvs/). I'd rather send the user an error, than do something he might |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1684 ;; consider to be wrong. When the famous, long-awaited rename database is |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1685 ;; implemented things might change for the better. This is unlikely to occur |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1686 ;; until CVS 2.0 is released. --ceder 1994-01-23 21:27:51 |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
1687 (if (eq (vc-backend old) 'CVS) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1688 (error "Renaming files under CVS is dangerous and not supported in VC")) |
904 | 1689 (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
|
1690 (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
|
1691 (error "Please save files before moving them")) |
904 | 1692 (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
|
1693 (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
|
1694 (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
|
1695 (error "New file already exists")) |
904 | 1696 (let ((oldmaster (vc-name old))) |
1697 (if oldmaster | |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1698 (progn |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1699 (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
|
1700 (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
|
1701 (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
|
1702 ;; 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
|
1703 (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
|
1704 (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
|
1705 (rename-file |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1706 oldmaster |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
1707 (let ((backend (vc-backend old)) |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1708 (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
|
1709 (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
|
1710 (catch 'found |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1711 (mapcar |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1712 (function |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1713 (lambda (s) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1714 (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
|
1715 (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
|
1716 (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
|
1717 (if (or (not newmasterdir) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1718 (file-directory-p newmasterdir)) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1719 (throw 'found newmaster)))))) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1720 vc-master-templates) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1721 (error "New file lacks a version control directory")))))) |
904 | 1722 (if (or (not oldmaster) (file-exists-p old)) |
1723 (rename-file old new))) | |
1724 ; ?? Renaming a file might change its contents due to keyword expansion. | |
1725 ; We should really check out a new copy if the old copy was precisely equal | |
1726 ; to some checked in version. However, testing for this is tricky.... | |
1727 (if oldbuf | |
1728 (save-excursion | |
1729 (set-buffer oldbuf) | |
15227
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
1730 (let ((buffer-read-only buffer-read-only)) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
1731 (set-visited-file-name new)) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
1732 (vc-backend new) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
1733 (vc-mode-line new) |
904 | 1734 (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
|
1735 ;; 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
|
1736 (vc-backend-dispatch old |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1737 (vc-record-rename old new) ;SCCS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1738 nil ;RCS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1739 nil ;CVS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1740 ) |
904 | 1741 ) |
1742 | |
927 | 1743 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1744 (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
|
1745 "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
|
1746 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
|
1747 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
|
1748 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
|
1749 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
|
1750 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
|
1751 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1752 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1753 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1754 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1755 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1756 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1757 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1758 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1759 (setq file (buffer-file-name (car buffers))) |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
1760 (and file (vc-backend file) |
3939
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1761 (setq files (cons file files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1762 (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
|
1763 files)) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1764 (t |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1765 (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
|
1766 (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
|
1767 (mapcar (function |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1768 (lambda (f) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1769 (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
|
1770 (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
|
1771 f))) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1772 (directory-files RCS nil "...\\|^[^.]\\|^.[^.]"))))))) |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
1773 (let ((odefault default-directory) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1774 (full-name (or add-log-full-name |
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1775 (user-full-name))) |
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1776 (mailing-address (or add-log-mailing-address |
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1777 user-mail-address))) |
3905
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1778 (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
|
1779 (barf-if-buffer-read-only) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1780 (vc-buffer-sync) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1781 (undo-boundary) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1782 (goto-char (point-min)) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1783 (push-mark) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1784 (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
|
1785 (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
|
1786 (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
|
1787 (eq 0 (apply 'call-process "rcs2log" nil t nil |
11080
c18a37a30781
(vc-update-change-log): Use new -u option for rcs2log.
Richard M. Stallman <rms@gnu.org>
parents:
10953
diff
changeset
|
1788 "-u" |
c18a37a30781
(vc-update-change-log): Use new -u option for rcs2log.
Richard M. Stallman <rms@gnu.org>
parents:
10953
diff
changeset
|
1789 (concat (user-login-name) |
c18a37a30781
(vc-update-change-log): Use new -u option for rcs2log.
Richard M. Stallman <rms@gnu.org>
parents:
10953
diff
changeset
|
1790 "\t" |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
1791 full-name |
11080
c18a37a30781
(vc-update-change-log): Use new -u option for rcs2log.
Richard M. Stallman <rms@gnu.org>
parents:
10953
diff
changeset
|
1792 "\t" |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
1793 mailing-address) |
3939
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1794 (mapcar (function |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1795 (lambda (f) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1796 (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
|
1797 (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
|
1798 f |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1799 (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
|
1800 args)))) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1801 "done" "failed")))) |
904 | 1802 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1803 ;; Collect back-end-dependent stuff here |
904 | 1804 |
1805 (defun vc-backend-admin (file &optional rev comment) | |
1806 ;; Register a file into the version-control system | |
1807 ;; Automatically retrieves a read-only version of the file with | |
1808 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
1809 ;; it deletes the workfile. | |
1810 (vc-file-clearprops file) | |
1811 (or vc-default-back-end | |
1812 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))) | |
1813 (message "Registering %s..." file) | |
1814 (let ((backend | |
1815 (cond | |
1816 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end) | |
1817 ((file-exists-p "RCS") 'RCS) | |
1818 ((file-exists-p "SCCS") 'SCCS) | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1819 ((file-exists-p "CVS") 'CVS) |
904 | 1820 (t vc-default-back-end)))) |
1821 (cond ((eq backend 'SCCS) | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1822 (vc-do-command nil 0 "admin" file 'MASTER ;; SCCS |
904 | 1823 (and rev (concat "-r" rev)) |
1824 "-fb" | |
1825 (concat "-i" file) | |
1826 (and comment (concat "-y" comment)) | |
1827 (format | |
1828 (car (rassq 'SCCS vc-master-templates)) | |
1829 (or (file-name-directory file) "") | |
1830 (file-name-nondirectory file))) | |
1831 (delete-file file) | |
1832 (if vc-keep-workfiles | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1833 (vc-do-command nil 0 "get" file 'MASTER))) |
904 | 1834 ((eq backend 'RCS) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1835 (vc-do-command nil 0 "ci" file 'MASTER ;; RCS |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1836 ;; if available, use the secure registering option |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1837 (and (vc-backend-release-p 'RCS "5.6.4") "-i") |
904 | 1838 (concat (if vc-keep-workfiles "-u" "-r") rev) |
1839 (and comment (concat "-t-" comment)) | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1840 file)) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1841 ((eq backend 'CVS) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1842 (vc-do-command nil 0 "cvs" file 'WORKFILE ;; CVS |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1843 "add" |
12365
8fecaa78ac4b
(vc-backend-admin, vc-backend-checkin): Assume that
Richard M. Stallman <rms@gnu.org>
parents:
12311
diff
changeset
|
1844 (and comment (string-match "[^\t\n ]" comment) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1845 (concat "-m" comment))) |
904 | 1846 ))) |
1847 (message "Registering %s...done" file) | |
1848 ) | |
1849 | |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1850 (defun vc-backend-checkout (file &optional writable rev workfile) |
904 | 1851 ;; Retrieve a copy of a saved version into a workfile |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1852 (let ((filename (or workfile file)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1853 (file-buffer (get-file-buffer file)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1854 switches) |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1855 (message "Checking out %s..." filename) |
10046
4c632e091d88
(vc-backend-checkout): Finish last change.
Roland McGrath <roland@gnu.org>
parents:
10045
diff
changeset
|
1856 (save-excursion |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1857 ;; Change buffers to get local value of vc-checkout-switches. |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1858 (if file-buffer (set-buffer file-buffer)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1859 (setq switches (if (stringp vc-checkout-switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1860 (list vc-checkout-switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1861 vc-checkout-switches)) |
14297
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1862 ;; Save this buffer's default-directory |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1863 ;; and use save-excursion to make sure it is restored |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1864 ;; in the same buffer it was saved in. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1865 (let ((default-directory default-directory)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1866 (save-excursion |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1867 ;; Adjust the default-directory so that the check-out creates |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1868 ;; the file in the right place. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1869 (setq default-directory (file-name-directory filename)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1870 (vc-backend-dispatch file |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1871 (progn ;; SCCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1872 (and rev (string= rev "") (setq rev nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1873 (if workfile |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1874 ;; Some SCCS implementations allow checking out directly to a |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1875 ;; file using the -G option, but then some don't so use the |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1876 ;; least common denominator approach and use the -p option |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1877 ;; ala RCS. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1878 (let ((vc-modes (logior (file-modes (vc-name file)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1879 (if writable 128 0))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1880 (failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1881 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1882 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1883 (apply 'vc-do-command |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1884 nil 0 "/bin/sh" file 'MASTER "-c" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1885 ;; Some shells make the "" dummy argument into $0 |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1886 ;; while others use the shell's name as $0 and |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1887 ;; use the "" as $1. The if-statement |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1888 ;; converts the latter case to the former. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1889 (format "if [ x\"$1\" = x ]; then shift; fi; \ |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1890 umask %o; exec >\"$1\" || exit; \ |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1891 shift; umask %o; exec get \"$@\"" |
14297
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1892 (logand 511 (lognot vc-modes)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1893 (logand 511 (lognot (default-file-modes)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1894 "" ; dummy argument for shell's $0 |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1895 filename |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1896 (if writable "-e") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1897 "-p" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1898 (and rev |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1899 (concat "-r" (vc-lookup-triple file rev))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1900 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1901 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1902 (and failed (file-exists-p filename) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1903 (delete-file filename)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1904 (apply 'vc-do-command nil 0 "get" file 'MASTER ;; SCCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1905 (if writable "-e") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1906 (and rev (concat "-r" (vc-lookup-triple file rev))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1907 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1908 (vc-file-setprop file 'vc-workfile-version nil))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1909 (if workfile ;; RCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1910 ;; RCS doesn't let us check out into arbitrary file names directly. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1911 ;; Use `co -p' and make stdout point to the correct file. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1912 (let ((vc-modes (logior (file-modes (vc-name file)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1913 (if writable 128 0))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1914 (failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1915 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1916 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1917 (apply 'vc-do-command |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1918 nil 0 "/bin/sh" file 'MASTER "-c" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1919 ;; See the SCCS case, above, regarding the |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1920 ;; if-statement. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1921 (format "if [ x\"$1\" = x ]; then shift; fi; \ |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1922 umask %o; exec >\"$1\" || exit; \ |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1923 shift; umask %o; exec co \"$@\"" |
14297
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1924 (logand 511 (lognot vc-modes)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1925 (logand 511 (lognot (default-file-modes)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1926 "" ; dummy argument for shell's $0 |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1927 filename |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1928 (if writable "-l") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1929 (concat "-p" rev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1930 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1931 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1932 (and failed (file-exists-p filename) (delete-file filename)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1933 (let (new-version) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1934 ;; if we should go to the head of the trunk, |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1935 ;; clear the default branch first |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1936 (and rev (string= rev "") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1937 (vc-do-command nil 0 "rcs" file 'MASTER "-b")) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1938 ;; now do the checkout |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1939 (apply 'vc-do-command |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1940 nil 0 "co" file 'MASTER |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1941 ;; If locking is not strict, force to overwrite |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1942 ;; the writable workfile. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1943 (if (eq (vc-checkout-model file) 'implicit) "-f") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1944 (if writable "-l") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1945 (if rev (concat "-r" rev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1946 ;; if no explicit revision was specified, |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1947 ;; check out that of the working file |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1948 (let ((workrev (vc-workfile-version file))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1949 (if workrev (concat "-r" workrev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1950 nil))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1951 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1952 ;; determine the new workfile version |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1953 (save-excursion |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1954 (set-buffer "*vc*") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1955 (goto-char (point-min)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1956 (setq new-version |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1957 (if (re-search-forward "^revision \\([0-9.]+\\).*\n" nil t) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1958 (buffer-substring (match-beginning 1) (match-end 1))))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1959 (vc-file-setprop file 'vc-workfile-version new-version) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1960 ;; if necessary, adjust the default branch |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1961 (and rev (not (string= rev "")) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1962 (vc-do-command nil 0 "rcs" file 'MASTER |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1963 (concat "-b" (if (vc-latest-on-branch-p file) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1964 (if (vc-trunk-p new-version) nil |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1965 (vc-branch-part new-version)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1966 new-version)))))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1967 (if workfile ;; CVS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1968 ;; CVS is much like RCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1969 (let ((failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1970 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1971 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1972 (apply 'vc-do-command |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1973 nil 0 "/bin/sh" file 'WORKFILE "-c" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1974 "exec >\"$1\" || exit; shift; exec cvs update \"$@\"" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1975 "" ; dummy argument for shell's $0 |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1976 workfile |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1977 (concat "-r" rev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1978 "-p" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1979 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1980 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1981 (and failed (file-exists-p filename) (delete-file filename)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1982 ;; default for verbose checkout: clear the sticky tag |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1983 ;; so that the actual update will get the head of the trunk |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1984 (and rev (string= rev "") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1985 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A")) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1986 ;; If a revision was specified, check that out. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1987 (if rev |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1988 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1989 (and writable (eq (vc-checkout-model file) 'manual) "-w") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1990 "update" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1991 (and rev (not (string= rev "")) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1992 (concat "-r" rev)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1993 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1994 ;; If no revision was specified, simply make the file writable. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1995 (and writable |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1996 (or (eq (vc-checkout-model file) 'manual) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1997 (zerop (logand 128 (file-modes file)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1998 (set-file-modes file (logior 128 (file-modes file))))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
1999 (if rev (vc-file-setprop file 'vc-workfile-version nil)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2000 (cond |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2001 ((not workfile) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2002 (vc-file-clear-masterprops file) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2003 (if writable |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2004 (vc-file-setprop file 'vc-locking-user (user-login-name))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2005 (vc-file-setprop file |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2006 'vc-checkout-time (nth 5 (file-attributes file))))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2007 (message "Checking out %s...done" filename)))))) |
904 | 2008 |
2009 (defun vc-backend-logentry-check (file) | |
2010 (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
|
2011 (if (>= (buffer-size) 512) ;; SCCS |
904 | 2012 (progn |
2013 (goto-char 512) | |
2014 (error | |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
2015 "Log must be less than 512 characters; point is now at pos 512"))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2016 nil ;; RCS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2017 nil) ;; CVS |
904 | 2018 ) |
2019 | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2020 (defun vc-backend-checkin (file rev comment) |
904 | 2021 ;; Register changes to FILE as level REV with explanatory COMMENT. |
2022 ;; Automatically retrieves a read-only version of the file with | |
2023 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
2024 ;; it deletes the workfile. | |
14040 | 2025 ;; Adaptation for RCS branch support: if this is an explicit checkin, |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2026 ;; or if the checkin creates a new branch, set the master file branch |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2027 ;; accordingly. |
904 | 2028 (message "Checking in %s..." file) |
12210
a74a202e9660
(vc-backend-checkin): Provide an explicit string saying
Richard M. Stallman <rms@gnu.org>
parents:
12153
diff
changeset
|
2029 ;; "This log message intentionally left almost blank". |
12365
8fecaa78ac4b
(vc-backend-admin, vc-backend-checkin): Assume that
Richard M. Stallman <rms@gnu.org>
parents:
12311
diff
changeset
|
2030 ;; RCS 5.7 gripes about white-space-only comments too. |
8fecaa78ac4b
(vc-backend-admin, vc-backend-checkin): Assume that
Richard M. Stallman <rms@gnu.org>
parents:
12311
diff
changeset
|
2031 (or (and comment (string-match "[^\t\n ]" comment)) |
8fecaa78ac4b
(vc-backend-admin, vc-backend-checkin): Assume that
Richard M. Stallman <rms@gnu.org>
parents:
12311
diff
changeset
|
2032 (setq comment "*** empty log message ***")) |
1337
ab589b426055
(vc-backend-checkin): Change buffers to get local value of vc-checkin-switches.
Roland McGrath <roland@gnu.org>
parents:
1336
diff
changeset
|
2033 (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
|
2034 ;; 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
|
2035 (set-buffer (or (get-file-buffer file) (current-buffer))) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2036 (let ((switches |
13890
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2037 (if (stringp vc-checkin-switches) |
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2038 (list vc-checkin-switches) |
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2039 vc-checkin-switches))) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2040 ;; Clear the master-properties. Do that here, not at the |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2041 ;; end, because if the check-in fails we want them to get |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2042 ;; re-computed before the next try. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2043 (vc-file-clear-masterprops file) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2044 (vc-backend-dispatch file |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2045 ;; SCCS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2046 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2047 (apply 'vc-do-command nil 0 "delta" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2048 (if rev (concat "-r" rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2049 (concat "-y" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2050 switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2051 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2052 (vc-file-setprop file 'vc-workfile-version nil) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2053 (if vc-keep-workfiles |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2054 (vc-do-command nil 0 "get" file 'MASTER)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2055 ) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2056 ;; RCS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2057 (let ((old-version (vc-workfile-version file)) new-version) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2058 (apply 'vc-do-command nil 0 "ci" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2059 ;; if available, use the secure check-in option |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2060 (and (vc-backend-release-p 'RCS "5.6.4") "-j") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2061 (concat (if vc-keep-workfiles "-u" "-r") rev) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2062 (concat "-m" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2063 switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2064 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2065 (vc-file-setprop file 'vc-workfile-version nil) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2066 |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2067 ;; determine the new workfile version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2068 (set-buffer "*vc*") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2069 (goto-char (point-min)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2070 (if (or (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2071 "new revision: \\([0-9.]+\\);" nil t) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2072 (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2073 "reverting to previous revision \\([0-9.]+\\)" nil t)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2074 (progn (setq new-version (buffer-substring (match-beginning 1) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2075 (match-end 1))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2076 (vc-file-setprop file 'vc-workfile-version new-version))) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
2077 |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2078 ;; if we got to a different branch, adjust the default |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2079 ;; branch accordingly |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2080 (cond |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2081 ((and old-version new-version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2082 (not (string= (vc-branch-part old-version) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2083 (vc-branch-part new-version)))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2084 (vc-do-command nil 0 "rcs" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2085 (if (vc-trunk-p new-version) "-b" |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2086 (concat "-b" (vc-branch-part new-version)))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2087 ;; If this is an old RCS release, we might have |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2088 ;; to remove a remaining lock. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2089 (if (not (vc-backend-release-p 'RCS "5.6.2")) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2090 ;; exit status of 1 is also accepted. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2091 ;; It means that the lock was removed before. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2092 (vc-do-command nil 1 "rcs" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2093 (concat "-u" old-version)))))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2094 ;; CVS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2095 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2096 ;; explicit check-in to the trunk requires a |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2097 ;; double check-in (first unexplicit) (CVS-1.3) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2098 (condition-case nil |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2099 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2100 (if (and rev (vc-trunk-p rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2101 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2102 "ci" "-m" "intermediate" |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2103 switches)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2104 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2105 "ci" (if rev (concat "-r" rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2106 (concat "-m" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2107 switches)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2108 (error (if (eq (vc-cvs-status file) 'needs-merge) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2109 ;; The CVS output will be on top of this message. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2110 (error "Type C-x 0 C-x C-q to merge in changes") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2111 (error "Check-in failed")))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2112 ;; determine and store the new workfile version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2113 (set-buffer "*vc*") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2114 (goto-char (point-min)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2115 (if (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2116 "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" nil t) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2117 (vc-file-setprop file 'vc-workfile-version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2118 (buffer-substring (match-beginning 2) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2119 (match-end 2))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2120 (vc-file-setprop file 'vc-workfile-version nil)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2121 ;; if this was an explicit check-in, remove the sticky tag |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2122 (if rev |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2123 (vc-do-command nil 0 "cvs" file 'WORKFILE "update" "-A")) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2124 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2125 (vc-file-setprop file 'vc-checkout-time |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2126 (nth 5 (file-attributes file))))))) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
2127 (message "Checking in %s...done" file)) |
904 | 2128 |
2129 (defun vc-backend-revert (file) | |
2130 ;; Revert file to latest checked-in version. | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2131 ;; (for RCS, to workfile version) |
904 | 2132 (message "Reverting %s..." file) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2133 (vc-file-clear-masterprops file) |
904 | 2134 (vc-backend-dispatch |
2135 file | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2136 ;; SCCS |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2137 (progn |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2138 (vc-do-command nil 0 "unget" file 'MASTER nil) |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2139 (vc-do-command nil 0 "get" file 'MASTER nil)) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2140 ;; RCS |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2141 (vc-do-command nil 0 "co" file 'MASTER |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2142 "-f" (concat "-u" (vc-workfile-version file))) |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2143 ;; CVS |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2144 (progn |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2145 (delete-file file) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2146 (vc-do-command nil 0 "cvs" file 'WORKFILE "update"))) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
2147 (vc-file-setprop file 'vc-locking-user 'none) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2148 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file))) |
904 | 2149 (message "Reverting %s...done" file) |
2150 ) | |
2151 | |
2152 (defun vc-backend-steal (file &optional rev) | |
2153 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M. | |
2154 (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
|
2155 (vc-backend-dispatch file |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2156 (progn ;SCCS |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2157 (vc-do-command nil 0 "unget" file 'MASTER "-n" (if rev (concat "-r" rev))) |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2158 (vc-do-command nil 0 "get" file 'MASTER "-g" (if rev (concat "-r" rev))) |
4228
f1441ca7277e
> (vc-backend-revert): Use `co -f' instead of deleting the
Paul Eggert <eggert@twinsun.com>
parents:
4158
diff
changeset
|
2159 ) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2160 (vc-do-command nil 0 "rcs" file 'MASTER ;RCS |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2161 "-M" (concat "-u" rev) (concat "-l" rev)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2162 (error "You cannot steal a CVS lock; there are no CVS locks to steal") ;CVS |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2163 ) |
904 | 2164 (vc-file-setprop file 'vc-locking-user (user-login-name)) |
2165 (message "Stealing lock on %s...done" file) | |
2166 ) | |
2167 | |
2168 (defun vc-backend-uncheck (file target) | |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
2169 ;; Undo the latest checkin. |
904 | 2170 (message "Removing last change from %s..." file) |
2171 (vc-backend-dispatch file | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2172 (vc-do-command nil 0 "rmdel" file 'MASTER (concat "-r" target)) |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2173 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-o" target)) |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
2174 nil ;; this is never reached under CVS |
904 | 2175 ) |
2176 (message "Removing last change from %s...done" file) | |
2177 ) | |
2178 | |
2179 (defun vc-backend-print-log (file) | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2180 ;; Get change log associated with FILE. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2181 (vc-backend-dispatch |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2182 file |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2183 (vc-do-command nil 0 "prs" file 'MASTER) |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2184 (vc-do-command nil 0 "rlog" file 'MASTER) |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2185 (vc-do-command nil 0 "cvs" file 'WORKFILE "rlog"))) |
904 | 2186 |
2187 (defun vc-backend-assign-name (file name) | |
2188 ;; Assign to a FILE's latest version a given NAME. | |
2189 (vc-backend-dispatch file | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2190 (vc-add-triple name file (vc-latest-version file)) ;; SCCS |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2191 (vc-do-command nil 0 "rcs" file 'MASTER (concat "-n" name ":")) ;; RCS |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2192 (vc-do-command nil 0 "cvs" file 'WORKFILE "tag" name) ;; CVS |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
2193 ) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
2194 ) |
904 | 2195 |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
2196 (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
|
2197 ;; 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
|
2198 ;; Get only a brief comparison report if CMP, a difference report otherwise. |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
2199 (let ((backend (vc-backend file))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2200 (cond |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2201 ((eq backend 'SCCS) |
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
|
2202 (setq oldvers (vc-lookup-triple file oldvers)) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2203 (setq newvers (vc-lookup-triple file newvers))) |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2204 ((eq backend 'RCS) |
13379
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2205 (if (not oldvers) (setq oldvers (vc-workfile-version file))) |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2206 ;; If we know that --brief is not supported, don't try it. |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2207 (setq cmp (and cmp (not (eq vc-rcsdiff-knows-brief 'no)))))) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2208 ;; SCCS and RCS shares a lot of code. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2209 (cond |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2210 ((or (eq backend 'SCCS) (eq backend 'RCS)) |
13379
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2211 (let* ((command (if (eq backend 'SCCS) "vcdiff" "rcsdiff")) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
2212 (mode (if (eq backend 'RCS) 'WORKFILE 'MASTER)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2213 (options (append (list (and cmp "--brief") |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2214 "-q" |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2215 (and oldvers (concat "-r" oldvers)) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2216 (and newvers (concat "-r" newvers))) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2217 (and (not cmp) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2218 (if (listp diff-switches) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2219 diff-switches |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2220 (list diff-switches))))) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2221 (status (apply 'vc-do-command "*vc-diff*" 2 |
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2222 command file mode options))) |
13379
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2223 ;; If --brief didn't work, do a double-take and remember it |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2224 ;; for the future. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2225 (if (eq status 2) |
13379
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2226 (prog1 |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2227 (apply 'vc-do-command "*vc-diff*" 1 command file 'WORKFILE |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2228 (if cmp (cdr options) options)) |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2229 (if cmp (setq vc-rcsdiff-knows-brief 'no))) |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2230 ;; If --brief DID work, remember that, too. |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2231 (and cmp (not vc-rcsdiff-knows-brief) |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2232 (setq vc-rcsdiff-knows-brief 'yes)) |
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2233 status))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2234 ;; CVS is different. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2235 ((eq backend 'CVS) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2236 (if (string= (vc-workfile-version file) "0") ;CVS |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2237 ;; This file is added but not yet committed; there is no master file. |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2238 (if (or oldvers newvers) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2239 (error "No revisions of %s exist" file) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2240 (if cmp 1 ;; file is added but not committed, |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2241 ;; we regard this as "changed". |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2242 ;; diff it against /dev/null. |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2243 (apply 'vc-do-command |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2244 "*vc-diff*" 1 "diff" file 'WORKFILE |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2245 (append (if (listp diff-switches) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2246 diff-switches |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2247 (list diff-switches)) '("/dev/null"))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2248 ;; cmp is not yet implemented -- we always do a full diff. |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2249 (apply 'vc-do-command |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2250 "*vc-diff*" 1 "cvs" file 'WORKFILE "diff" |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2251 (and oldvers (concat "-r" oldvers)) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2252 (and newvers (concat "-r" newvers)) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2253 (if (listp diff-switches) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2254 diff-switches |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2255 (list diff-switches))))) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2256 (t |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2257 (vc-registration-error file))))) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2258 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2259 (defun vc-backend-merge-news (file) |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2260 ;; Merge in any new changes made to FILE. |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2261 (message "Merging changes into %s..." file) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2262 (prog1 |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2263 (vc-backend-dispatch |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2264 file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2265 (error "vc-backend-merge-news not meaningful for SCCS files") ;SCCS |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2266 (error "vc-backend-merge-news not meaningful for RCS files") ;RCS |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2267 (save-excursion ; CVS |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2268 (vc-file-clear-masterprops file) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2269 (vc-file-setprop file 'vc-workfile-version nil) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2270 (vc-file-setprop file 'vc-locking-user nil) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2271 (vc-do-command nil 0 "cvs" file 'WORKFILE "update") |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2272 ;; CVS doesn't return an error code if conflicts are detected. |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2273 ;; Since we want to warn the user about it (and possibly start |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2274 ;; emerge later), scan the output and see if this occurred. |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2275 (set-buffer (get-buffer "*vc*")) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2276 (goto-char (point-min)) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2277 (if (re-search-forward "^cvs update: conflicts found in .*" nil t) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2278 1 ;; error code for caller |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2279 0 ;; no conflict detected |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2280 ))) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2281 (message "Merging changes into %s...done" file))) |
904 | 2282 |
2283 (defun vc-check-headers () | |
2284 "Check if the current file has any headers in it." | |
2285 (interactive) | |
2286 (save-excursion | |
2287 (goto-char (point-min)) | |
2288 (vc-backend-dispatch buffer-file-name | |
2289 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS | |
2290 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t) ;; RCS | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2291 'RCS ;; CVS works like RCS in this regard. |
904 | 2292 ) |
2293 )) | |
2294 | |
2295 ;; Back-end-dependent stuff ends here. | |
2296 | |
2297 ;; Set up key bindings for use while editing log messages | |
2298 | |
2299 (defun vc-log-mode () | |
2300 "Minor mode for driving version-control tools. | |
2301 These bindings are added to the global keymap when you enter this mode: | |
2302 \\[vc-next-action] perform next logical version-control operation on current file | |
2303 \\[vc-register] register current file | |
2304 \\[vc-toggle-read-only] like next-action, but won't register files | |
2305 \\[vc-insert-headers] insert version-control headers in current file | |
2306 \\[vc-print-log] display change history of current file | |
2307 \\[vc-revert-buffer] revert buffer to latest version | |
2308 \\[vc-cancel-version] undo latest checkin | |
2309 \\[vc-diff] show diffs between file versions | |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2310 \\[vc-version-other-window] visit old version in another window |
904 | 2311 \\[vc-directory] show all files locked by any user in or below . |
2312 \\[vc-update-change-log] add change log entry from recent checkins | |
2313 | |
2314 While you are entering a change log message for a version, the following | |
2315 additional bindings will be in effect. | |
2316 | |
2317 \\[vc-finish-logentry] proceed with check in, ending log message entry | |
2318 | |
2319 Whenever you do a checkin, your log comment is added to a ring of | |
2320 saved comments. These can be recalled as follows: | |
2321 | |
2322 \\[vc-next-comment] replace region with next message in comment ring | |
2323 \\[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
|
2324 \\[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
|
2325 \\[vc-comment-search-forward] search backward for regexp in the comment ring |
904 | 2326 |
2327 Entry to the change-log submode calls the value of text-mode-hook, then | |
2328 the value of vc-log-mode-hook. | |
2329 | |
2330 Global user options: | |
2331 vc-initial-comment If non-nil, require user to enter a change | |
2332 comment upon first checkin of the file. | |
2333 | |
2334 vc-keep-workfiles Non-nil value prevents workfiles from being | |
2335 deleted when changes are checked in | |
2336 | |
2337 vc-suppress-confirm Suppresses some confirmation prompts, | |
2338 notably for reversions. | |
2339 | |
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
|
2340 vc-header-alist Which keywords to insert when adding headers |
904 | 2341 with \\[vc-insert-headers]. Defaults to |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2342 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2343 RCS and CVS. |
904 | 2344 |
2345 vc-static-header-alist By default, version headers inserted in C files | |
2346 get stuffed in a static string area so that | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2347 ident(RCS/CVS) or what(SCCS) can see them in |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2348 the compiled object code. You can override |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2349 this by setting this variable to nil, or change |
904 | 2350 the header template by changing it. |
2351 | |
2352 vc-command-messages if non-nil, display run messages from the | |
2353 actual version-control utilities (this is | |
2354 intended primarily for people hacking vc | |
2355 itself). | |
2356 " | |
2357 (interactive) | |
2358 (set-syntax-table text-mode-syntax-table) | |
2359 (use-local-map vc-log-entry-mode) | |
2360 (setq local-abbrev-table text-mode-abbrev-table) | |
2361 (setq major-mode 'vc-log-mode) | |
2362 (setq mode-name "VC-Log") | |
2363 (make-local-variable 'vc-log-file) | |
2364 (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
|
2365 (make-local-variable 'vc-comment-ring-index) |
904 | 2366 (set-buffer-modified-p nil) |
2367 (setq buffer-file-name nil) | |
2368 (run-hooks 'text-mode-hook 'vc-log-mode-hook) | |
2369 ) | |
2370 | |
2371 ;; Initialization code, to be done just once at load-time | |
2372 (if vc-log-entry-mode | |
2373 nil | |
2374 (setq vc-log-entry-mode (make-sparse-keymap)) | |
2375 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment) | |
2376 (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
|
2377 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse) |
904 | 2378 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward) |
2379 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry) | |
2380 ) | |
2381 | |
2382 ;;; These things should probably be generally available | |
2383 | |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2384 (defun vc-file-tree-walk (dirname func &rest args) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2385 "Walk recursively through DIRNAME. |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2386 Invoke FUNC f ARGS on each non-directory file f underneath it." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2387 (vc-file-tree-walk-internal (expand-file-name dirname) func args) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2388 (message "Traversing directory %s...done" dirname)) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2389 |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2390 (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
|
2391 (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
|
2392 (apply func file args) |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
2393 (message "Traversing directory %s..." (abbreviate-file-name file)) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2394 (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
|
2395 (mapcar |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2396 (function |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2397 (lambda (f) (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2398 (string-equal f ".") |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2399 (string-equal f "..") |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
2400 (member f vc-directory-exclusion-list) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2401 (let ((dirf (concat dir f))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2402 (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2403 (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
|
2404 (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
|
2405 (directory-files dir))))) |
904 | 2406 |
2407 (provide 'vc) | |
2408 | |
2409 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE | |
2410 ;;; | |
2411 ;;; These may be useful to anyone who has to debug or extend the package. | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2412 ;;; (Note that this information corresponds to versions 5.x. Some of it |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2413 ;;; might have been invalidated by the additions to support branching |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2414 ;;; and RCS keyword lookup. AS, 1995/03/24) |
904 | 2415 ;;; |
2416 ;;; A fundamental problem in VC is that there are time windows between | |
2417 ;;; vc-next-action's computations of the file's version-control state and | |
2418 ;;; the actions that change it. This is a window open to lossage in a | |
2419 ;;; multi-user environment; someone else could nip in and change the state | |
2420 ;;; of the master during it. | |
2421 ;;; | |
2422 ;;; The performance problem is that rlog/prs calls are very expensive; we want | |
2423 ;;; to avoid them as much as possible. | |
2424 ;;; | |
2425 ;;; ANALYSIS: | |
2426 ;;; | |
2427 ;;; The performance problem, it turns out, simplifies in practice to the | |
2428 ;;; problem of making vc-locking-user fast. The two other functions that call | |
2429 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one | |
2430 ;;; makes snapshots, the other deletes the calling user's last change in the | |
2431 ;;; master. | |
2432 ;;; | |
2433 ;;; The race condition implies that we have to either (a) lock the master | |
2434 ;;; during the entire execution of vc-next-action, or (b) detect and | |
2435 ;;; recover from errors resulting from dispatch on an out-of-date state. | |
2436 ;;; | |
14040 | 2437 ;;; Alternative (a) appears to be infeasible. The problem is that we can't |
904 | 2438 ;;; guarantee that the lock will ever be removed. Suppose a user starts a |
2439 ;;; checkin, the change message buffer pops up, and the user, having wandered | |
2440 ;;; off to do something else, simply forgets about it? | |
2441 ;;; | |
2442 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up | |
2443 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/ | |
2444 ;;; unlocked state and its current owner from its permissions. | |
2445 ;;; | |
2446 ;;; This shortcut will fail if someone has manually changed the workfile's | |
2447 ;;; permissions; also if developers are munging the workfile in several | |
2448 ;;; directories, with symlinks to a master (in this latter case, the | |
2449 ;;; permissions shortcut will fail to detect a lock asserted from another | |
2450 ;;; directory). | |
2451 ;;; | |
2452 ;;; Note that these cases correspond exactly to the errors which could happen | |
2453 ;;; because of a competing checkin/checkout race in between two instances of | |
2454 ;;; vc-next-action. | |
2455 ;;; | |
2456 ;;; For VC's purposes, a workfile/master pair may have the following states: | |
2457 ;;; | |
2458 ;;; A. Unregistered. There is a workfile, there is no master. | |
2459 ;;; | |
2460 ;;; B. Registered and not locked by anyone. | |
2461 ;;; | |
2462 ;;; C. Locked by calling user and unchanged. | |
2463 ;;; | |
2464 ;;; D. Locked by the calling user and changed. | |
2465 ;;; | |
2466 ;;; E. Locked by someone other than the calling user. | |
2467 ;;; | |
2468 ;;; This makes for 25 states and 20 error conditions. Here's the matrix: | |
2469 ;;; | |
2470 ;;; VC's idea of state | |
2471 ;;; | | |
2472 ;;; V Actual state RCS action SCCS action Effect | |
2473 ;;; A B C D E | |
2474 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
2475 ;;; B 5 . 6 7 8 co -l get -e checkout | |
2476 ;;; C 9 10 . 11 12 co -u unget; get revert | |
2477 ;;; D 13 14 15 . 16 ci -u -m<comment> delta -y<comment>; get checkin | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2478 ;;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock |
904 | 2479 ;;; |
2480 ;;; All commands take the master file name as a last argument (not shown). | |
2481 ;;; | |
2482 ;;; In the discussion below, a "self-race" is a pathological situation in | |
2483 ;;; which VC operations are being attempted simultaneously by two or more | |
2484 ;;; Emacsen running under the same username. | |
2485 ;;; | |
2486 ;;; The vc-next-action code has the following windows: | |
2487 ;;; | |
2488 ;;; Window P: | |
2489 ;;; Between the check for existence of a master file and the call to | |
2490 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
2491 ;;; never close if the initial-comment feature is on. | |
2492 ;;; | |
2493 ;;; Window Q: | |
2494 ;;; Between the call to vc-workfile-unchanged-p in and the immediately | |
2495 ;;; following revert (apparent state C). | |
2496 ;;; | |
2497 ;;; Window R: | |
2498 ;;; Between the call to vc-workfile-unchanged-p in and the following | |
2499 ;;; checkin (apparent state D). This window may never close. | |
2500 ;;; | |
2501 ;;; Window S: | |
2502 ;;; Between the unlock and the immediately following checkout during a | |
2503 ;;; revert operation (apparent state C). Included in window Q. | |
2504 ;;; | |
2505 ;;; Window T: | |
2506 ;;; Between vc-locking-user and the following checkout (apparent state B). | |
2507 ;;; | |
2508 ;;; Window U: | |
2509 ;;; Between vc-locking-user and the following revert (apparent state C). | |
2510 ;;; Includes windows Q and S. | |
2511 ;;; | |
2512 ;;; Window V: | |
2513 ;;; Between vc-locking-user and the following checkin (apparent state | |
2514 ;;; D). This window may never be closed if the user fails to complete the | |
2515 ;;; checkin message. Includes window R. | |
2516 ;;; | |
2517 ;;; Window W: | |
2518 ;;; 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
|
2519 ;;; state E). This window may never close if the user fails to complete |
904 | 2520 ;;; the steal-lock message. Includes window X. |
2521 ;;; | |
2522 ;;; Window X: | |
2523 ;;; Between the unlock and the immediately following re-lock during a | |
2524 ;;; steal-lock operation (apparent state E). This window may never cloce | |
2525 ;;; if the user fails to complete the steal-lock message. | |
2526 ;;; | |
2527 ;;; Errors: | |
2528 ;;; | |
2529 ;;; Apparent state A --- | |
2530 ;;; | |
2531 ;;; 1. File looked unregistered but is actually registered and not locked. | |
2532 ;;; | |
2533 ;;; Potential cause: someone else's admin during window P, with | |
2534 ;;; caller's admin happening before their checkout. | |
2535 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2536 ;;; RCS: Prior to version 5.6.4, ci fails with message |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2537 ;;; "no lock set by <user>". From 5.6.4 onwards, VC uses the new |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2538 ;;; ci -i option and the message is "<file>,v: already exists". |
904 | 2539 ;;; SCCS: admin will fail with error (ad19). |
2540 ;;; | |
2541 ;;; We can let these errors be passed up to the user. | |
2542 ;;; | |
2543 ;;; 2. File looked unregistered but is actually locked by caller, unchanged. | |
2544 ;;; | |
2545 ;;; Potential cause: self-race during window P. | |
2546 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2547 ;;; RCS: Prior to version 5.6.4, reverts the file to the last saved |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2548 ;;; version and unlocks it. From 5.6.4 onwards, VC uses the new |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2549 ;;; ci -i option, failing with message "<file>,v: already exists". |
904 | 2550 ;;; SCCS: will fail with error (ad19). |
2551 ;;; | |
2552 ;;; Either of these consequences is acceptable. | |
2553 ;;; | |
2554 ;;; 3. File looked unregistered but is actually locked by caller, changed. | |
2555 ;;; | |
2556 ;;; Potential cause: self-race during window P. | |
2557 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2558 ;;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2559 ;;; a delta with a null change comment (the -t- switch will be |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2560 ;;; ignored). From 5.6.4 onwards, VC uses the new ci -i option, |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2561 ;;; failing with message "<file>,v: already exists". |
904 | 2562 ;;; SCCS: will fail with error (ad19). |
2563 ;;; | |
2564 ;;; 4. File looked unregistered but is locked by someone else. | |
2565 ;;; | |
2566 ;;; Potential cause: someone else's admin during window P, with | |
2567 ;;; caller's admin happening *after* their checkout. | |
2568 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2569 ;;; RCS: Prior to version 5.6.4, ci fails with a |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2570 ;;; "no lock set by <user>" message. From 5.6.4 onwards, |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2571 ;;; VC uses the new ci -i option, failing with message |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2572 ;;; "<file>,v: already exists". |
904 | 2573 ;;; SCCS: will fail with error (ad19). |
2574 ;;; | |
2575 ;;; We can let these errors be passed up to the user. | |
2576 ;;; | |
2577 ;;; Apparent state B --- | |
2578 ;;; | |
2579 ;;; 5. File looked registered and not locked, but is actually unregistered. | |
2580 ;;; | |
2581 ;;; Potential cause: master file got nuked during window P. | |
2582 ;;; | |
2583 ;;; RCS: will fail with "RCS/<file>: No such file or directory" | |
2584 ;;; SCCS: will fail with error ut4. | |
2585 ;;; | |
2586 ;;; We can let these errors be passed up to the user. | |
2587 ;;; | |
2588 ;;; 6. File looked registered and not locked, but is actually locked by the | |
2589 ;;; calling user and unchanged. | |
2590 ;;; | |
2591 ;;; Potential cause: self-race during window T. | |
2592 ;;; | |
2593 ;;; RCS: in the same directory as the previous workfile, co -l will fail | |
2594 ;;; with "co error: writable foo exists; checkout aborted". In any other | |
2595 ;;; directory, checkout will succeed. | |
2596 ;;; SCCS: will fail with ge17. | |
2597 ;;; | |
2598 ;;; Either of these consequences is acceptable. | |
2599 ;;; | |
2600 ;;; 7. File looked registered and not locked, but is actually locked by the | |
2601 ;;; calling user and changed. | |
2602 ;;; | |
2603 ;;; As case 6. | |
2604 ;;; | |
2605 ;;; 8. File looked registered and not locked, but is actually locked by another | |
2606 ;;; user. | |
2607 ;;; | |
2608 ;;; Potential cause: someone else checks it out during window T. | |
2609 ;;; | |
2610 ;;; RCS: co error: revision 1.3 already locked by <user> | |
2611 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
2612 ;;; | |
2613 ;;; We can let these errors be passed up to the user. | |
2614 ;;; | |
2615 ;;; Apparent state C --- | |
2616 ;;; | |
2617 ;;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
2618 ;;; | |
2619 ;;; As case 5. | |
2620 ;;; | |
2621 ;;; 10. File looks locked by calling user and unchanged, but is actually not | |
2622 ;;; locked. | |
2623 ;;; | |
2624 ;;; Potential cause: a self-race in window U, or by the revert's | |
2625 ;;; landing during window X of some other user's steal-lock or window S | |
2626 ;;; of another user's revert. | |
2627 ;;; | |
2628 ;;; RCS: succeeds, refreshing the file from the identical version in | |
2629 ;;; the master. | |
2630 ;;; SCCS: fails with error ut4 (p file nonexistent). | |
2631 ;;; | |
2632 ;;; Either of these consequences is acceptable. | |
2633 ;;; | |
2634 ;;; 11. File is locked by calling user. It looks unchanged, but is actually | |
2635 ;;; changed. | |
2636 ;;; | |
2637 ;;; Potential cause: the file would have to be touched by a self-race | |
2638 ;;; during window Q. | |
2639 ;;; | |
2640 ;;; The revert will succeed, removing whatever changes came with | |
2641 ;;; the touch. It is theoretically possible that work could be lost. | |
2642 ;;; | |
2643 ;;; 12. File looks like it's locked by the calling user and unchanged, but | |
2644 ;;; it's actually locked by someone else. | |
2645 ;;; | |
2646 ;;; Potential cause: a steal-lock in window V. | |
2647 ;;; | |
2648 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u | |
2649 ;;; SCCS: fails with error un2 | |
2650 ;;; | |
2651 ;;; We can pass these errors up to the user. | |
2652 ;;; | |
2653 ;;; Apparent state D --- | |
2654 ;;; | |
2655 ;;; 13. File looks like it's locked by the calling user and changed, but it's | |
2656 ;;; actually unregistered. | |
2657 ;;; | |
2658 ;;; Potential cause: master file got nuked during window P. | |
2659 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2660 ;;; RCS: Prior to version 5.6.4, checks in the user's version as an |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2661 ;;; initial delta. From 5.6.4 onwards, VC uses the new ci -j |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2662 ;;; option, failing with message "no such file or directory". |
904 | 2663 ;;; SCCS: will fail with error ut4. |
2664 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2665 ;;; This case is kind of nasty. Under RCS prior to version 5.6.4, |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2666 ;;; VC may fail to detect the loss of previous version information. |
904 | 2667 ;;; |
2668 ;;; 14. File looks like it's locked by the calling user and changed, but it's | |
2669 ;;; actually unlocked. | |
2670 ;;; | |
2671 ;;; Potential cause: self-race in window V, or the checkin happening | |
2672 ;;; during the window X of someone else's steal-lock or window S of | |
2673 ;;; someone else's revert. | |
2674 ;;; | |
2675 ;;; RCS: ci will fail with "no lock set by <user>". | |
2676 ;;; SCCS: delta will fail with error ut4. | |
2677 ;;; | |
2678 ;;; 15. File looks like it's locked by the calling user and changed, but it's | |
2679 ;;; actually locked by the calling user and unchanged. | |
2680 ;;; | |
2681 ;;; Potential cause: another self-race --- a whole checkin/checkout | |
2682 ;;; sequence by the calling user would have to land in window R. | |
2683 ;;; | |
2684 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. | |
2685 ;;; RCS: reverts to the file state as of the second user's checkin, leaving | |
2686 ;;; the file unlocked. | |
2687 ;;; | |
2688 ;;; It is theoretically possible that work could be lost under RCS. | |
2689 ;;; | |
2690 ;;; 16. File looks like it's locked by the calling user and changed, but it's | |
2691 ;;; actually locked by a different user. | |
2692 ;;; | |
2693 ;;; RCS: ci error: no lock set by <user> | |
2694 ;;; SCCS: unget will fail with error un2 | |
2695 ;;; | |
2696 ;;; We can pass these errors up to the user. | |
2697 ;;; | |
2698 ;;; Apparent state E --- | |
2699 ;;; | |
2700 ;;; 17. File looks like it's locked by some other user, but it's actually | |
2701 ;;; unregistered. | |
2702 ;;; | |
2703 ;;; As case 13. | |
2704 ;;; | |
2705 ;;; 18. File looks like it's locked by some other user, but it's actually | |
2706 ;;; unlocked. | |
2707 ;;; | |
2708 ;;; Potential cause: someone released a lock during window W. | |
2709 ;;; | |
2710 ;;; RCS: The calling user will get the lock on the file. | |
2711 ;;; SCCS: unget -n will fail with cm4. | |
2712 ;;; | |
2713 ;;; Either of these consequences will be OK. | |
2714 ;;; | |
2715 ;;; 19. File looks like it's locked by some other user, but it's actually | |
2716 ;;; locked by the calling user and unchanged. | |
2717 ;;; | |
2718 ;;; Potential cause: the other user relinquishing a lock followed by | |
2719 ;;; a self-race, both in window W. | |
2720 ;;; | |
2721 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making | |
2722 ;;; the sequence a no-op. | |
2723 ;;; | |
2724 ;;; 20. File looks like it's locked by some other user, but it's actually | |
2725 ;;; locked by the calling user and changed. | |
2726 ;;; | |
2727 ;;; As case 19. | |
2728 ;;; | |
2729 ;;; PROBLEM CASES: | |
2730 ;;; | |
2731 ;;; In order of decreasing severity: | |
2732 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2733 ;;; Cases 11 and 15 are the only ones that potentially lose work. |
904 | 2734 ;;; They would require a self-race for this to happen. |
2735 ;;; | |
2736 ;;; Case 13 in RCS loses information about previous deltas, retaining | |
2737 ;;; only the information in the current workfile. This can only happen | |
2738 ;;; if the master file gets nuked in window P. | |
2739 ;;; | |
2740 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with | |
2741 ;;; no change comment in the master. This would require a self-race in | |
2742 ;;; window P or R respectively. | |
2743 ;;; | |
2744 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes. | |
2745 ;;; | |
2746 ;;; Unfortunately, it appears to me that no recovery is possible in these | |
2747 ;;; cases. They don't yield error messages, so there's no way to tell that | |
2748 ;;; a race condition has occurred. | |
2749 ;;; | |
2750 ;;; All other cases don't change either the workfile or the master, and | |
2751 ;;; trigger command errors which the user will see. | |
2752 ;;; | |
2753 ;;; Thus, there is no explicit recovery code. | |
2754 | |
2755 ;;; vc.el ends here |