Mercurial > emacs
annotate lisp/vc.el @ 18429:8326843eefd9
(widget-edit-hook): New variable.
(widget-field-action, widget-choice-action): Run that hook
instead of displaying an echo area message.
(widget-toggle-action): Likewise.
(group-visibility, widget-group-visibility-create):
Moved to cus-edit.el and renamed.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 24 Jun 1997 03:17:34 +0000 |
parents | ffe9754664a2 |
children | bee41cc3fd48 |
rev | line source |
---|---|
904 | 1 ;;; vc.el --- drive a version-control system from within Emacs |
2 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
3 ;; Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc. |
904 | 4 |
16821
d57c1c1bb966
Changed my e-mail address in the header.
André Spiegel <spiegel@gnu.org>
parents:
16743
diff
changeset
|
5 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com> |
d57c1c1bb966
Changed my e-mail address in the header.
André Spiegel <spiegel@gnu.org>
parents:
16743
diff
changeset
|
6 ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de> |
904 | 7 |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
12 ;; the Free Software Foundation; either version 2, or (at your option) | |
13 ;; any later version. | |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
14169 | 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
23 ;; Boston, MA 02111-1307, USA. | |
904 | 24 |
25 ;;; Commentary: | |
26 | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
27 ;; This mode is fully documented in the Emacs user's manual. |
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
28 ;; |
904 | 29 ;; This was designed and implemented by Eric Raymond <esr@snark.thyrsus.com>. |
30 ;; Paul Eggert <eggert@twinsun.com>, Sebastian Kremer <sk@thp.uni-koeln.de>, | |
31 ;; and Richard Stallman contributed valuable criticism, support, and testing. | |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
32 ;; CVS support was added by Per Cederqvist <ceder@lysator.liu.se> |
16821
d57c1c1bb966
Changed my e-mail address in the header.
André Spiegel <spiegel@gnu.org>
parents:
16743
diff
changeset
|
33 ;; in Jan-Feb 1994. Further enhancements came from ttn.netcom.com and |
d57c1c1bb966
Changed my e-mail address in the header.
André Spiegel <spiegel@gnu.org>
parents:
16743
diff
changeset
|
34 ;; Andre Spiegel <spiegel@inf.fu-berlin.de>. |
904 | 35 ;; |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
36 ;; 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
|
37 ;; |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
38 ;; 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
|
39 ;; 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
|
40 ;; 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
|
41 ;; 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
|
42 ;; 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
|
43 ;; 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
|
44 ;; NExTSTEP 3.0. |
904 | 45 ;; |
12926
ecb9cf000265
Removed the comment that said we assume strict locking.
André Spiegel <spiegel@gnu.org>
parents:
12915
diff
changeset
|
46 ;; 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
|
47 ;; vc-master-templates list. |
904 | 48 ;; |
49 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
50 ;; to be installed somewhere on Emacs's path for executables. | |
51 ;; | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
52 ;; 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
|
53 ;; 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
|
54 ;; |
904 | 55 ;; 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
|
56 ;; 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
|
57 ;; 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
|
58 ;; You also need Emacs 19's ring.el. |
904 | 59 ;; |
60 ;; The vc code maintains some internal state in order to reduce expensive | |
61 ;; 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
|
62 ;; once. If you perform version control operations with RCS/SCCS/CVS while |
904 | 63 ;; vc's back is turned, or move/rename master files while vc is running, |
64 ;; vc may get seriously confused. Don't do these things! | |
65 ;; | |
66 ;; Developer's notes on some concurrency issues are included at the end of | |
67 ;; the file. | |
68 | |
69 ;;; Code: | |
70 | |
71 (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
|
72 (require 'ring) |
8290
f95e050e272f
At compile time, require dired.
Richard M. Stallman <rms@gnu.org>
parents:
8237
diff
changeset
|
73 (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
|
74 |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
75 (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
|
76 (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
|
77 (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
|
78 minor-mode-alist))) |
904 | 79 |
12280
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
80 ;; 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
|
81 ;; 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
|
82 ;; 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
|
83 ;; have to change. |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
84 |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
85 (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
|
86 "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
|
87 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
|
88 \(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
|
89 (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
|
90 (list 'cond |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
91 (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
|
92 (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
|
93 (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
|
94 (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
|
95 ))) |
b33cc6583bb9
(vc-backend-dispatch): Move definition before first use.
Richard M. Stallman <rms@gnu.org>
parents:
12279
diff
changeset
|
96 |
904 | 97 ;; General customization |
98 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
99 (defgroup vc nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
100 "Version-control system in Emacs." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
101 :group 'tools) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
102 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
103 (defcustom vc-suppress-confirm nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
104 "*If non-nil, treat user as expert; suppress yes-no prompts on some things." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
105 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
106 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
107 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
108 (defcustom vc-initial-comment nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
109 "*If non-nil, prompt for initial comment when a file is registered." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
110 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
111 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
112 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
113 (defcustom vc-command-messages nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
114 "*If non-nil, display run messages from back-end commands." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
115 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
116 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
117 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
118 (defcustom vc-checkin-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
119 "*A string or list of strings specifying extra switches for checkin. |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
120 These are passed to the checkin program by \\[vc-checkin]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
121 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
122 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
123 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
124 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
125 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
126 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
127 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
128 (defcustom vc-checkout-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
129 "*A string or list of strings specifying extra switches for checkout. |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
130 These are passed to the checkout program by \\[vc-checkout]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
131 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
132 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
133 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
134 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
135 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
136 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
137 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
138 (defcustom vc-register-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
139 "*A string or list of strings; extra switches for registering a file. |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
140 These are passed to the checkin program by \\[vc-register]." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
141 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
142 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
143 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
144 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
145 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
146 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
147 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
148 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
149 "*List of directory names to be ignored while recursively walking file trees." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
150 :type '(repeat string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
151 :group 'vc) |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
152 |
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
|
153 (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
|
154 "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
|
155 |
2705
b4587e7ff4e5
(diff-switches): Define var here as well as in diff.el.
Richard M. Stallman <rms@gnu.org>
parents:
2692
diff
changeset
|
156 ;;; 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
|
157 (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
|
158 "*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
|
159 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
160 (defcustom vc-annotate-color-map |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
161 '(( 26.3672 . "#FF0000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
162 ( 52.7344 . "#FF3800") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
163 ( 79.1016 . "#FF7000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
164 (105.4688 . "#FFA800") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
165 (131.8359 . "#FFE000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
166 (158.2031 . "#E7FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
167 (184.5703 . "#AFFF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
168 (210.9375 . "#77FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
169 (237.3047 . "#3FFF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
170 (263.6719 . "#07FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
171 (290.0391 . "#00FF31") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
172 (316.4063 . "#00FF69") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
173 (342.7734 . "#00FFA1") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
174 (369.1406 . "#00FFD9") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
175 (395.5078 . "#00EEFF") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
176 (421.8750 . "#00B6FF") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
177 (448.2422 . "#007EFF")) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
178 "*Association list of age versus color, for \\[vc-annotate]. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
179 Ages are given in units of 2**-16 seconds. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
180 Default is eighteen steps using a twenty day increment." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
181 :type 'sexp |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
182 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
183 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
184 (defcustom vc-annotate-very-old-color "#0046FF" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
185 "*Color for lines older than CAR of last cons in `vc-annotate-color-map'." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
186 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
187 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
188 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
189 (defcustom vc-annotate-background "black" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
190 "*Background color for \\[vc-annotate]. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
191 Default color is used if nil." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
192 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
193 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
194 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
195 (defcustom vc-annotate-menu-elements '(2 0.5 0.1 0.01) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
196 "*Menu elements for the mode-specific menu of VC-Annotate mode. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
197 List of factors, used to expand/compress the time scale. See `vc-annotate'." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
198 :type 'sexp |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
199 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
200 |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
201 ;;;###autoload |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
202 (defcustom vc-checkin-hook nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
203 "*Normal hook (List of functions) run after a checkin is done. |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
204 See `run-hooks'." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
205 :type 'hook |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
206 :group 'vc) |
17274
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
207 |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
208 ;;;###autoload |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
209 (defcustom vc-before-checkin-hook nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
210 "*Normal hook (list of functions) run before a file gets checked in. |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
211 See `run-hooks'." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
212 :type 'hook |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
213 :group 'vc) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
214 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
215 ;;;###autoload |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
216 (defcustom vc-annotate-mode-hook nil |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
217 "*Hooks to run when VC-Annotate mode is turned on." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
218 :type 'hook |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
219 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
220 |
904 | 221 ;; Header-insertion hair |
222 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
223 (defcustom 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
|
224 '((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
|
225 "*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
|
226 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
|
227 be `RCS', `CVS', or `SCCS'. The second element is the string to |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
228 be inserted for this particular backend." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
229 :type '(repeat (list :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
230 (choice :tag "System" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
231 (const SCCS) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
232 (const RCS) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
233 (const CVS)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
234 (string :tag "Header"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
235 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
236 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
237 (defcustom vc-static-header-alist |
904 | 238 '(("\\.c$" . |
239 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) | |
240 "*Associate static header string templates with file types. A \%s in the | |
241 template is replaced with the first string associated with the file's | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
242 version-control type in `vc-header-alist'." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
243 :type '(repeat (cons :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
244 (regexp :tag "File Type") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
245 (string :tag "Header String"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
246 :group 'vc) |
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
|
247 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
248 (defcustom vc-comment-alist |
904 | 249 '((nroff-mode ".\\\"" "")) |
250 "*Special comment delimiters to be used in generating vc headers only. | |
251 Add an entry in this list if you need to override the normal comment-start | |
252 and comment-end variables. This will only be necessary if the mode language | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
253 is sensitive to blank lines." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
254 :type '(repeat (list :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
255 (symbol :tag "Mode") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
256 (string :tag "Comment Start") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
257 (string :tag "Comment End"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
258 :group 'vc) |
904 | 259 |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
260 ;; Default is to be extra careful for super-user. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
261 (defcustom vc-checkout-carefully (= (user-uid) 0) |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
262 "*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
|
263 Verify that the file really is not locked |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
264 and that its contents match what the master file says." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
265 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
266 :group 'vc) |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
267 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
268 (defcustom vc-rcs-release nil |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
269 "*The release number of your RCS installation, as a string. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
270 If nil, VC itself computes this value when it is first needed." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
271 :type '(choice (const :tag "Auto" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
272 string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
273 :group 'vc) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
274 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
275 (defcustom vc-sccs-release nil |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
276 "*The release number of your SCCS installation, as a string. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
277 If nil, VC itself computes this value when it is first needed." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
278 :type '(choice (const :tag "Auto" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
279 string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
280 :group 'vc) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
281 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
282 (defcustom 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
|
283 "*The release number of your CVS installation, as a string. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
284 If nil, VC itself computes this value when it is first needed." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
285 :type '(choice (const :tag "Auto" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
286 string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
287 :group 'vc) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
288 |
904 | 289 ;; Variables the user doesn't need to know about. |
290 (defvar vc-log-entry-mode nil) | |
291 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
292 (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
|
293 (defvar vc-checkout-writable-buffer-hook 'vc-checkout-writable-buffer) |
8350 | 294 ;; In a log entry buffer, this is a local variable |
295 ;; that points to the buffer for which it was made | |
296 ;; (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
|
297 (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
|
298 (defvar vc-parent-buffer-name nil) |
904 | 299 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
300 (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
|
301 (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
|
302 |
904 | 303 (defconst vc-name-assoc-file "VC-names") |
304 | |
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
|
305 (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
|
306 (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
|
307 |
15036
e782b987fbdb
(vc-comment-ring): Initialise using make-ring.
Richard M. Stallman <rms@gnu.org>
parents:
14855
diff
changeset
|
308 (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
|
309 (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
|
310 (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
|
311 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
312 ;; 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
|
313 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
314 (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
|
315 (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
|
316 (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
|
317 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
318 (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
|
319 (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
|
320 (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
|
321 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
322 ; 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
|
323 (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
|
324 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
325 (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
|
326 (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
|
327 (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
|
328 )) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
329 |
12897
ee3f21f562b8
(file-regular-p-18): Fix test for whether to use this.
Richard M. Stallman <rms@gnu.org>
parents:
12885
diff
changeset
|
330 (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
|
331 (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
|
332 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
333 ;;; 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
|
334 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
335 (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
|
336 ;; 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
|
337 (cond |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
338 ((eq backend 'RCS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
339 (or vc-rcs-release |
16993
6a9b49bc5161
(vc-do-command): If OKSTATUS is nil, ignore errors.
Richard M. Stallman <rms@gnu.org>
parents:
16821
diff
changeset
|
340 (and (zerop (vc-do-command nil nil "rcs" nil nil "-V")) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
341 (save-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
342 (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
|
343 (setq vc-rcs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
344 (car (vc-parse-buffer |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
345 '(("^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
|
346 (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
|
347 ((eq backend 'CVS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
348 (or vc-cvs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
349 (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
|
350 (save-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
351 (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
|
352 (setq vc-cvs-release |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
353 (car (vc-parse-buffer |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
354 '(("^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
|
355 1))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
356 (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
|
357 ((eq backend 'SCCS) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
358 vc-sccs-release))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
359 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
360 (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
|
361 ;; 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
|
362 ;; 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
|
363 ;; 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
|
364 ;; 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
|
365 ;; 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
|
366 ;; 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
|
367 ;; 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
|
368 ;; 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
|
369 ;; 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
|
370 (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
|
371 (catch 'done |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
372 (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
|
373 (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
|
374 (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
|
375 (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
|
376 (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
|
377 (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
|
378 (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
|
379 (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
|
380 (throw 'done |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
381 (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
|
382 (substring r1 i1) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
383 (substring r2 i2))))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
384 (throw 'done t))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
385 (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
|
386 (throw 'done nil)) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
387 (throw 'done t))))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
388 |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
389 (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
|
390 ;; 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
|
391 (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
|
392 (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
|
393 (cond |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
394 ((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
|
395 (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
|
396 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
397 ;;; 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
|
398 |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
399 (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
|
400 ;; 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
|
401 (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
|
402 |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
403 (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
|
404 ;; 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
|
405 (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
|
406 |
904 | 407 ;; File property caching |
408 | |
2580
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
409 (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
|
410 "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
|
411 (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
|
412 (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
|
413 ;; 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
|
414 ;; 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
|
415 (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
|
416 |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
417 (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
|
418 ;; 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
|
419 ;; 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
|
420 (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
|
421 (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
|
422 (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
|
423 (progn ;; SCCS |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
424 (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
|
425 (progn ;; RCS |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
426 (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
|
427 (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
|
428 (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
|
429 (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
|
430 (progn |
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
431 (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
|
432 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
433 (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
|
434 ;; 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
|
435 (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
|
436 (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
|
437 (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
|
438 |
904 | 439 ;; Random helper functions |
440 | |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
441 (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
|
442 ;; 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
|
443 ;; 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
|
444 (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
|
445 ;; SCCS |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
446 (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
|
447 ;; RCS |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
448 (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
|
449 (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
|
450 (progn |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
451 ;; 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
|
452 ;; 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
|
453 ;; our back. |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
454 (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
|
455 (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
|
456 workfile-version)) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
457 ;; 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
|
458 ;; 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
|
459 ;; 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
|
460 (save-excursion |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
461 (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
|
462 (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
|
463 (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
|
464 (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
|
465 "\\.[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
|
466 (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
|
467 (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
|
468 (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
|
469 ;; CVS |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
470 t)) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
471 |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
472 (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
|
473 (if file |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
474 (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
|
475 (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
|
476 |
904 | 477 (defvar vc-binary-assoc nil) |
478 | |
479 (defun vc-find-binary (name) | |
480 "Look for a command anywhere on the subprocess-command search path." | |
481 (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
|
482 (catch 'found |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
483 (mapcar |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
484 (function |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
485 (lambda (s) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
486 (if s |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
487 (let ((full (concat s "/" name))) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
488 (if (file-executable-p full) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
489 (progn |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
490 (setq vc-binary-assoc |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
491 (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
|
492 (throw 'found full))))))) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
493 exec-path) |
3544f3a41ae6
(vc-find-binary): Fix bug; it always claimed success.
Paul Eggert <eggert@twinsun.com>
parents:
4770
diff
changeset
|
494 nil))) |
904 | 495 |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
496 (defun vc-do-command (buffer okstatus command file last &rest flags) |
904 | 497 "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
|
498 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil. |
904 | 499 The command is successful if its exit status does not exceed OKSTATUS. |
16993
6a9b49bc5161
(vc-do-command): If OKSTATUS is nil, ignore errors.
Richard M. Stallman <rms@gnu.org>
parents:
16821
diff
changeset
|
500 (If OKSTATUS is nil, that means to ignore errors.) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
501 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
|
502 `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
|
503 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
|
504 (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
|
505 (if (not buffer) (setq buffer "*vc*")) |
904 | 506 (if vc-command-messages |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
507 (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
|
508 (let ((obuf (current-buffer)) (camefrom (current-buffer)) |
904 | 509 (squeezed nil) |
510 (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
|
511 (olddir default-directory) |
904 | 512 status) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
513 (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
|
514 (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
|
515 (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
|
516 (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
|
517 (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
|
518 |
904 | 519 (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
|
520 |
904 | 521 (mapcar |
522 (function (lambda (s) (and s (setq squeezed (append squeezed (list s)))))) | |
523 flags) | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
524 (if (and vc-file (eq last 'MASTER)) |
904 | 525 (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
|
526 (if (eq last 'WORKFILE) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
527 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
528 (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
|
529 (preflen (length pwd))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
530 (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
|
531 (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
|
532 (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
|
533 (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
|
534 ;; 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
|
535 (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
|
536 (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
|
537 path-separator |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
538 (mapconcat 'identity vc-path path-separator)) |
15787
d5dd4b891c3e
(vc-do-command): Bind win32-quote-process-args.
Richard M. Stallman <rms@gnu.org>
parents:
15336
diff
changeset
|
539 process-environment)) |
16590
a0cfcb9f8033
Use w32 instead of ms-windows for window-system symbol
Geoff Voelker <voelker@cs.washington.edu>
parents:
16529
diff
changeset
|
540 (w32-quote-process-args t)) |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
541 (setq status (apply 'call-process command nil t nil squeezed))) |
904 | 542 (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
|
543 (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
|
544 (forward-line -1) |
16993
6a9b49bc5161
(vc-do-command): If OKSTATUS is nil, ignore errors.
Richard M. Stallman <rms@gnu.org>
parents:
16821
diff
changeset
|
545 (if (or (not (integerp status)) (and okstatus (< okstatus status))) |
904 | 546 (progn |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
547 (pop-to-buffer buffer) |
904 | 548 (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
|
549 (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
|
550 (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
|
551 (if (integerp status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
552 (format "status %d" status) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
553 status)) |
904 | 554 ) |
555 (if vc-command-messages | |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
556 (message "Running %s...OK" command)) |
904 | 557 ) |
558 (set-buffer obuf) | |
559 status) | |
560 ) | |
561 | |
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
|
562 ;;; 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
|
563 ;;; 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
|
564 ;;; 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
|
565 ;;; 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
|
566 (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
|
567 (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
|
568 (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
|
569 (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
|
570 (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
|
571 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
572 ;;; 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
|
573 ;;; 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
|
574 (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
|
575 (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
|
576 (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
|
577 (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
|
578 (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
|
579 (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
|
580 (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
|
581 (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
|
582 (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
|
583 ;; 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
|
584 ;; 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
|
585 (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
|
586 ;; 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
|
587 ;; 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
|
588 (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
|
589 ;; 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
|
590 (- (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
|
591 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
592 (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
|
593 ;; 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
|
594 ;; 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
|
595 (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
|
596 ;; 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
|
597 (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
|
598 (vc-position-context (mark-marker)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
599 ;; 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
|
600 (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
|
601 ;; 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
|
602 (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
|
603 (let ((curbuf (current-buffer))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
604 ;; 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
|
605 ;; 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
|
606 ;; 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
|
607 (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
|
608 (mapcar (function |
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
609 (lambda (buffer) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
610 (set-buffer buffer) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
611 (let ((errors (or |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
612 compilation-old-error-list |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
613 compilation-error-list)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
614 (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
|
615 (while (and (consp errors) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
616 (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
|
617 (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
|
618 (eq buffer |
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
619 (marker-buffer |
2617
e2e5dfa162b4
(vc-revert-buffer1): Fix format of compilation-error-list.
Richard M. Stallman <rms@gnu.org>
parents:
2612
diff
changeset
|
620 (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
|
621 (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
|
622 (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
|
623 (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
|
624 (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
|
625 (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
|
626 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
627 (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
|
628 ;; 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
|
629 ;; 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
|
630 (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
|
631 (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
|
632 (reparse (nth 2 context))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
633 ;; Reparse affected compilation buffers. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
634 (while reparse |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
635 (if (car reparse) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
636 (save-excursion |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
637 (set-buffer (car reparse)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
638 (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
|
639 ;; 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
|
640 ;; 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
|
641 (error-pos (marker-position |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
642 (car (car-safe compilation-error-list))))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
643 ;; 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
|
644 (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
|
645 ;; 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
|
646 ;; 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
|
647 (while (and compilation-error-list |
2558
78a9cebdb22c
(vc-revert-buffer1): Typo fix in last change.
Roland McGrath <roland@gnu.org>
parents:
2555
diff
changeset
|
648 (/= 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
|
649 (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
|
650 (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
|
651 |
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
|
652 ;; 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
|
653 (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
|
654 (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
|
655 (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
|
656 (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
|
657 (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
|
658 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
659 (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
|
660 ;; 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
|
661 ;; 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
|
662 ;; 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
|
663 (interactive "P") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
664 (widen) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
665 (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
|
666 ;; 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
|
667 (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
|
668 (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
|
669 |
904 | 670 |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
671 (defun vc-buffer-sync (&optional not-urgent) |
904 | 672 ;; 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
|
673 ;; 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
|
674 (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
|
675 (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
|
676 (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
|
677 (save-buffer) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
678 (if not-urgent |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
679 nil |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
680 (error "Aborted"))))) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
681 |
904 | 682 |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
683 (defun vc-workfile-unchanged-p (file &optional want-differences-if-changed) |
904 | 684 ;; Has the given workfile changed since last checkout? |
685 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) | |
686 (lastmod (nth 5 (file-attributes file)))) | |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
687 (or (equal checkout-time lastmod) |
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
688 (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
|
689 (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
|
690 (not want-differences-if-changed))))) |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
691 ;; 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
|
692 (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
|
693 unchanged))))) |
904 | 694 |
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
|
695 (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
|
696 ;;; 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
|
697 (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
|
698 (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
|
699 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
|
700 (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
|
701 |
70d00ecacc0d
(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 ;; 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
|
703 ((not vc-file) |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
704 (vc-register verbose comment) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
705 (if vc-initial-comment |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
706 (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
|
707 '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
|
708 (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
|
709 |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
710 ;; 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
|
711 ;; 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
|
712 ((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
|
713 (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
|
714 (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
|
715 (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
|
716 (yes-or-no-p |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
717 (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
|
718 (buffer-name)))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
719 (progn |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
720 (if vc-dired-mode |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
721 (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
|
722 (buffer-modified-p buffer) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
723 (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
|
724 (vc-buffer-sync t)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
725 (setq buffer (current-buffer)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
726 (vc-buffer-sync t)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
727 (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
|
728 (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
|
729 (format |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
730 "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
|
731 (buffer-name buffer))))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
732 (error "Merge aborted")) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
733 (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
|
734 ;; 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
|
735 ;; 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
|
736 ;; 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
|
737 ;; message. |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
738 (message "Conflicts detected!")) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
739 (and buffer |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
740 (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
|
741 (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
|
742 |
17201
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
743 ;; If there is no lock on the file, assert one and get it. |
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
744 ;; (With implicit checkout, make sure not to lose unsaved changes.) |
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
745 ((progn (and (eq (vc-checkout-model file) 'implicit) |
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
746 (buffer-modified-p buffer) |
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
747 (vc-buffer-sync)) |
ac40292bd898
(vc-next-action-on-file): With implicit checkout, make
Richard M. Stallman <rms@gnu.org>
parents:
17135
diff
changeset
|
748 (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
|
749 (if (and vc-checkout-carefully |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
750 (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
|
751 (if (save-window-excursion |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
752 (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
|
753 (goto-char (point-min)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
754 (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
|
755 file)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
756 (not (beep)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
757 (yes-or-no-p |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
758 (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
|
759 "claim lock retaining changes? "))) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
760 (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
|
761 (vc-mode-line file)) |
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
762 (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
|
763 (error "Checkout aborted") |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
764 (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
|
765 (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
|
766 ) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
767 (if verbose |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
768 (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
|
769 (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
|
770 (read-string "Branch or version to move to: ")) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
771 (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
|
772 (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
|
773 (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
|
774 (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
|
775 "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
|
776 (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
|
777 (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
|
778 (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
|
779 (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
|
780 "" ;; 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
|
781 (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
|
782 ))) |
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
|
783 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
784 ;; 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
|
785 ((and (not (eq vc-type 'CVS)) |
16743
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
786 (not (string-equal owner (vc-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
|
787 (if comment |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
788 (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
|
789 (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
|
790 (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
|
791 (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
|
792 (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
|
793 file |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
794 (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
|
795 (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
|
796 owner)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
797 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
798 ;; 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
|
799 (t |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
800 (if vc-dired-mode |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
801 (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
|
802 (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
|
803 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
804 ;; 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
|
805 (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
|
806 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
807 ;; 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
|
808 ;; 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
|
809 ;; 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
|
810 ;; 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
|
811 ;; 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
|
812 (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
|
813 (not (buffer-modified-p))) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
814 ;; 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
|
815 (cond |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
816 ((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
|
817 (vc-backend-revert file) |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
818 (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
|
819 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
820 ;; 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
|
821 (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
|
822 (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
|
823 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
824 ;; 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
|
825 (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
|
826 ))))) |
2490
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
827 |
70d00ecacc0d
(vc-directory. vc-start-entry, vc-next-action, vc-next-action-on-file):
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2464
diff
changeset
|
828 (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
|
829 ;; 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
|
830 ;; 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
|
831 (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
|
832 (dired-buffer (current-buffer)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
833 (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
|
834 (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
|
835 (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
|
836 (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
|
837 (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
|
838 ;; 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
|
839 ;; 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
|
840 (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
|
841 (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
|
842 (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
|
843 (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
|
844 (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
|
845 (set-window-configuration configuration) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
846 (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
|
847 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
|
848 |
927 | 849 ;; Here's the major entry point. |
904 | 850 |
927 | 851 ;;;###autoload |
904 | 852 (defun vc-next-action (verbose) |
853 "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
|
854 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
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 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
|
861 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
|
862 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
863 For RCS and SCCS files: |
904 | 864 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
|
865 control and then retrieves a writable, locked copy for editing. |
904 | 866 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
|
867 a writable and locked file ready for editing. |
904 | 868 If the file is checked out and locked by the calling user, this |
869 first checks to see if the file has changed since checkout. If not, | |
870 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
|
871 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
|
872 of a log message; when the message has been entered, it checks in the |
904 | 873 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
|
874 the variable `vc-keep-workfiles' is non-nil (which is its default), a |
904 | 875 read-only copy of the changed file is left in place afterwards. |
876 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
|
877 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
|
878 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
879 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
|
880 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
|
881 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
|
882 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
|
883 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
|
884 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
|
885 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
|
886 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
|
887 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
|
888 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
|
889 |
904 | 890 (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
|
891 (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
|
892 (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
|
893 (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
|
894 (if (string= "" |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
895 (mapconcat |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
896 (function (lambda (f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
897 (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
|
898 (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
|
899 (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
|
900 "@" "") |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
901 (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
|
902 files "")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
903 (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
|
904 (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
|
905 "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
|
906 '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
|
907 (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
|
908 (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
|
909 (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
|
910 (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
|
911 (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
|
912 (vc-registration-error nil)))) |
904 | 913 |
914 ;;; These functions help the vc-next-action entry point | |
915 | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
916 (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
|
917 "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
|
918 (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
|
919 ) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
920 |
927 | 921 ;;;###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
|
922 (defun vc-register (&optional override comment) |
904 | 923 "Register the current file into your version-control system." |
924 (interactive "P") | |
12152
19ced24c2963
(vc-register): Check for a visited file first thing.
Karl Heuer <kwzh@gnu.org>
parents:
12107
diff
changeset
|
925 (or buffer-file-name |
19ced24c2963
(vc-register): Check for a visited file first thing.
Karl Heuer <kwzh@gnu.org>
parents:
12107
diff
changeset
|
926 (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
|
927 (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
|
928 (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
|
929 (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
|
930 (and master |
8aae61dee4df
(vc-register): Verify an old master file really still exists
Richard M. Stallman <rms@gnu.org>
parents:
9046
diff
changeset
|
931 (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
|
932 (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
|
933 ;; 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
|
934 ;; 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
|
935 (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
|
936 (zerop (buffer-size)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
937 (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
|
938 (set-buffer-modified-p t)) |
904 | 939 (vc-buffer-sync) |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
940 (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
|
941 ;; 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
|
942 (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
|
943 (setq backup-inhibited t))) |
904 | 944 (vc-admin |
945 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
|
946 (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
|
947 (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
|
948 (format "Initial version level for %s: " buffer-file-name)))) |
904 | 949 ) |
950 | |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
951 (defun vc-resynch-window (file &optional keep noquery) |
904 | 952 ;; If the given file is in the current buffer, |
14040 | 953 ;; either revert on it so we see expanded keywords, |
904 | 954 ;; 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
|
955 ;; 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
|
956 ;; 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
|
957 ;; between the buffer and the file is due to RCS rather than user editing! |
904 | 958 (and (string= buffer-file-name file) |
959 (if keep | |
960 (progn | |
12279
de2a82180af0
Adapt to the changes in vc-hooks.el, namely, the new
Richard M. Stallman <rms@gnu.org>
parents:
12210
diff
changeset
|
961 ;; 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
|
962 ;; 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
|
963 (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
|
964 (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
|
965 (add-hook 'find-file-hooks 'vc-find-file-hook) |
904 | 966 (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
|
967 (kill-buffer (current-buffer))))) |
904 | 968 |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
969 (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
|
970 ;; 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
|
971 (let ((buffer (get-file-buffer file))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
972 (if buffer |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
973 (save-excursion |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
974 (set-buffer buffer) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
975 (vc-resynch-window file keep noquery))))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
976 |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
977 (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
|
978 ;; 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
|
979 ;; 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
|
980 ;; 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
|
981 ;; 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
|
982 ;; 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
|
983 (let ((parent (if file (find-file-noselect file) (current-buffer)))) |
17274
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
984 (if vc-before-checkin-hook |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
985 (if file |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
986 (save-excursion |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
987 (set-buffer parent) |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
988 (run-hooks 'vc-before-checkin-hook)) |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
989 (run-hooks 'vc-before-checkin-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
|
990 (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
|
991 (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
|
992 (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
|
993 (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
|
994 (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
|
995 (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
|
996 (if file (vc-mode-line file)) |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
997 (vc-log-mode file) |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
998 (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
|
999 (if after-hook |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1000 (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
|
1001 (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
|
1002 (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
|
1003 (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
|
1004 (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
|
1005 (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
|
1006 (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
|
1007 (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
|
1008 (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
|
1009 (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
|
1010 (message "%s Type C-c C-c when done." msg)))) |
904 | 1011 |
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
|
1012 (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
|
1013 "Check a file into your version-control system. |
904 | 1014 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
|
1015 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
|
1016 (vc-start-entry file rev |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1017 (or comment (not vc-initial-comment)) |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1018 "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
|
1019 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
|
1020 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1021 (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
|
1022 "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
|
1023 ;; 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
|
1024 ;; 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
|
1025 (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
|
1026 (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
|
1027 (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
|
1028 (vc-resynch-buffer file t t)) |
904 | 1029 |
1030 (defun vc-steal-lock (file rev &optional owner) | |
1031 "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
|
1032 (let (file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1033 (if (not owner) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1034 (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
|
1035 (if rev |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1036 (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
|
1037 (setq file-description file)) |
18265
ffe9754664a2
(vc-steal-lock): Use yes-or-no-p for confirmation.
Richard M. Stallman <rms@gnu.org>
parents:
18246
diff
changeset
|
1038 (if (not (yes-or-no-p (format "Steal the lock on %s from %s? " |
ffe9754664a2
(vc-steal-lock): Use yes-or-no-p for confirmation.
Richard M. Stallman <rms@gnu.org>
parents:
18246
diff
changeset
|
1039 file-description owner))) |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1040 (error "Steal cancelled")) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1041 (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
|
1042 (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
|
1043 (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
|
1044 (mail-mode) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1045 (erase-buffer) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1046 (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
|
1047 (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
|
1048 (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
|
1049 (insert |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1050 (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
|
1051 (current-time-string) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1052 ".\n") |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1053 (message "Please explain why you stole the lock. Type C-c C-c when done."))) |
904 | 1054 |
1343
9b5cb40cb6c8
(vc-steal-lock): Use mail-setup, and do like `mail'.
Richard M. Stallman <rms@gnu.org>
parents:
1337
diff
changeset
|
1055 ;; This is called when the notification has been sent. |
904 | 1056 (defun vc-finish-steal (file version) |
1057 (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
|
1058 (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
|
1059 (save-excursion |
9046
09fb6d81f449
(vc-finish-steal): Fix typo in previous change.
Richard M. Stallman <rms@gnu.org>
parents:
9045
diff
changeset
|
1060 (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
|
1061 (vc-resynch-window file t t)))) |
904 | 1062 |
1063 (defun vc-checkin (file &optional rev comment) | |
1064 "Check in the file specified by FILE. | |
1065 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
|
1066 \(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
|
1067 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
|
1068 If the back-end is CVS, a writable workfile is always kept. |
904 | 1069 COMMENT is a comment string; if omitted, a buffer is |
1070 popped up to accept a comment." | |
6581
3a0db3b2366c
(vc-checkin): Undo previous change.
Richard M. Stallman <rms@gnu.org>
parents:
6563
diff
changeset
|
1071 (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
|
1072 "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
|
1073 'vc-checkin-hook)) |
904 | 1074 |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
1075 ;;; 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
|
1076 ;;; 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
|
1077 (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
|
1078 "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
|
1079 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
|
1080 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
|
1081 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
|
1082 (interactive (if current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
1083 (list current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
1084 (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
|
1085 ;; 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
|
1086 ;; before binding it. |
49029e28ed2c
(vc-comment-to-change-log): Load add-log before binding
Karl Heuer <kwzh@gnu.org>
parents:
5732
diff
changeset
|
1087 (require 'add-log) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1088 (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
|
1089 (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
|
1090 ;; 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
|
1091 (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
|
1092 end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1093 ;; 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
|
1094 (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
|
1095 ;; 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
|
1096 (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
|
1097 (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
|
1098 ;; 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
|
1099 ;; 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
|
1100 (delete-char -2)) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1101 ;; 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
|
1102 (just-one-space) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1103 ;; 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
|
1104 (let ((indentation (current-indentation))) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1105 (save-excursion |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1106 (while (< (point) end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1107 (forward-line 1) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1108 (indent-to indentation)) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1109 (setq end (point)))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1110 ;; 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
|
1111 (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
|
1112 (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
|
1113 (beginning-of-line) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1114 (fill-region (point) end)) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1115 ;; 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
|
1116 ;; 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
|
1117 (skip-syntax-forward " " end) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1118 (delete-char (- (skip-syntax-backward " "))) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1119 (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
|
1120 (insert "\n")))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1121 |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
1122 |
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
|
1123 (defun vc-finish-logentry (&optional nocomment) |
904 | 1124 "Complete the operation implied by the current log entry." |
1125 (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
|
1126 ;; 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
|
1127 (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
|
1128 (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
|
1129 (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
|
1130 (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
|
1131 (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
|
1132 ;; 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
|
1133 (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
|
1134 ;; 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
|
1135 (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
|
1136 )) |
5428
e66b058ec9f6
(vc-finish-logentry): Sync the buffer in case the user modified it while
Paul Eggert <eggert@twinsun.com>
parents:
5338
diff
changeset
|
1137 ;; 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
|
1138 ;; 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
|
1139 (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
|
1140 (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
|
1141 (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
|
1142 (vc-buffer-sync))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1143 (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
|
1144 ;; 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
|
1145 (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
|
1146 (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
|
1147 (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
|
1148 (log-entry (buffer-string)) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1149 (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
|
1150 ;; 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
|
1151 (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
|
1152 (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
|
1153 (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
|
1154 (kill-buffer logbuf)) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1155 ;; 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
|
1156 (save-excursion |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1157 (funcall log-operation |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1158 log-file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1159 log-version |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1160 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
|
1161 ;; 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
|
1162 (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
|
1163 (vc-resynch-window buffer-file-name vc-keep-workfiles t)) |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
1164 (run-hooks after-hook 'vc-finish-logentry-hook))) |
904 | 1165 |
1166 ;; Code for access to the comment ring | |
1167 | |
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
|
1168 (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
|
1169 "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
|
1170 (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
|
1171 (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
|
1172 (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
|
1173 (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
|
1174 (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
|
1175 (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
|
1176 (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
|
1177 ;; 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
|
1178 ;; 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
|
1179 ;; 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
|
1180 (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
|
1181 (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
|
1182 (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
|
1183 (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
|
1184 (setq vc-comment-ring-index |
4509
aeef9d07f78d
(vc-previous-comment): Use `mod', not `ring-mod'.
Paul Eggert <eggert@twinsun.com>
parents:
4480
diff
changeset
|
1185 (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
|
1186 (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
|
1187 (insert (ring-ref vc-comment-ring vc-comment-ring-index)))))) |
904 | 1188 |
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
|
1189 (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
|
1190 "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
|
1191 (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
|
1192 (vc-previous-comment (- arg))) |
904 | 1193 |
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
|
1194 (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
|
1195 "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
|
1196 (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
|
1197 (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
|
1198 (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
|
1199 (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
|
1200 (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
|
1201 (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
|
1202 (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
|
1203 (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
|
1204 (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
|
1205 (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
|
1206 (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
|
1207 (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
|
1208 (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
|
1209 (t (error "Not found"))))) |
904 | 1210 |
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
|
1211 (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
|
1212 "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
|
1213 (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
|
1214 (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
|
1215 (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
|
1216 (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
|
1217 (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
|
1218 (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
|
1219 (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
|
1220 (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
|
1221 (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
|
1222 (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
|
1223 (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
|
1224 (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
|
1225 (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
|
1226 (t (error "Not found"))))) |
904 | 1227 |
1228 ;; Additional entry points for examining version histories | |
1229 | |
927 | 1230 ;;;###autoload |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1231 (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
|
1232 "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
|
1233 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
|
1234 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
|
1235 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
|
1236 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
|
1237 (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
|
1238 (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
|
1239 (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
|
1240 (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
|
1241 (pop-to-buffer vc-parent-buffer)) |
904 | 1242 (if historic |
1243 (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
|
1244 (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
|
1245 (error |
208145c77950
* vc.el (vc-diff, vc-directory-18): Add missing paren to end of
Jim Blandy <jimb@redhat.com>
parents:
4362
diff
changeset
|
1246 "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
|
1247 (let ((file buffer-file-name) |
904 | 1248 unchanged) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1249 (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
|
1250 (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
|
1251 (vc-buffer-sync not-urgent) |
904 | 1252 (setq unchanged (vc-workfile-unchanged-p buffer-file-name)) |
1253 (if unchanged | |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1254 (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
|
1255 (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
|
1256 ;; 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
|
1257 ;; 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
|
1258 ;; 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
|
1259 ;; 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
|
1260 ;; 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
|
1261 ;; 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
|
1262 ;; 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
|
1263 (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
|
1264 (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
|
1265 (if (= 0 (buffer-size)) |
0710180efd8b
(vc-diff): If `diff' gives empty output, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
3804
diff
changeset
|
1266 (progn |
0710180efd8b
(vc-diff): If `diff' gives empty output, return nil.
Richard M. Stallman <rms@gnu.org>
parents:
3804
diff
changeset
|
1267 (setq unchanged t) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1268 (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
|
1269 (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
|
1270 (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
|
1271 (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
|
1272 (not unchanged)))) |
904 | 1273 |
1274 (defun vc-version-diff (file rel1 rel2) | |
1275 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | |
1276 If FILE is a directory, generate diffs between versions for all registered | |
1277 files in or below it." | |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1278 (interactive "FFile or directory to diff: \nsOlder version: \nsNewer version: ") |
904 | 1279 (if (string-equal rel1 "") (setq rel1 nil)) |
1280 (if (string-equal rel2 "") (setq rel2 nil)) | |
1281 (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
|
1282 (let ((camefrom (current-buffer))) |
904 | 1283 (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
|
1284 (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
|
1285 (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
|
1286 (concat " from " (buffer-name camefrom))) |
904 | 1287 (erase-buffer) |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1288 (insert "Diffs between " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1289 (or rel1 "last version checked in") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1290 " and " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1291 (or rel2 "current workfile(s)") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1292 ":\n\n") |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
1293 (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
|
1294 (cd file) |
904 | 1295 (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
|
1296 default-directory |
904 | 1297 (function (lambda (f) |
2219
a729b16f7427
(vc-version-diff): Use (message ...), not (message (format ...)).
Paul Eggert <eggert@twinsun.com>
parents:
2212
diff
changeset
|
1298 (message "Looking at %s" f) |
904 | 1299 (and |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1300 (not (file-directory-p f)) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1301 (vc-registered f) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1302 (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
|
1303 (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
|
1304 ))) |
904 | 1305 (pop-to-buffer "*vc-status*") |
1306 (insert "\nEnd of diffs.\n") | |
1307 (goto-char (point-min)) | |
1308 (set-buffer-modified-p nil) | |
1309 ) | |
2769
209f745babd1
(vc-version-diff): Don't move point in current buffer.
Richard M. Stallman <rms@gnu.org>
parents:
2760
diff
changeset
|
1310 (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
|
1311 (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
|
1312 (pop-to-buffer "*vc-diff*")))) |
904 | 1313 |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1314 ;;;###autoload |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1315 (defun vc-version-other-window (rev) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1316 "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
|
1317 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
|
1318 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
|
1319 (interactive "sVersion to visit (default is latest version): ") |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1320 (if vc-dired-mode |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1321 (set-buffer (find-file-noselect (dired-get-filename)))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1322 (while vc-parent-buffer |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1323 (pop-to-buffer vc-parent-buffer)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1324 (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
|
1325 (let* ((version (if (string-equal rev "") |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1326 (vc-latest-version buffer-file-name) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1327 rev)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1328 (filename (concat buffer-file-name ".~" version "~"))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1329 (or (file-exists-p filename) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1330 (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
|
1331 (find-file-other-window filename)) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1332 (vc-registration-error buffer-file-name))) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1333 |
904 | 1334 ;; Header-insertion code |
1335 | |
927 | 1336 ;;;###autoload |
904 | 1337 (defun vc-insert-headers () |
1338 "Insert headers in a file for use with your version-control system. | |
1339 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
|
1340 the variable `vc-header-alist'." |
904 | 1341 (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
|
1342 (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
|
1343 (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
|
1344 (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
|
1345 (pop-to-buffer vc-parent-buffer)) |
904 | 1346 (save-excursion |
1347 (save-restriction | |
1348 (widen) | |
1349 (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
|
1350 (y-or-n-p "Version headers already exist. Insert another set? ")) |
904 | 1351 (progn |
1352 (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
1353 (comment-start-vc (or (car delims) comment-start "#")) | |
1354 (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
|
1355 (hdstrings (cdr (assoc (vc-backend (buffer-file-name)) vc-header-alist)))) |
904 | 1356 (mapcar (function (lambda (s) |
1357 (insert comment-start-vc "\t" s "\t" | |
1358 comment-end-vc "\n"))) | |
1359 hdstrings) | |
1360 (if vc-static-header-alist | |
1361 (mapcar (function (lambda (f) | |
1362 (if (string-match (car f) buffer-file-name) | |
1363 (insert (format (cdr f) (car hdstrings)))))) | |
1364 vc-static-header-alist)) | |
1365 ) | |
1366 ))))) | |
1367 | |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1368 (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
|
1369 ;; 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
|
1370 ;; 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
|
1371 ;; 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
|
1372 (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
|
1373 (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
|
1374 (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
|
1375 (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
|
1376 (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
|
1377 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1378 ;; 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
|
1379 ;; 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
|
1380 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1381 (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
|
1382 "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
|
1383 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
|
1384 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
|
1385 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
|
1386 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
|
1387 (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
|
1388 |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1389 (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
|
1390 (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
|
1391 (define-key vc-dired-mode-map "=" 'vc-diff) |
904 | 1392 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1393 (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
|
1394 ;; 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
|
1395 ;; 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
|
1396 (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
|
1397 (vc-cvs-status file)))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1398 (if cvs-state |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1399 (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
|
1400 ((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
|
1401 ((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
|
1402 ((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
|
1403 ((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
|
1404 ((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
|
1405 (vc-locking-user file)))) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1406 |
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
|
1407 (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
|
1408 ;; 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
|
1409 ;; 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
|
1410 ;; 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
|
1411 ;; 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
|
1412 ;; 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
|
1413 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1414 ;; 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
|
1415 ;; (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
|
1416 ;; |
a66f7ed76416
(vc-diff): Get proper error message when you run this with no prefix
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2558
diff
changeset
|
1417 ;; 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
|
1418 (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
|
1419 (end-of-line) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1420 (setq limit (point)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1421 (goto-char pos) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1422 (cond |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1423 ((or |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1424 (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
|
1425 "\\([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
|
1426 limit t) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1427 (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
|
1428 "\\([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
|
1429 limit t)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1430 (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
|
1431 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
|
1432 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
|
1433 ((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
|
1434 "\\([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
|
1435 limit t) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1436 (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
|
1437 date-and-file (match-string 2)))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1438 (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
|
1439 (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
|
1440 (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
|
1441 |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1442 (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
|
1443 ;; 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
|
1444 ;; 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
|
1445 ;; 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
|
1446 ;; subdirectories. |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1447 (beginning-of-line) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1448 (forward-char 2) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1449 (let ((start (point))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1450 (forward-line 1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1451 (beginning-of-line) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1452 (delete-region start (point)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1453 (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
|
1454 (forward-line -1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1455 (end-of-line) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1456 (delete-char (- (length file))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1457 (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
|
1458 (goto-char start)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1459 (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
|
1460 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1461 (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
|
1462 (interactive "P") |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1463 (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
|
1464 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1465 ;;; 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
|
1466 ;;; with the symbol 'vc-directory-18. See below. |
927 | 1467 ;;;###autoload |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1468 (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
|
1469 "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
|
1470 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
|
1471 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
|
1472 (interactive "DDired under VC (directory): \nP") |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1473 (require 'dired) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1474 (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
|
1475 ;; 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
|
1476 (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
|
1477 (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
|
1478 (let (nonempty |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1479 (dl (length dirname)) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1480 (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
|
1481 (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
|
1482 dired-buf |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1483 dired-buf-mod-count) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1484 (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
|
1485 dirname |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1486 (function |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1487 (lambda (f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1488 (if (vc-registered f) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1489 (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
|
1490 (and (or verbose state) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1491 (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
|
1492 (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
|
1493 (save-window-excursion |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1494 (save-excursion |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1495 ;; 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
|
1496 ;; 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
|
1497 (setq dired-buf |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1498 (dired-internal-noselect |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1499 (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
|
1500 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
|
1501 (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
|
1502 (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
|
1503 ;; 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
|
1504 (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
|
1505 (goto-char (point-min)) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1506 (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
|
1507 (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
|
1508 (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
|
1509 (delete-region start (point))) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1510 (beginning-of-line) |
904 | 1511 (if nonempty |
1512 (progn | |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1513 ;; 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
|
1514 (mapcar |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1515 (function |
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1516 (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
|
1517 (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
|
1518 (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
|
1519 (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
|
1520 (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
|
1521 (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
|
1522 (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
|
1523 (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
|
1524 ) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1525 (dired-next-line 1) |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1526 (insert " ") |
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1527 (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
|
1528 (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
|
1529 (if verbose "registered" "locked") dirname)) |
904 | 1530 )) |
1531 | |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1532 ;; Emacs 18 version |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1533 (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
|
1534 "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
|
1535 (interactive "P") |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1536 (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
|
1537 (save-excursion |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1538 (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
|
1539 (erase-buffer) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1540 (cd dir) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1541 (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
|
1542 default-directory |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1543 (function (lambda (f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1544 (if (vc-registered f) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1545 (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
|
1546 (if (or user verbose) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1547 (insert (format |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1548 "%s %s\n" |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1549 (concat user) f)))))))) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1550 (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
|
1551 |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1552 (if nonempty |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1553 (progn |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1554 (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
|
1555 (goto-char (point-min)) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1556 (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
|
1557 (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
|
1558 (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
|
1559 ) |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1560 |
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
1561 (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
|
1562 (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
|
1563 |
904 | 1564 ;; Named-configuration support for SCCS |
1565 | |
1566 (defun vc-add-triple (name file rev) | |
1567 (save-excursion | |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1568 (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
|
1569 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1570 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1571 (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
|
1572 (file-name-directory file))))) |
904 | 1573 (goto-char (point-max)) |
1574 (insert name "\t:\t" file "\t" rev "\n") | |
1575 (basic-save-buffer) | |
1576 (kill-buffer (current-buffer)) | |
1577 )) | |
1578 | |
1579 (defun vc-record-rename (file newname) | |
1580 (save-excursion | |
12311
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1581 (find-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1582 (expand-file-name |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1583 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1584 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1585 (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
|
1586 (file-name-directory file))))) |
904 | 1587 (goto-char (point-min)) |
5263
f12548cb6e0b
(vc-record-rename): Don't use replace-regexp.
Richard M. Stallman <rms@gnu.org>
parents:
5212
diff
changeset
|
1588 ;; (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
|
1589 (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
|
1590 (replace-match (concat ":" newname) nil nil)) |
904 | 1591 (basic-save-buffer) |
1592 (kill-buffer (current-buffer)) | |
1593 )) | |
1594 | |
1595 (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
|
1596 ;; 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
|
1597 ;; 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
|
1598 (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
|
1599 ((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
|
1600 (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
|
1601 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
|
1602 (t |
12281
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1603 (save-excursion |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1604 (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
|
1605 (vc-insert-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1606 (expand-file-name |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1607 vc-name-assoc-file |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1608 (file-name-as-directory |
d33ef5819d81
(vc-register): Inhibit backups for the file's buffer
Richard M. Stallman <rms@gnu.org>
parents:
12281
diff
changeset
|
1609 (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
|
1610 (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
|
1611 (prog1 |
ba3d2da14bca
(vc-lookup-triple): changed the code that used to call
Richard M. Stallman <rms@gnu.org>
parents:
12280
diff
changeset
|
1612 (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
|
1613 (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
|
1614 (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
|
1615 )) |
904 | 1616 |
1617 ;; Named-configuration entry points | |
1618 | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1619 (defun vc-snapshot-precondition () |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1620 ;; Scan the tree below the current directory. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1621 ;; 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
|
1622 ;; (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
|
1623 ;; 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
|
1624 ;; Otherwise, return nil. |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1625 (let ((status nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1626 (catch 'vc-locked-example |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1627 (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
|
1628 default-directory |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1629 (function (lambda (f) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1630 (and (vc-registered f) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1631 (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
|
1632 (if (get-file-buffer f) (setq status 'visited))))))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1633 status))) |
904 | 1634 |
927 | 1635 ;;;###autoload |
904 | 1636 (defun vc-create-snapshot (name) |
1637 "Make a snapshot called NAME. | |
1638 The snapshot is made from all registered files at or below the current | |
1639 directory. For each file, the version level of its latest | |
1640 version becomes part of the named configuration." | |
1641 (interactive "sNew snapshot name: ") | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1642 (let ((result (vc-snapshot-precondition))) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1643 (if (stringp result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1644 (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
|
1645 (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
|
1646 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
|
1647 (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
|
1648 (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
|
1649 (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
|
1650 ))) |
904 | 1651 |
927 | 1652 ;;;###autoload |
904 | 1653 (defun vc-retrieve-snapshot (name) |
1654 "Retrieve the snapshot called NAME. | |
1655 This function fails if any files are locked at or below the current directory | |
1656 Otherwise, all registered files are checked out (unlocked) at their version | |
1657 levels in the snapshot." | |
1658 (interactive "sSnapshot name to retrieve: ") | |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1659 (let ((result (vc-snapshot-precondition)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1660 (update nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1661 (if (stringp result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1662 (error "File %s is locked" result) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1663 (if (eq result 'visited) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1664 (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
|
1665 (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
|
1666 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
|
1667 (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
|
1668 (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
|
1669 (vc-error-occurred |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1670 (vc-backend-checkout f nil name) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1671 (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
|
1672 ))) |
904 | 1673 |
1674 ;; Miscellaneous other entry points | |
1675 | |
927 | 1676 ;;;###autoload |
904 | 1677 (defun vc-print-log () |
1678 "List the change log of the current buffer in a window." | |
1679 (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
|
1680 (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
|
1681 (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
|
1682 (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
|
1683 (pop-to-buffer vc-parent-buffer)) |
904 | 1684 (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
|
1685 (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
|
1686 (vc-backend-print-log file) |
904 | 1687 (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
|
1688 (setq default-directory (file-name-directory file)) |
16215
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1689 (goto-char (point-max)) (forward-line -1) |
4770
987685f55edd
(vc-do-command): Remove debugging output. Use (forward-line -1) instead
Brian Fox <bfox@gnu.org>
parents:
4725
diff
changeset
|
1690 (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
|
1691 (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
|
1692 (forward-line -1)) |
904 | 1693 (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
|
1694 (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
|
1695 (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
|
1696 (shrink-window-if-larger-than-buffer) |
16138
852c9735c076
(vc-print-log): Move point to the log entry of the current version.
André Spiegel <spiegel@gnu.org>
parents:
16033
diff
changeset
|
1697 ;; move point to the log entry for the current version |
16215
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1698 (and (not (eq (vc-backend file) 'SCCS)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1699 (re-search-forward |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1700 ;; also match some context, for safety |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1701 (concat "----\nrevision " (vc-workfile-version file) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1702 "\\(\tlocked by:.*\n\\|\n\\)date: ") nil t) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1703 ;; set the display window so that |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1704 ;; the whole log entry is displayed |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1705 (let (start end lines) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1706 (beginning-of-line) (forward-line -1) (setq start (point)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1707 (if (not (re-search-forward "^----*\nrevision" nil t)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1708 (setq end (point-max)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1709 (beginning-of-line) (forward-line -1) (setq end (point))) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1710 (setq lines (count-lines start end)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1711 (cond |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1712 ;; if the global information and this log entry fit |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1713 ;; into the window, display from the beginning |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1714 ((< (count-lines (point-min) end) (window-height)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1715 (goto-char (point-min)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1716 (recenter 0) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1717 (goto-char start)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1718 ;; if the whole entry fits into the window, |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1719 ;; display it centered |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1720 ((< (1+ lines) (window-height)) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1721 (goto-char start) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1722 (recenter (1- (- (/ (window-height) 2) (/ lines 2))))) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1723 ;; otherwise (the entry is too large for the window), |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1724 ;; display from the start |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1725 (t |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1726 (goto-char start) |
2c91cd1a660a
(vc-print-log): Set the display window so that it shows
André Spiegel <spiegel@gnu.org>
parents:
16138
diff
changeset
|
1727 (recenter 0))))) |
904 | 1728 ) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
1729 (vc-registration-error buffer-file-name) |
904 | 1730 ) |
1731 ) | |
1732 | |
927 | 1733 ;;;###autoload |
904 | 1734 (defun vc-revert-buffer () |
952 | 1735 "Revert the current buffer's file back to the latest checked-in version. |
1736 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
|
1737 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
|
1738 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
|
1739 the file on the branch you are editing." |
904 | 1740 (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
|
1741 (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
|
1742 (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
|
1743 (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
|
1744 (pop-to-buffer vc-parent-buffer)) |
904 | 1745 (let ((file buffer-file-name) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1746 ;; This operation should always ask for confirmation. |
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1747 (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
|
1748 (obuf (current-buffer)) (changed (vc-diff nil t))) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
1749 (if (and changed (not (yes-or-no-p "Discard changes? "))) |
904 | 1750 (progn |
12806
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1751 (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
|
1752 (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
|
1753 (make-frame-invisible (selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1754 (delete-window)) |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
1755 (error "Revert cancelled")) |
904 | 1756 (set-buffer obuf)) |
1757 (if changed | |
12806
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1758 (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
|
1759 (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
|
1760 (make-frame-invisible (selected-frame)) |
826ee893ebdf
(vc-revert-buffer): In a dedicated solitary window,
Richard M. Stallman <rms@gnu.org>
parents:
12714
diff
changeset
|
1761 (delete-window))) |
904 | 1762 (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
|
1763 (vc-resynch-window file t t) |
904 | 1764 ) |
1765 ) | |
1766 | |
927 | 1767 ;;;###autoload |
904 | 1768 (defun vc-cancel-version (norevert) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1769 "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
|
1770 A prefix argument means do not revert the buffer afterwards." |
904 | 1771 (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
|
1772 (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
|
1773 (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
|
1774 (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
|
1775 (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
|
1776 (cond |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1777 ((not (vc-registered (buffer-file-name))) |
15336
8d23d63f1eee
(vc-cancel-version): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
15227
diff
changeset
|
1778 (vc-registration-error (buffer-file-name))) |
8d23d63f1eee
(vc-cancel-version): Fix paren error.
Richard M. Stallman <rms@gnu.org>
parents:
15227
diff
changeset
|
1779 ((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
|
1780 (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
|
1781 ((vc-locking-user (buffer-file-name)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1782 (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
|
1783 ((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
|
1784 (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
|
1785 (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
|
1786 (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
|
1787 (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
|
1788 (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
|
1789 nil |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1790 (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
|
1791 (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
|
1792 (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
|
1793 ;; 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
|
1794 ;; 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
|
1795 ;; 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
|
1796 (while (not done) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1797 (condition-case err |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1798 (progn |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1799 (if norevert |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1800 ;; 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
|
1801 ;; modifications in the buffer. |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1802 (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
|
1803 ;; 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
|
1804 (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
|
1805 (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
|
1806 ;; 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
|
1807 ;; 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
|
1808 ;; 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
|
1809 (error (set-buffer "*vc*") |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1810 (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
|
1811 (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
|
1812 (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
|
1813 ;; 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
|
1814 ;; 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
|
1815 ;; 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
|
1816 (set-window-configuration config)) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1817 ;; 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
|
1818 (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
|
1819 ;; 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
|
1820 (if norevert |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1821 (progn |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1822 (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
|
1823 (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
|
1824 ;; 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
|
1825 (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
|
1826 (setq backup-inhibited t))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1827 (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
|
1828 (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
|
1829 (vc-clear-headers))) |
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
1830 (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
|
1831 (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
|
1832 ))) |
904 | 1833 |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1834 ;;;###autoload |
904 | 1835 (defun vc-rename-file (old new) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
1836 "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
|
1837 (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
|
1838 ;; 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
|
1839 ;; 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
|
1840 ;; 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
|
1841 ;; 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
|
1842 ;; 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
|
1843 ;; 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
|
1844 (if (eq (vc-backend old) 'CVS) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
1845 (error "Renaming files under CVS is dangerous and not supported in VC")) |
904 | 1846 (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
|
1847 (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
|
1848 (error "Please save files before moving them")) |
904 | 1849 (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
|
1850 (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
|
1851 (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
|
1852 (error "New file already exists")) |
904 | 1853 (let ((oldmaster (vc-name old))) |
1854 (if oldmaster | |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1855 (progn |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1856 (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
|
1857 (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
|
1858 (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
|
1859 ;; 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
|
1860 (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
|
1861 (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
|
1862 (rename-file |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1863 oldmaster |
11605
36b1eb58d0c9
(vc-next-action-on-file): Add missing let-binding.
Karl Heuer <kwzh@gnu.org>
parents:
11597
diff
changeset
|
1864 (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
|
1865 (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
|
1866 (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
|
1867 (catch 'found |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1868 (mapcar |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1869 (function |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1870 (lambda (s) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1871 (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
|
1872 (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
|
1873 (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
|
1874 (if (or (not newmasterdir) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1875 (file-directory-p newmasterdir)) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1876 (throw 'found newmaster)))))) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1877 vc-master-templates) |
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
1878 (error "New file lacks a version control directory")))))) |
904 | 1879 (if (or (not oldmaster) (file-exists-p old)) |
1880 (rename-file old new))) | |
1881 ; ?? Renaming a file might change its contents due to keyword expansion. | |
1882 ; We should really check out a new copy if the old copy was precisely equal | |
1883 ; to some checked in version. However, testing for this is tricky.... | |
1884 (if oldbuf | |
1885 (save-excursion | |
1886 (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
|
1887 (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
|
1888 (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
|
1889 (vc-backend new) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
1890 (vc-mode-line new) |
904 | 1891 (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
|
1892 ;; 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
|
1893 (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
|
1894 (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
|
1895 nil ;RCS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1896 nil ;CVS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
1897 ) |
904 | 1898 ) |
1899 | |
927 | 1900 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1901 (defun vc-update-change-log (&rest args) |
15977
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1902 "Find change log file and add entries from recent RCS/CVS logs. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1903 Normally, find log entries for all registered files in the default |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1904 directory using `rcs2log', which finds CVS logs preferentially. |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1905 The mark is left at the end of the text prepended to the change log. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1906 |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
1907 With prefix arg of C-u, only find log entries for the current buffer's file. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1908 |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1909 With any numeric prefix arg, find log entries for all currently visited |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1910 files that are under version control. This puts all the entries in the |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1911 log for the default directory, which may not be appropriate. |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
1912 |
15977
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1913 From a program, any arguments are assumed to be filenames and are |
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1914 passed to the `rcs2log' script after massaging to be relative to the |
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1915 default directory." |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1916 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1917 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1918 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1919 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1920 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1921 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1922 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1923 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1924 (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
|
1925 (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
|
1926 (setq files (cons file files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
1927 (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
|
1928 files)) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
1929 (t |
15977
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1930 ;; `rcs2log' will find the relevant RCS or CVS files |
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1931 ;; relative to the curent directory if none supplied. |
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
1932 nil))) |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
1933 (let ((odefault default-directory) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1934 (changelog (find-change-log)) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1935 ;; Presumably not portable to non-Unixy systems, along with rcs2log: |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1936 (tempfile (make-temp-name |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1937 (concat (file-name-as-directory |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1938 (directory-file-name (or (getenv "TMPDIR") |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1939 (getenv "TMP") |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1940 (getenv "TEMP") |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1941 "/tmp"))) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1942 "vc"))) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1943 (full-name (or add-log-full-name |
16743
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
1944 (user-full-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
1945 (user-login-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
1946 (format "uid%d" (number-to-string (user-uid))))) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
1947 (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
|
1948 user-mail-address))) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1949 (find-file-other-window changelog) |
3905
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1950 (barf-if-buffer-read-only) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1951 (vc-buffer-sync) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1952 (undo-boundary) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1953 (goto-char (point-min)) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1954 (push-mark) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
1955 (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
|
1956 (message "Computing change log entries... %s" |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1957 (unwind-protect |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1958 (progn |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1959 (cd odefault) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1960 (if (eq 0 (apply 'call-process "rcs2log" nil |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1961 (list t tempfile) nil |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1962 "-c" changelog |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1963 "-u" (concat (vc-user-login-name) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1964 "\t" full-name |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1965 "\t" mailing-address) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1966 (mapcar |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1967 (function |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1968 (lambda (f) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1969 (file-relative-name |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1970 (if (file-name-absolute-p f) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1971 f |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1972 (concat odefault f))))) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1973 args))) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1974 "done" |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1975 (pop-to-buffer |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1976 (set-buffer (get-buffer-create "*vc*"))) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1977 (erase-buffer) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1978 (insert-file tempfile) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1979 "failed")) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1980 (cd (file-name-directory changelog)) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
1981 (delete-file tempfile))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1982 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1983 ;; vc-annotate functionality (CVS only). |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1984 (defvar vc-annotate-mode nil |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1985 "Variable indicating if VC-Annotate mode is active.") |
904 | 1986 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1987 (defvar vc-annotate-mode-map nil |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1988 "Local keymap used for VC-Annotate mode.") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1989 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1990 (defvar vc-annotate-mode-menu nil |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1991 "Local keymap used for VC-Annotate mode's menu bar menu.") |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1992 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1993 ;; Syntax Table |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1994 (defvar vc-annotate-mode-syntax-table nil |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1995 "Syntax table used in VC-Annotate mode buffers.") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
1996 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1997 ;; Declare globally instead of additional parameter to |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1998 ;; temp-buffer-show-function (not possible to pass more than one |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
1999 ;; parameter). |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2000 (defvar vc-annotate-ratio nil) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2001 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2002 (defun vc-annotate-mode-variables () |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2003 (if (not vc-annotate-mode-syntax-table) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2004 (progn (setq vc-annotate-mode-syntax-table (make-syntax-table)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2005 (set-syntax-table vc-annotate-mode-syntax-table))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2006 (if (not vc-annotate-mode-map) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2007 (setq vc-annotate-mode-map (make-sparse-keymap))) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2008 (setq vc-annotate-mode-menu (make-sparse-keymap "Annotate")) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2009 (define-key vc-annotate-mode-map [menu-bar] |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2010 (make-sparse-keymap "VC-Annotate")) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2011 (define-key vc-annotate-mode-map [menu-bar vc-annotate-mode] |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2012 (cons "VC-Annotate" vc-annotate-mode-menu))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2013 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2014 (defun vc-annotate-mode () |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2015 "Major mode for buffers displaying output from the CVS `annotate' command. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2016 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2017 You can use the mode-specific menu to alter the time-span of the used |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2018 colors. See variable `vc-annotate-menu-elements' for customizing the |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2019 menu items." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2020 (interactive) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2021 (kill-all-local-variables) ; Recommended by RMS. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2022 (vc-annotate-mode-variables) ; This defines various variables. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2023 (use-local-map vc-annotate-mode-map) ; This provides the local keymap. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2024 (set-syntax-table vc-annotate-mode-syntax-table) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2025 (setq major-mode 'vc-annotate-mode) ; This is how `describe-mode' |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2026 ; finds out what to describe. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2027 (setq mode-name "Annotate") ; This goes into the mode line. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2028 (run-hooks 'vc-annotate-mode-hook) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2029 (vc-annotate-add-menu)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2030 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2031 (defun vc-annotate-display-default (&optional event) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2032 "Use the default color spectrum for VC Annotate mode." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2033 (interactive) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2034 (message "Redisplaying annotation...") |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2035 (vc-annotate-display (get-buffer (buffer-name))) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2036 (message "Redisplaying annotation...done")) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2037 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2038 (defun vc-annotate-add-menu () |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2039 "Adds the menu 'Annotate' to the menu bar in VC-Annotate mode." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2040 (define-key vc-annotate-mode-menu [default] |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2041 '("Default" . vc-annotate-display-default)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2042 (let ((menu-elements vc-annotate-menu-elements)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2043 (while menu-elements |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2044 (let* ((element (car menu-elements)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2045 (days (round (* element |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2046 (vc-annotate-car-last-cons vc-annotate-color-map) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2047 0.7585)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2048 (setq menu-elements (cdr menu-elements)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2049 (define-key vc-annotate-mode-menu |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2050 (vector days) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2051 (cons (format "Span %d days" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2052 days) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2053 `(lambda () |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2054 ,(format "Use colors spanning %d days" days) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2055 (interactive) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2056 (message "Redisplaying annotation...") |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2057 (vc-annotate-display |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2058 (get-buffer (buffer-name)) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2059 (vc-annotate-time-span vc-annotate-color-map ,element)) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2060 (message "Redisplaying annotation...done")))))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2061 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2062 ;;;###autoload |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2063 (defun vc-annotate (ratio) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2064 "Display the result of the CVS `annotate' command using colors. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2065 New lines are displayed in red, old in blue. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2066 A prefix argument specifies a factor for stretching the time scale. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2067 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2068 `vc-annotate-menu-elements' customizes the menu elements of the |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2069 mode-specific menu. `vc-annotate-color-map' and |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2070 `vc-annotate-very-old-color' defines the mapping of time to |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2071 colors. `vc-annotate-background' specifies the background color." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2072 (interactive "p") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2073 (if (not (eq (vc-buffer-backend) 'CVS)) ; This only works with CVS |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2074 (vc-registration-error (buffer-file-name))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2075 (message "Annotating...") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2076 (let ((temp-buffer-name (concat "*cvs annotate " (buffer-name) "*")) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2077 (temp-buffer-show-function 'vc-annotate-display) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2078 (vc-annotate-ratio ratio)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2079 (with-output-to-temp-buffer temp-buffer-name |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2080 (call-process "cvs" nil (get-buffer temp-buffer-name) nil |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2081 "annotate" (file-name-nondirectory (buffer-file-name))))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2082 (message "Annotating... done")) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2083 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2084 (defun vc-annotate-car-last-cons (assoc-list) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2085 "Return car of last cons in ASSOC-LIST." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2086 (if (not (eq nil (cdr assoc-list))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2087 (vc-annotate-car-last-cons (cdr assoc-list)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2088 (car (car assoc-list)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2089 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2090 ;; Return an association list with span factor applied to the |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2091 ;; time-span of assoc-list. Optionaly quantize to the factor of |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2092 ;; quantize. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2093 (defun vc-annotate-time-span (assoc-list span &optional quantize) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2094 ;; Apply span to each car of every cons |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2095 (if (not (eq nil assoc-list)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2096 (append (list (cons (* (car (car assoc-list)) span) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2097 (cdr (car assoc-list)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2098 (vc-annotate-time-span (nthcdr (cond (quantize) ; optional |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2099 (1)) ; Default to cdr |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2100 assoc-list) span quantize)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2101 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2102 (defun vc-annotate-compcar (threshold &rest args) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2103 "Test successive cars of ARGS against THRESHOLD. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2104 Return the first cons which CAR is not less than THRESHOLD, nil otherwise" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2105 ;; If no list is exhausted, |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2106 (if (and (not (memq 'nil args)) (< (car (car (car args))) threshold)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2107 ;; apply to CARs. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2108 (apply 'vc-annotate-compcar threshold |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2109 ;; Recurse for rest of elements. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2110 (mapcar 'cdr args)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2111 ;; Return the proper result |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2112 (car (car args)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2113 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2114 (defun vc-annotate-display (buffer &optional color-map) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2115 "Do the VC-Annotate display in BUFFER using COLOR-MAP." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2116 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2117 ;; Handle the case of the global variable vc-annotate-ratio being |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2118 ;; set. This variable is used to pass information from function |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2119 ;; vc-annotate since it is not possible to use another parameter |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2120 ;; (see temp-buffer-show-function). |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2121 (if (and (not color-map) vc-annotate-ratio) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2122 ;; This will only be true if called from vc-annotate with ratio |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2123 ;; being non-nil. |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2124 (setq color-map (vc-annotate-time-span vc-annotate-color-map |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2125 vc-annotate-ratio))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2126 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2127 ;; We need a list of months and their corresponding numbers. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2128 (let* ((local-month-numbers |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2129 '(("Jan" . 1) ("Feb" . 2) ("Mar" . 3) ("Apr" . 4) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2130 ("May" . 5) ("Jun" . 6) ("Jul" . 7) ("Aug" . 8) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2131 ("Sep" . 9) ("Oct" . 10) ("Nov" . 11) ("Dec" . 12))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2132 ;; XEmacs use extents, GNU Emacs overlays. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2133 (overlay-or-extent (if (string-match "XEmacs" emacs-version) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2134 (cons 'make-extent 'set-extent-property) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2135 (cons 'make-overlay 'overlay-put))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2136 (make-overlay-or-extent (car overlay-or-extent)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2137 (set-property-overlay-or-extent (cdr overlay-or-extent))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2138 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2139 (set-buffer buffer) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2140 (display-buffer buffer) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2141 (if (not vc-annotate-mode) ; Turn on vc-annotate-mode if not done |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2142 (vc-annotate-mode)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2143 (goto-char (point-min)) ; Position at the top of the buffer. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2144 (while (re-search-forward |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2145 "^[0-9]+\\(\.[0-9]+\\)*\\s-+(\\sw+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): " |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2146 nil t) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2147 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2148 (let* (;; Unfortunately, order is important. match-string will |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2149 ;; be corrupted by extent functions in XEmacs. Access |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2150 ;; string-matches first. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2151 (day (string-to-number (match-string 2))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2152 (month (cdr (assoc (match-string 3) local-month-numbers))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2153 (year-tmp (string-to-number (match-string 4))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2154 (year (+ (if (> 100 year-tmp) 1900 0) year-tmp)) ; Possible millenium problem |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2155 (high (- (car (current-time)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2156 (car (encode-time 0 0 0 day month year)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2157 (color (cond ((vc-annotate-compcar high (cond (color-map) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2158 (vc-annotate-color-map)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2159 ((cons nil vc-annotate-very-old-color)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2160 ;; substring from index 1 to remove any leading `#' in the name |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2161 (face-name (concat "vc-annotate-face-" (substring (cdr color) 1))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2162 ;; Make the face if not done. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2163 (face (cond ((intern-soft face-name)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2164 ((make-face (intern face-name))))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2165 (point (point)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2166 (foo (forward-line 1)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2167 (overlay (cond ((if (string-match "XEmacs" emacs-version) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2168 (extent-at point) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2169 (car (overlays-at point )))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2170 ((apply make-overlay-or-extent point (point) nil))))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2171 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2172 (if vc-annotate-background |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2173 (set-face-background face vc-annotate-background)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2174 (set-face-foreground face (cdr color)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2175 (apply set-property-overlay-or-extent overlay |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2176 'face face nil))))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2177 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2178 ;; Collect back-end-dependent stuff here |
904 | 2179 |
2180 (defun vc-backend-admin (file &optional rev comment) | |
2181 ;; Register a file into the version-control system | |
2182 ;; Automatically retrieves a read-only version of the file with | |
2183 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
2184 ;; it deletes the workfile. | |
2185 (vc-file-clearprops file) | |
2186 (or vc-default-back-end | |
2187 (setq vc-default-back-end (if (vc-find-binary "rcs") 'RCS 'SCCS))) | |
2188 (message "Registering %s..." file) | |
16033
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2189 (let ((switches |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2190 (if (stringp vc-register-switches) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2191 (list vc-register-switches) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2192 vc-register-switches)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2193 (backend |
904 | 2194 (cond |
2195 ((file-exists-p (vc-backend-subdirectory-name)) vc-default-back-end) | |
2196 ((file-exists-p "RCS") 'RCS) | |
2197 ((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
|
2198 ((file-exists-p "CVS") 'CVS) |
904 | 2199 (t vc-default-back-end)))) |
2200 (cond ((eq backend 'SCCS) | |
17911
058196d8908e
(vc-backend-admin): If there is no SCCS subdirectory yet, create it.
André Spiegel <spiegel@gnu.org>
parents:
17672
diff
changeset
|
2201 ;; If there is no SCCS subdirectory yet, create it. |
058196d8908e
(vc-backend-admin): If there is no SCCS subdirectory yet, create it.
André Spiegel <spiegel@gnu.org>
parents:
17672
diff
changeset
|
2202 ;; (SCCS could do without it, but VC requires it to be there.) |
058196d8908e
(vc-backend-admin): If there is no SCCS subdirectory yet, create it.
André Spiegel <spiegel@gnu.org>
parents:
17672
diff
changeset
|
2203 (if (not (file-exists-p "SCCS")) (make-directory "SCCS")) |
16033
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2204 (apply 'vc-do-command nil 0 "admin" file 'MASTER ;; SCCS |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2205 (and rev (concat "-r" rev)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2206 "-fb" |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2207 (concat "-i" file) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2208 (and comment (concat "-y" comment)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2209 (format |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2210 (car (rassq 'SCCS vc-master-templates)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2211 (or (file-name-directory file) "") |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2212 (file-name-nondirectory file)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2213 switches) |
904 | 2214 (delete-file file) |
2215 (if vc-keep-workfiles | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2216 (vc-do-command nil 0 "get" file 'MASTER))) |
904 | 2217 ((eq backend 'RCS) |
16033
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2218 (apply 'vc-do-command nil 0 "ci" file 'WORKFILE ;; RCS |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2219 ;; if available, use the secure registering option |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2220 (and (vc-backend-release-p 'RCS "5.6.4") "-i") |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2221 (concat (if vc-keep-workfiles "-u" "-r") rev) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2222 (and comment (concat "-t-" comment)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2223 switches)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2224 ((eq backend 'CVS) |
16033
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2225 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE ;; CVS |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2226 "add" |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2227 (and comment (string-match "[^\t\n ]" comment) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2228 (concat "-m" comment)) |
244188795475
(vc-register-switches): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
15989
diff
changeset
|
2229 switches) |
904 | 2230 ))) |
2231 (message "Registering %s...done" file) | |
2232 ) | |
2233 | |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2234 (defun vc-backend-checkout (file &optional writable rev workfile) |
904 | 2235 ;; 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
|
2236 (let ((filename (or workfile file)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
2237 (file-buffer (get-file-buffer file)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2238 switches) |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2239 (message "Checking out %s..." filename) |
10046
4c632e091d88
(vc-backend-checkout): Finish last change.
Roland McGrath <roland@gnu.org>
parents:
10045
diff
changeset
|
2240 (save-excursion |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2241 ;; 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
|
2242 (if file-buffer (set-buffer file-buffer)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2243 (setq switches (if (stringp vc-checkout-switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2244 (list vc-checkout-switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2245 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
|
2246 ;; 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
|
2247 ;; 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
|
2248 ;; 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
|
2249 (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
|
2250 (save-excursion |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2251 ;; 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
|
2252 ;; 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
|
2253 (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
|
2254 (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
|
2255 (progn ;; SCCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2256 (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
|
2257 (if workfile |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2258 ;; 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
|
2259 ;; 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
|
2260 ;; 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
|
2261 ;; ala RCS. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2262 (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
|
2263 (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
|
2264 (failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2265 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2266 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2267 (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
|
2268 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
|
2269 ;; 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
|
2270 ;; 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
|
2271 ;; 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
|
2272 ;; 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
|
2273 (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
|
2274 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
|
2275 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
|
2276 (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
|
2277 (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
|
2278 "" ; 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
|
2279 filename |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2280 (if writable "-e") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2281 "-p" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2282 (and rev |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2283 (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
|
2284 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2285 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2286 (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
|
2287 (delete-file filename)))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2288 (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
|
2289 (if writable "-e") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2290 (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
|
2291 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2292 (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
|
2293 (if workfile ;; RCS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2294 ;; 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
|
2295 ;; 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
|
2296 (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
|
2297 (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
|
2298 (failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2299 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2300 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2301 (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
|
2302 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
|
2303 ;; 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
|
2304 ;; if-statement. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2305 (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
|
2306 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
|
2307 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
|
2308 (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
|
2309 (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
|
2310 "" ; 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
|
2311 filename |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2312 (if writable "-l") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2313 (concat "-p" rev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2314 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2315 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2316 (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
|
2317 (let (new-version) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2318 ;; 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
|
2319 ;; 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
|
2320 (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
|
2321 (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
|
2322 ;; 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
|
2323 (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
|
2324 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
|
2325 ;; 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
|
2326 ;; the writable workfile. |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2327 (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
|
2328 (if writable "-l") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2329 (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
|
2330 ;; 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
|
2331 ;; 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
|
2332 (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
|
2333 (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
|
2334 nil))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2335 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2336 ;; 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
|
2337 (save-excursion |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2338 (set-buffer "*vc*") |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2339 (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
|
2340 (setq new-version |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2341 (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
|
2342 (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
|
2343 (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
|
2344 ;; 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
|
2345 (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
|
2346 (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
|
2347 (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
|
2348 (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
|
2349 (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
|
2350 new-version)))))) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2351 (if workfile ;; CVS |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2352 ;; 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
|
2353 (let ((failed t)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2354 (unwind-protect |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2355 (progn |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2356 (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
|
2357 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
|
2358 "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
|
2359 "" ; 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
|
2360 workfile |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2361 (concat "-r" rev) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2362 "-p" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2363 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2364 (setq failed nil)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2365 (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
|
2366 ;; 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
|
2367 ;; 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
|
2368 (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
|
2369 (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
|
2370 ;; 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
|
2371 (if rev |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2372 (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
|
2373 (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
|
2374 "update" |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2375 (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
|
2376 (concat "-r" rev)) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2377 switches) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2378 ;; 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
|
2379 (and writable |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2380 (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
|
2381 (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
|
2382 (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
|
2383 (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
|
2384 (cond |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2385 ((not workfile) |
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2386 (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
|
2387 (if writable |
16743
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2388 (vc-file-setprop file 'vc-locking-user (vc-user-login-name))) |
14297
ac17ae608afe
* vc.el (vc-backend-checkout): Use let to restore default-directory.
Karl Heuer <kwzh@gnu.org>
parents:
14169
diff
changeset
|
2389 (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
|
2390 '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
|
2391 (message "Checking out %s...done" filename)))))) |
904 | 2392 |
2393 (defun vc-backend-logentry-check (file) | |
2394 (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
|
2395 (if (>= (buffer-size) 512) ;; SCCS |
904 | 2396 (progn |
2397 (goto-char 512) | |
2398 (error | |
3804
d7d674c99039
(vc-rename-file): Remove periods from error messages.
Richard M. Stallman <rms@gnu.org>
parents:
3671
diff
changeset
|
2399 "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
|
2400 nil ;; RCS |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2401 nil) ;; CVS |
904 | 2402 ) |
2403 | |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2404 (defun vc-backend-checkin (file rev comment) |
904 | 2405 ;; Register changes to FILE as level REV with explanatory COMMENT. |
2406 ;; Automatically retrieves a read-only version of the file with | |
2407 ;; keywords expanded if vc-keep-workfiles is non-nil, otherwise | |
2408 ;; it deletes the workfile. | |
14040 | 2409 ;; 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
|
2410 ;; 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
|
2411 ;; accordingly. |
904 | 2412 (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
|
2413 ;; "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
|
2414 ;; 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
|
2415 (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
|
2416 (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
|
2417 (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
|
2418 ;; 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
|
2419 (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
|
2420 (let ((switches |
13890
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2421 (if (stringp vc-checkin-switches) |
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2422 (list vc-checkin-switches) |
6e14467a9a9e
(vc-backend-checkin): Use vc-checkin-switches.
Erik Naggum <erik@naggum.no>
parents:
13858
diff
changeset
|
2423 vc-checkin-switches))) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2424 ;; 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
|
2425 ;; 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
|
2426 ;; re-computed before the next try. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2427 (vc-file-clear-masterprops file) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2428 (vc-backend-dispatch file |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2429 ;; SCCS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2430 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2431 (apply 'vc-do-command nil 0 "delta" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2432 (if rev (concat "-r" rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2433 (concat "-y" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2434 switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2435 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2436 (vc-file-setprop file 'vc-workfile-version nil) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2437 (if vc-keep-workfiles |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2438 (vc-do-command nil 0 "get" file 'MASTER)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2439 ) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2440 ;; RCS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2441 (let ((old-version (vc-workfile-version file)) new-version) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2442 (apply 'vc-do-command nil 0 "ci" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2443 ;; if available, use the secure check-in option |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2444 (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
|
2445 (concat (if vc-keep-workfiles "-u" "-r") rev) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2446 (concat "-m" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2447 switches) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2448 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2449 (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
|
2450 |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2451 ;; determine the new workfile version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2452 (set-buffer "*vc*") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2453 (goto-char (point-min)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2454 (if (or (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2455 "new revision: \\([0-9.]+\\);" nil t) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2456 (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2457 "reverting to previous revision \\([0-9.]+\\)" nil t)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2458 (progn (setq new-version (buffer-substring (match-beginning 1) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2459 (match-end 1))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2460 (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
|
2461 |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2462 ;; 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
|
2463 ;; branch accordingly |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2464 (cond |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2465 ((and old-version new-version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2466 (not (string= (vc-branch-part old-version) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2467 (vc-branch-part new-version)))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2468 (vc-do-command nil 0 "rcs" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2469 (if (vc-trunk-p new-version) "-b" |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2470 (concat "-b" (vc-branch-part new-version)))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2471 ;; 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
|
2472 ;; to remove a remaining lock. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2473 (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
|
2474 ;; exit status of 1 is also accepted. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2475 ;; It means that the lock was removed before. |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2476 (vc-do-command nil 1 "rcs" file 'MASTER |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2477 (concat "-u" old-version)))))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2478 ;; CVS |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2479 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2480 ;; explicit check-in to the trunk requires a |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2481 ;; double check-in (first unexplicit) (CVS-1.3) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2482 (condition-case nil |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2483 (progn |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2484 (if (and rev (vc-trunk-p rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2485 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2486 "ci" "-m" "intermediate" |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2487 switches)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2488 (apply 'vc-do-command nil 0 "cvs" file 'WORKFILE |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2489 "ci" (if rev (concat "-r" rev)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2490 (concat "-m" comment) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2491 switches)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2492 (error (if (eq (vc-cvs-status file) 'needs-merge) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2493 ;; 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
|
2494 (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
|
2495 (error "Check-in failed")))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2496 ;; determine and store the new workfile version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2497 (set-buffer "*vc*") |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2498 (goto-char (point-min)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2499 (if (re-search-forward |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2500 "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" nil t) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2501 (vc-file-setprop file 'vc-workfile-version |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2502 (buffer-substring (match-beginning 2) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2503 (match-end 2))) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2504 (vc-file-setprop file 'vc-workfile-version nil)) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2505 ;; 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
|
2506 (if rev |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2507 (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
|
2508 (vc-file-setprop file 'vc-locking-user 'none) |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2509 (vc-file-setprop file 'vc-checkout-time |
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2510 (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
|
2511 (message "Checking in %s...done" file)) |
904 | 2512 |
2513 (defun vc-backend-revert (file) | |
2514 ;; 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
|
2515 ;; (for RCS, to workfile version) |
904 | 2516 (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
|
2517 (vc-file-clear-masterprops file) |
904 | 2518 (vc-backend-dispatch |
2519 file | |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2520 ;; SCCS |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2521 (progn |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2522 (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
|
2523 (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
|
2524 ;; RCS |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2525 (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
|
2526 "-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
|
2527 ;; CVS |
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2528 (progn |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2529 (delete-file file) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2530 (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
|
2531 (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
|
2532 (vc-file-setprop file 'vc-checkout-time (nth 5 (file-attributes file))) |
904 | 2533 (message "Reverting %s...done" file) |
2534 ) | |
2535 | |
2536 (defun vc-backend-steal (file &optional rev) | |
2537 ;; Steal the lock on the current workfile. Needs RCS 5.6.2 or later for -M. | |
2538 (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
|
2539 (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
|
2540 (progn ;SCCS |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2541 (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
|
2542 (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
|
2543 ) |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2544 (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
|
2545 "-M" (concat "-u" rev) (concat "-l" rev)) |
13852
5f5659a29e3a
Fix error message style.
Richard M. Stallman <rms@gnu.org>
parents:
13536
diff
changeset
|
2546 (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
|
2547 ) |
16743
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2548 (vc-file-setprop file 'vc-locking-user (vc-user-login-name)) |
904 | 2549 (message "Stealing lock on %s...done" file) |
2550 ) | |
2551 | |
2552 (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
|
2553 ;; Undo the latest checkin. |
904 | 2554 (message "Removing last change from %s..." file) |
2555 (vc-backend-dispatch file | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2556 (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
|
2557 (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
|
2558 nil ;; this is never reached under CVS |
904 | 2559 ) |
2560 (message "Removing last change from %s...done" file) | |
2561 ) | |
2562 | |
2563 (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
|
2564 ;; 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
|
2565 (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
|
2566 file |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2567 (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
|
2568 (vc-do-command nil 0 "rlog" file 'MASTER) |
16529
5e1ecf96072f
(vc-backend-print-log): Use "cvs log" to get log entries, not "cvs rlog".
Richard M. Stallman <rms@gnu.org>
parents:
16447
diff
changeset
|
2569 (vc-do-command nil 0 "cvs" file 'WORKFILE "log"))) |
904 | 2570 |
2571 (defun vc-backend-assign-name (file name) | |
2572 ;; Assign to a FILE's latest version a given NAME. | |
2573 (vc-backend-dispatch file | |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2574 (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
|
2575 (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
|
2576 (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
|
2577 ) |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
2578 ) |
904 | 2579 |
5212
f8ba69b02832
(vc-workfile-unchanged-p): Add optional argument
Paul Eggert <eggert@twinsun.com>
parents:
5209
diff
changeset
|
2580 (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
|
2581 ;; 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
|
2582 ;; Get only a brief comparison report if CMP, a difference report otherwise. |
17135
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2583 (let ((backend (vc-backend file)) options status |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2584 (diff-switches-list (if (listp diff-switches) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2585 diff-switches |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2586 (list diff-switches)))) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2587 (cond |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2588 ((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
|
2589 (setq oldvers (vc-lookup-triple file oldvers)) |
17135
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2590 (setq newvers (vc-lookup-triple file newvers)) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2591 (setq options (append (list (and cmp "--brief") "-q" |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2592 (and oldvers (concat "-r" oldvers)) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2593 (and newvers (concat "-r" newvers))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2594 (and (not cmp) diff-switches-list))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2595 (apply 'vc-do-command "*vc-diff*" 1 "vcdiff" file 'MASTER options)) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2596 ((eq backend 'RCS) |
13379
45188809385d
(vc-backend-diff): Use new variable vc-rcsdiff-knows-brief.
André Spiegel <spiegel@gnu.org>
parents:
13111
diff
changeset
|
2597 (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
|
2598 ;; If we know that --brief is not supported, don't try it. |
17135
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2599 (setq cmp (and cmp (not (eq vc-rcsdiff-knows-brief 'no)))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2600 (setq options (append (list (and cmp "--brief") "-q" |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2601 (concat "-r" oldvers) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2602 (and newvers (concat "-r" newvers))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2603 (and (not cmp) diff-switches-list))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2604 (setq status (apply 'vc-do-command "*vc-diff*" 2 |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2605 "rcsdiff" file 'WORKFILE options)) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2606 ;; If --brief didn't work, do a double-take and remember it |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2607 ;; for the future. |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2608 (if (eq status 2) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2609 (prog1 |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2610 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file 'WORKFILE |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2611 (if cmp (cdr options) options)) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2612 (if cmp (setq vc-rcsdiff-knows-brief 'no))) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2613 ;; If --brief DID work, remember that, too. |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2614 (and cmp (not vc-rcsdiff-knows-brief) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2615 (setq vc-rcsdiff-knows-brief 'yes)) |
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2616 status)) |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2617 ;; 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
|
2618 ((eq backend 'CVS) |
17135
1814adcc2648
(vc-backend-diff): Handle RCS and SCCS separately.
André Spiegel <spiegel@gnu.org>
parents:
17101
diff
changeset
|
2619 (if (string= (vc-workfile-version file) "0") |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2620 ;; 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
|
2621 (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
|
2622 (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
|
2623 (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
|
2624 ;; 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
|
2625 ;; 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
|
2626 (apply 'vc-do-command |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2627 "*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
|
2628 (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
|
2629 diff-switches |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2630 (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
|
2631 ;; 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
|
2632 (apply 'vc-do-command |
12589
9aaf593a2be2
(vc-do-command): Added parameter BUFFER (the default,
Richard M. Stallman <rms@gnu.org>
parents:
12566
diff
changeset
|
2633 "*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
|
2634 (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
|
2635 (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
|
2636 (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
|
2637 diff-switches |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2638 (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
|
2639 (t |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2640 (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
|
2641 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2642 (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
|
2643 ;; 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
|
2644 (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
|
2645 (prog1 |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2646 (vc-backend-dispatch |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2647 file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2648 (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
|
2649 (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
|
2650 (save-excursion ; CVS |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2651 (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
|
2652 (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
|
2653 (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
|
2654 (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
|
2655 ;; 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
|
2656 ;; 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
|
2657 ;; 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
|
2658 (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
|
2659 (goto-char (point-min)) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2660 (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
|
2661 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
|
2662 0 ;; no conflict detected |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2663 ))) |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
2664 (message "Merging changes into %s...done" file))) |
904 | 2665 |
2666 (defun vc-check-headers () | |
2667 "Check if the current file has any headers in it." | |
2668 (interactive) | |
2669 (save-excursion | |
2670 (goto-char (point-min)) | |
2671 (vc-backend-dispatch buffer-file-name | |
2672 (re-search-forward "%[MIRLBSDHTEGUYFPQCZWA]%" nil t) ;; SCCS | |
2673 (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
|
2674 'RCS ;; CVS works like RCS in this regard. |
904 | 2675 ) |
2676 )) | |
2677 | |
2678 ;; Back-end-dependent stuff ends here. | |
2679 | |
2680 ;; Set up key bindings for use while editing log messages | |
2681 | |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
2682 (defun vc-log-mode (&optional file) |
904 | 2683 "Minor mode for driving version-control tools. |
2684 These bindings are added to the global keymap when you enter this mode: | |
2685 \\[vc-next-action] perform next logical version-control operation on current file | |
2686 \\[vc-register] register current file | |
2687 \\[vc-toggle-read-only] like next-action, but won't register files | |
2688 \\[vc-insert-headers] insert version-control headers in current file | |
2689 \\[vc-print-log] display change history of current file | |
2690 \\[vc-revert-buffer] revert buffer to latest version | |
2691 \\[vc-cancel-version] undo latest checkin | |
2692 \\[vc-diff] show diffs between file versions | |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2693 \\[vc-version-other-window] visit old version in another window |
904 | 2694 \\[vc-directory] show all files locked by any user in or below . |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2695 \\[vc-annotate] colorful display of the cvs annotate command |
904 | 2696 \\[vc-update-change-log] add change log entry from recent checkins |
2697 | |
2698 While you are entering a change log message for a version, the following | |
2699 additional bindings will be in effect. | |
2700 | |
2701 \\[vc-finish-logentry] proceed with check in, ending log message entry | |
2702 | |
2703 Whenever you do a checkin, your log comment is added to a ring of | |
2704 saved comments. These can be recalled as follows: | |
2705 | |
2706 \\[vc-next-comment] replace region with next message in comment ring | |
2707 \\[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
|
2708 \\[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
|
2709 \\[vc-comment-search-forward] search backward for regexp in the comment ring |
904 | 2710 |
2711 Entry to the change-log submode calls the value of text-mode-hook, then | |
2712 the value of vc-log-mode-hook. | |
2713 | |
2714 Global user options: | |
2715 vc-initial-comment If non-nil, require user to enter a change | |
2716 comment upon first checkin of the file. | |
2717 | |
2718 vc-keep-workfiles Non-nil value prevents workfiles from being | |
2719 deleted when changes are checked in | |
2720 | |
2721 vc-suppress-confirm Suppresses some confirmation prompts, | |
2722 notably for reversions. | |
2723 | |
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
|
2724 vc-header-alist Which keywords to insert when adding headers |
904 | 2725 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
|
2726 '(\"\%\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
|
2727 RCS and CVS. |
904 | 2728 |
2729 vc-static-header-alist By default, version headers inserted in C files | |
2730 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
|
2731 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
|
2732 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
|
2733 this by setting this variable to nil, or change |
904 | 2734 the header template by changing it. |
2735 | |
2736 vc-command-messages if non-nil, display run messages from the | |
2737 actual version-control utilities (this is | |
2738 intended primarily for people hacking vc | |
2739 itself). | |
2740 " | |
2741 (interactive) | |
2742 (set-syntax-table text-mode-syntax-table) | |
2743 (use-local-map vc-log-entry-mode) | |
2744 (setq local-abbrev-table text-mode-abbrev-table) | |
2745 (setq major-mode 'vc-log-mode) | |
2746 (setq mode-name "VC-Log") | |
2747 (make-local-variable 'vc-log-file) | |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
2748 (setq vc-log-file file) |
904 | 2749 (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
|
2750 (make-local-variable 'vc-comment-ring-index) |
904 | 2751 (set-buffer-modified-p nil) |
2752 (setq buffer-file-name nil) | |
2753 (run-hooks 'text-mode-hook 'vc-log-mode-hook) | |
2754 ) | |
2755 | |
2756 ;; Initialization code, to be done just once at load-time | |
2757 (if vc-log-entry-mode | |
2758 nil | |
2759 (setq vc-log-entry-mode (make-sparse-keymap)) | |
2760 (define-key vc-log-entry-mode "\M-n" 'vc-next-comment) | |
2761 (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
|
2762 (define-key vc-log-entry-mode "\M-r" 'vc-comment-search-reverse) |
904 | 2763 (define-key vc-log-entry-mode "\M-s" 'vc-comment-search-forward) |
2764 (define-key vc-log-entry-mode "\C-c\C-c" 'vc-finish-logentry) | |
2765 ) | |
2766 | |
2767 ;;; These things should probably be generally available | |
2768 | |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2769 (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
|
2770 "Walk recursively through DIRNAME. |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2771 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
|
2772 (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
|
2773 (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
|
2774 |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2775 (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
|
2776 (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
|
2777 (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
|
2778 (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
|
2779 (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
|
2780 (mapcar |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2781 (function |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2782 (lambda (f) (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2783 (string-equal f ".") |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2784 (string-equal f "..") |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
2785 (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
|
2786 (let ((dirf (concat dir f))) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2787 (or |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2788 (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
|
2789 (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
|
2790 (directory-files dir))))) |
904 | 2791 |
2792 (provide 'vc) | |
2793 | |
2794 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE | |
2795 ;;; | |
2796 ;;; 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
|
2797 ;;; (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
|
2798 ;;; 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
|
2799 ;;; and RCS keyword lookup. AS, 1995/03/24) |
904 | 2800 ;;; |
2801 ;;; A fundamental problem in VC is that there are time windows between | |
2802 ;;; vc-next-action's computations of the file's version-control state and | |
2803 ;;; the actions that change it. This is a window open to lossage in a | |
2804 ;;; multi-user environment; someone else could nip in and change the state | |
2805 ;;; of the master during it. | |
2806 ;;; | |
2807 ;;; The performance problem is that rlog/prs calls are very expensive; we want | |
2808 ;;; to avoid them as much as possible. | |
2809 ;;; | |
2810 ;;; ANALYSIS: | |
2811 ;;; | |
2812 ;;; The performance problem, it turns out, simplifies in practice to the | |
2813 ;;; problem of making vc-locking-user fast. The two other functions that call | |
2814 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one | |
2815 ;;; makes snapshots, the other deletes the calling user's last change in the | |
2816 ;;; master. | |
2817 ;;; | |
2818 ;;; The race condition implies that we have to either (a) lock the master | |
2819 ;;; during the entire execution of vc-next-action, or (b) detect and | |
2820 ;;; recover from errors resulting from dispatch on an out-of-date state. | |
2821 ;;; | |
14040 | 2822 ;;; Alternative (a) appears to be infeasible. The problem is that we can't |
904 | 2823 ;;; guarantee that the lock will ever be removed. Suppose a user starts a |
2824 ;;; checkin, the change message buffer pops up, and the user, having wandered | |
2825 ;;; off to do something else, simply forgets about it? | |
2826 ;;; | |
2827 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up | |
2828 ;;; vc-locking-user. Usually, if a file is registered, we can read its locked/ | |
2829 ;;; unlocked state and its current owner from its permissions. | |
2830 ;;; | |
2831 ;;; This shortcut will fail if someone has manually changed the workfile's | |
2832 ;;; permissions; also if developers are munging the workfile in several | |
2833 ;;; directories, with symlinks to a master (in this latter case, the | |
2834 ;;; permissions shortcut will fail to detect a lock asserted from another | |
2835 ;;; directory). | |
2836 ;;; | |
2837 ;;; Note that these cases correspond exactly to the errors which could happen | |
2838 ;;; because of a competing checkin/checkout race in between two instances of | |
2839 ;;; vc-next-action. | |
2840 ;;; | |
2841 ;;; For VC's purposes, a workfile/master pair may have the following states: | |
2842 ;;; | |
2843 ;;; A. Unregistered. There is a workfile, there is no master. | |
2844 ;;; | |
2845 ;;; B. Registered and not locked by anyone. | |
2846 ;;; | |
2847 ;;; C. Locked by calling user and unchanged. | |
2848 ;;; | |
2849 ;;; D. Locked by the calling user and changed. | |
2850 ;;; | |
2851 ;;; E. Locked by someone other than the calling user. | |
2852 ;;; | |
2853 ;;; This makes for 25 states and 20 error conditions. Here's the matrix: | |
2854 ;;; | |
2855 ;;; VC's idea of state | |
2856 ;;; | | |
2857 ;;; V Actual state RCS action SCCS action Effect | |
2858 ;;; A B C D E | |
2859 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
2860 ;;; B 5 . 6 7 8 co -l get -e checkout | |
2861 ;;; C 9 10 . 11 12 co -u unget; get revert | |
2862 ;;; 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
|
2863 ;;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock |
904 | 2864 ;;; |
2865 ;;; All commands take the master file name as a last argument (not shown). | |
2866 ;;; | |
2867 ;;; In the discussion below, a "self-race" is a pathological situation in | |
2868 ;;; which VC operations are being attempted simultaneously by two or more | |
2869 ;;; Emacsen running under the same username. | |
2870 ;;; | |
2871 ;;; The vc-next-action code has the following windows: | |
2872 ;;; | |
2873 ;;; Window P: | |
2874 ;;; Between the check for existence of a master file and the call to | |
2875 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
2876 ;;; never close if the initial-comment feature is on. | |
2877 ;;; | |
2878 ;;; Window Q: | |
2879 ;;; Between the call to vc-workfile-unchanged-p in and the immediately | |
2880 ;;; following revert (apparent state C). | |
2881 ;;; | |
2882 ;;; Window R: | |
2883 ;;; Between the call to vc-workfile-unchanged-p in and the following | |
2884 ;;; checkin (apparent state D). This window may never close. | |
2885 ;;; | |
2886 ;;; Window S: | |
2887 ;;; Between the unlock and the immediately following checkout during a | |
2888 ;;; revert operation (apparent state C). Included in window Q. | |
2889 ;;; | |
2890 ;;; Window T: | |
2891 ;;; Between vc-locking-user and the following checkout (apparent state B). | |
2892 ;;; | |
2893 ;;; Window U: | |
2894 ;;; Between vc-locking-user and the following revert (apparent state C). | |
2895 ;;; Includes windows Q and S. | |
2896 ;;; | |
2897 ;;; Window V: | |
2898 ;;; Between vc-locking-user and the following checkin (apparent state | |
2899 ;;; D). This window may never be closed if the user fails to complete the | |
2900 ;;; checkin message. Includes window R. | |
2901 ;;; | |
2902 ;;; Window W: | |
2903 ;;; 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
|
2904 ;;; state E). This window may never close if the user fails to complete |
904 | 2905 ;;; the steal-lock message. Includes window X. |
2906 ;;; | |
2907 ;;; Window X: | |
2908 ;;; Between the unlock and the immediately following re-lock during a | |
2909 ;;; steal-lock operation (apparent state E). This window may never cloce | |
2910 ;;; if the user fails to complete the steal-lock message. | |
2911 ;;; | |
2912 ;;; Errors: | |
2913 ;;; | |
2914 ;;; Apparent state A --- | |
2915 ;;; | |
2916 ;;; 1. File looked unregistered but is actually registered and not locked. | |
2917 ;;; | |
2918 ;;; Potential cause: someone else's admin during window P, with | |
2919 ;;; caller's admin happening before their checkout. | |
2920 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2921 ;;; 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
|
2922 ;;; "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
|
2923 ;;; ci -i option and the message is "<file>,v: already exists". |
904 | 2924 ;;; SCCS: admin will fail with error (ad19). |
2925 ;;; | |
2926 ;;; We can let these errors be passed up to the user. | |
2927 ;;; | |
2928 ;;; 2. File looked unregistered but is actually locked by caller, unchanged. | |
2929 ;;; | |
2930 ;;; Potential cause: self-race during window P. | |
2931 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2932 ;;; 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
|
2933 ;;; 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
|
2934 ;;; ci -i option, failing with message "<file>,v: already exists". |
904 | 2935 ;;; SCCS: will fail with error (ad19). |
2936 ;;; | |
2937 ;;; Either of these consequences is acceptable. | |
2938 ;;; | |
2939 ;;; 3. File looked unregistered but is actually locked by caller, changed. | |
2940 ;;; | |
2941 ;;; Potential cause: self-race during window P. | |
2942 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2943 ;;; 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
|
2944 ;;; 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
|
2945 ;;; 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
|
2946 ;;; failing with message "<file>,v: already exists". |
904 | 2947 ;;; SCCS: will fail with error (ad19). |
2948 ;;; | |
2949 ;;; 4. File looked unregistered but is locked by someone else. | |
2950 ;;; | |
2951 ;;; Potential cause: someone else's admin during window P, with | |
2952 ;;; caller's admin happening *after* their checkout. | |
2953 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2954 ;;; 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
|
2955 ;;; "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
|
2956 ;;; 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
|
2957 ;;; "<file>,v: already exists". |
904 | 2958 ;;; SCCS: will fail with error (ad19). |
2959 ;;; | |
2960 ;;; We can let these errors be passed up to the user. | |
2961 ;;; | |
2962 ;;; Apparent state B --- | |
2963 ;;; | |
2964 ;;; 5. File looked registered and not locked, but is actually unregistered. | |
2965 ;;; | |
2966 ;;; Potential cause: master file got nuked during window P. | |
2967 ;;; | |
2968 ;;; RCS: will fail with "RCS/<file>: No such file or directory" | |
2969 ;;; SCCS: will fail with error ut4. | |
2970 ;;; | |
2971 ;;; We can let these errors be passed up to the user. | |
2972 ;;; | |
2973 ;;; 6. File looked registered and not locked, but is actually locked by the | |
2974 ;;; calling user and unchanged. | |
2975 ;;; | |
2976 ;;; Potential cause: self-race during window T. | |
2977 ;;; | |
2978 ;;; RCS: in the same directory as the previous workfile, co -l will fail | |
2979 ;;; with "co error: writable foo exists; checkout aborted". In any other | |
2980 ;;; directory, checkout will succeed. | |
2981 ;;; SCCS: will fail with ge17. | |
2982 ;;; | |
2983 ;;; Either of these consequences is acceptable. | |
2984 ;;; | |
2985 ;;; 7. File looked registered and not locked, but is actually locked by the | |
2986 ;;; calling user and changed. | |
2987 ;;; | |
2988 ;;; As case 6. | |
2989 ;;; | |
2990 ;;; 8. File looked registered and not locked, but is actually locked by another | |
2991 ;;; user. | |
2992 ;;; | |
2993 ;;; Potential cause: someone else checks it out during window T. | |
2994 ;;; | |
2995 ;;; RCS: co error: revision 1.3 already locked by <user> | |
2996 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
2997 ;;; | |
2998 ;;; We can let these errors be passed up to the user. | |
2999 ;;; | |
3000 ;;; Apparent state C --- | |
3001 ;;; | |
3002 ;;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
3003 ;;; | |
3004 ;;; As case 5. | |
3005 ;;; | |
3006 ;;; 10. File looks locked by calling user and unchanged, but is actually not | |
3007 ;;; locked. | |
3008 ;;; | |
3009 ;;; Potential cause: a self-race in window U, or by the revert's | |
3010 ;;; landing during window X of some other user's steal-lock or window S | |
3011 ;;; of another user's revert. | |
3012 ;;; | |
3013 ;;; RCS: succeeds, refreshing the file from the identical version in | |
3014 ;;; the master. | |
3015 ;;; SCCS: fails with error ut4 (p file nonexistent). | |
3016 ;;; | |
3017 ;;; Either of these consequences is acceptable. | |
3018 ;;; | |
3019 ;;; 11. File is locked by calling user. It looks unchanged, but is actually | |
3020 ;;; changed. | |
3021 ;;; | |
3022 ;;; Potential cause: the file would have to be touched by a self-race | |
3023 ;;; during window Q. | |
3024 ;;; | |
3025 ;;; The revert will succeed, removing whatever changes came with | |
3026 ;;; the touch. It is theoretically possible that work could be lost. | |
3027 ;;; | |
3028 ;;; 12. File looks like it's locked by the calling user and unchanged, but | |
3029 ;;; it's actually locked by someone else. | |
3030 ;;; | |
3031 ;;; Potential cause: a steal-lock in window V. | |
3032 ;;; | |
3033 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u | |
3034 ;;; SCCS: fails with error un2 | |
3035 ;;; | |
3036 ;;; We can pass these errors up to the user. | |
3037 ;;; | |
3038 ;;; Apparent state D --- | |
3039 ;;; | |
3040 ;;; 13. File looks like it's locked by the calling user and changed, but it's | |
3041 ;;; actually unregistered. | |
3042 ;;; | |
3043 ;;; Potential cause: master file got nuked during window P. | |
3044 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
3045 ;;; 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
|
3046 ;;; 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
|
3047 ;;; option, failing with message "no such file or directory". |
904 | 3048 ;;; SCCS: will fail with error ut4. |
3049 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
3050 ;;; 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
|
3051 ;;; VC may fail to detect the loss of previous version information. |
904 | 3052 ;;; |
3053 ;;; 14. File looks like it's locked by the calling user and changed, but it's | |
3054 ;;; actually unlocked. | |
3055 ;;; | |
3056 ;;; Potential cause: self-race in window V, or the checkin happening | |
3057 ;;; during the window X of someone else's steal-lock or window S of | |
3058 ;;; someone else's revert. | |
3059 ;;; | |
3060 ;;; RCS: ci will fail with "no lock set by <user>". | |
3061 ;;; SCCS: delta will fail with error ut4. | |
3062 ;;; | |
3063 ;;; 15. File looks like it's locked by the calling user and changed, but it's | |
3064 ;;; actually locked by the calling user and unchanged. | |
3065 ;;; | |
3066 ;;; Potential cause: another self-race --- a whole checkin/checkout | |
3067 ;;; sequence by the calling user would have to land in window R. | |
3068 ;;; | |
3069 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. | |
3070 ;;; RCS: reverts to the file state as of the second user's checkin, leaving | |
3071 ;;; the file unlocked. | |
3072 ;;; | |
3073 ;;; It is theoretically possible that work could be lost under RCS. | |
3074 ;;; | |
3075 ;;; 16. File looks like it's locked by the calling user and changed, but it's | |
3076 ;;; actually locked by a different user. | |
3077 ;;; | |
3078 ;;; RCS: ci error: no lock set by <user> | |
3079 ;;; SCCS: unget will fail with error un2 | |
3080 ;;; | |
3081 ;;; We can pass these errors up to the user. | |
3082 ;;; | |
3083 ;;; Apparent state E --- | |
3084 ;;; | |
3085 ;;; 17. File looks like it's locked by some other user, but it's actually | |
3086 ;;; unregistered. | |
3087 ;;; | |
3088 ;;; As case 13. | |
3089 ;;; | |
3090 ;;; 18. File looks like it's locked by some other user, but it's actually | |
3091 ;;; unlocked. | |
3092 ;;; | |
3093 ;;; Potential cause: someone released a lock during window W. | |
3094 ;;; | |
3095 ;;; RCS: The calling user will get the lock on the file. | |
3096 ;;; SCCS: unget -n will fail with cm4. | |
3097 ;;; | |
3098 ;;; Either of these consequences will be OK. | |
3099 ;;; | |
3100 ;;; 19. File looks like it's locked by some other user, but it's actually | |
3101 ;;; locked by the calling user and unchanged. | |
3102 ;;; | |
3103 ;;; Potential cause: the other user relinquishing a lock followed by | |
3104 ;;; a self-race, both in window W. | |
3105 ;;; | |
3106 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making | |
3107 ;;; the sequence a no-op. | |
3108 ;;; | |
3109 ;;; 20. File looks like it's locked by some other user, but it's actually | |
3110 ;;; locked by the calling user and changed. | |
3111 ;;; | |
3112 ;;; As case 19. | |
3113 ;;; | |
3114 ;;; PROBLEM CASES: | |
3115 ;;; | |
3116 ;;; In order of decreasing severity: | |
3117 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
3118 ;;; Cases 11 and 15 are the only ones that potentially lose work. |
904 | 3119 ;;; They would require a self-race for this to happen. |
3120 ;;; | |
3121 ;;; Case 13 in RCS loses information about previous deltas, retaining | |
3122 ;;; only the information in the current workfile. This can only happen | |
3123 ;;; if the master file gets nuked in window P. | |
3124 ;;; | |
3125 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with | |
3126 ;;; no change comment in the master. This would require a self-race in | |
3127 ;;; window P or R respectively. | |
3128 ;;; | |
3129 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes. | |
3130 ;;; | |
3131 ;;; Unfortunately, it appears to me that no recovery is possible in these | |
3132 ;;; cases. They don't yield error messages, so there's no way to tell that | |
3133 ;;; a race condition has occurred. | |
3134 ;;; | |
3135 ;;; All other cases don't change either the workfile or the master, and | |
3136 ;;; trigger command errors which the user will see. | |
3137 ;;; | |
3138 ;;; Thus, there is no explicit recovery code. | |
3139 | |
3140 ;;; vc.el ends here |