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