Mercurial > emacs
annotate lisp/vc.el @ 31707:785a57d59501
*** empty log message ***
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Tue, 19 Sep 2000 10:38:41 +0000 |
parents | de4e73d77734 |
children | a42f956dd8ad |
rev | line source |
---|---|
904 | 1 ;;; vc.el --- drive a version-control system from within Emacs |
2 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
3 ;; Copyright (C) 1992,93,94,95,96,97,98,2000 Free Software Foundation, Inc. |
904 | 4 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
5 ;; Author: FSF (see below for full credits) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
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 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
25 ;;; Credits: |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
26 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
27 ;; VC was initially designed and implemented by Eric S. Raymond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
28 ;; <esr@snark.thyrsus.com>. Over the years, many people have |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
29 ;; contributed substantial amounts of work to VC. These include: |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
30 ;; Per Cederqvist <ceder@lysator.liu.se> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
31 ;; Paul Eggert <eggert@twinsun.com> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
32 ;; Sebastian Kremer <sk@thp.uni-koeln.de> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
33 ;; Martin Lorentzson <martinl@gnu.org> |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
34 ;; Dave Love <d.love@gnu.org> |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
35 ;; Stefan Monnier <monnier@cs.yale.edu> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
36 ;; Andre Spiegel <spiegel@gnu.org> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
37 ;; Richard Stallman <rms@gnu.org> |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
38 ;; ttn@netcom.com |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
39 |
904 | 40 ;;; Commentary: |
41 | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
42 ;; 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
|
43 ;; |
10537
380605821cc9
(vc-do-command): Arrange for the default-directory variable
Richard M. Stallman <rms@gnu.org>
parents:
10475
diff
changeset
|
44 ;; 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
|
45 ;; |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
46 ;; 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
|
47 ;; appropriate, VC finds out which version you have, and allows or |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
48 ;; disallows those features (stealing locks, for example, works only |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
49 ;; 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
|
50 ;; 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
|
51 ;; doesn't understand -t-; this has been known to happen to people running |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
52 ;; NExTSTEP 3.0. |
904 | 53 ;; |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
54 ;; You can support the RCS -x option by customizing vc-rcs-master-templates. |
904 | 55 ;; |
56 ;; Proper function of the SCCS diff commands requires the shellscript vcdiff | |
57 ;; to be installed somewhere on Emacs's path for executables. | |
58 ;; | |
2402
61e1f8813d03
(vc-comment-to-changelog): A useful vc-checkin hook, added.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2226
diff
changeset
|
59 ;; 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
|
60 ;; 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
|
61 ;; |
904 | 62 ;; The vc code maintains some internal state in order to reduce expensive |
63 ;; version-control operations to a minimum. Some names are only computed | |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
64 ;; once. If you perform version control operations with RCS/SCCS/CVS while |
904 | 65 ;; vc's back is turned, or move/rename master files while vc is running, |
66 ;; vc may get seriously confused. Don't do these things! | |
67 ;; | |
68 ;; Developer's notes on some concurrency issues are included at the end of | |
69 ;; the file. | |
70 | |
71 ;;; Code: | |
72 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
73 ;;;;;;;;;;;;;;;;; Backend-specific functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
74 ;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
75 ;; for each operation FUN, the backend should provide a function vc-BACKEND-FUN. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
76 ;; Operations marked with a `-' instead of a `*' have a sensible default |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
77 ;; behavior. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
78 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
79 ;; * registered (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
80 ;; * state (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
81 ;; - state-heuristic (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
82 ;; The default behavior delegates to `state'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
83 ;; - dir-state (dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
84 ;; * checkout-model (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
85 ;; - mode-line-string (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
86 ;; * workfile-version (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
87 ;; * revert (file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
88 ;; - merge-news (file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
89 ;; Only needed if state `needs-merge' is possible. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
90 ;; - merge (file rev1 rev2) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
91 ;; - steal-lock (file &optional version) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
92 ;; Only required if files can be locked by somebody else. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
93 ;; * register (file rev comment) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
94 ;; - responsible-p (file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
95 ;; Should also work if FILE is a directory (ends with a slash). |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
96 ;; - could-register (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
97 ;; * checkout (file writable &optional rev destfile) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
98 ;; Checkout revision REV of FILE into DESTFILE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
99 ;; DESTFILE defaults to FILE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
100 ;; The file should be made writable if WRITABLE is non-nil. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
101 ;; REV can be nil (BASE) or "" (HEAD) or any other revision. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
102 ;; * checkin (file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
103 ;; - logentry-check () |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
104 ;; * diff (file &optional rev1 rev2) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
105 ;; Insert the diff for FILE into the current buffer. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
106 ;; REV1 should default to workfile-version. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
107 ;; REV2 should default to the current workfile |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
108 ;; Return a status of either 0 (i.e. no diff) or 1 (i.e. either non-empty |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
109 ;; diff or the diff is run asynchronously). |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
110 ;; - workfile-unchanged-p (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
111 ;; Return non-nil if FILE is unchanged from its current workfile version. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
112 ;; This function should do a brief comparison of FILE's contents |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
113 ;; with those of the master version. If the backend does not have |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
114 ;; such a brief-comparison feature, the default implementation of this |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
115 ;; function can be used, which delegates to a full vc-BACKEND-diff. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
116 ;; - clear-headers () |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
117 ;; * check-headers () |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
118 ;; - dired-state-info (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
119 ;; - create-snapshot (dir name branchp) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
120 ;; Take a snapshot of the current state of files under DIR and name it NAME. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
121 ;; This should make sure that files are up-to-date before proceeding |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
122 ;; with the action. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
123 ;; DIR can also be a file and if BRANCHP is specified, NAME |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
124 ;; should be created as a branch and DIR should be checked out under |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
125 ;; this new branch. The default behavior does not support branches |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
126 ;; but does a sanity check, a tree traversal and for each file calls |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
127 ;; `assign-name'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
128 ;; * assign-name (file name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
129 ;; Give name NAME to the current version of FILE, assuming it is |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
130 ;; up-to-date. Only used by the default version of `create-snapshot'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
131 ;; - retrieve-snapshot (dir name update) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
132 ;; Retrieve a named snapshot of all registered files at or below DIR. |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
133 ;; If UPDATE is non-nil, then update buffers of any files in the snapshot |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
134 ;; that are currently visited. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
135 ;; * print-log (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
136 ;; Insert the revision log of FILE into the current buffer. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
137 ;; - show-log-entry (version) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
138 ;; - update-changelog (files) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
139 ;; Find changelog entries for FILES, or for all files at or below |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
140 ;; the default-directory if FILES is nil. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
141 ;; * latest-on-branch-p (file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
142 ;; - cancel-version (file writable) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
143 ;; - rename-file (old new) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
144 ;; - annotate-command (file buf) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
145 ;; - annotate-difference (pos) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
146 ;; Only required if `annotate-command' is defined for the backend. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
147 |
904 | 148 (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
|
149 (require 'ring) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
150 (eval-when-compile |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
151 (require 'compile) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
152 (require 'dired) ; for dired-map-over-marks macro |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
153 (require 'dired-aux)) ; for dired-kill-{line,tree} |
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
|
154 |
a66f7ed76416
(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 (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
|
156 (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
|
157 (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
|
158 minor-mode-alist))) |
904 | 159 |
160 ;; General customization | |
161 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
162 (defgroup vc nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
163 "Version-control system in Emacs." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
164 :group 'tools) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
165 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
166 (defcustom vc-suppress-confirm nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
167 "*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
|
168 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
169 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
170 |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
171 (defcustom vc-delete-logbuf-window t |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
172 "*If non-nil, delete the *VC-log* buffer and window after each logical action. |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
173 If nil, bury that buffer instead. |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
174 This is most useful if you have multiple windows on a frame and would like to |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
175 preserve the setting." |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
176 :type 'boolean |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
177 :group 'vc) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
178 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
179 (defcustom vc-initial-comment nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
180 "*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
|
181 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
182 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
183 |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
184 (defcustom vc-default-init-version "1.1" |
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
185 "*A string used as the default version number when a new file is registered. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
186 This can be overridden by giving a prefix argument to \\[vc-register]." |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
187 :type 'string |
21669
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21560
diff
changeset
|
188 :group 'vc |
9861518505cb
*** empty log message ***
Dan Nicolaescu <done@ece.arizona.edu>
parents:
21560
diff
changeset
|
189 :version "20.3") |
20988
9a6179e6eff6
(vc-default-init-version): New variable.
André Spiegel <spiegel@gnu.org>
parents:
20977
diff
changeset
|
190 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
191 (defcustom vc-command-messages nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
192 "*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
|
193 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
194 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
195 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
196 (defcustom vc-checkin-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
197 "*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
|
198 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
|
199 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
200 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
201 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
202 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
203 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
204 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
205 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
206 (defcustom vc-checkout-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
207 "*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
|
208 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
|
209 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
210 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
211 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
212 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
213 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
214 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
215 |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
216 (defcustom vc-register-switches nil |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
217 "*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
|
218 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
|
219 :type '(choice (const :tag "None" nil) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
220 (string :tag "Argument String") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
221 (repeat :tag "Argument List" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
222 :value ("") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
223 string)) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
224 :group 'vc) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
225 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
226 (defcustom vc-dired-listing-switches "-al" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
227 "*Switches passed to `ls' for vc-dired. MUST contain the `l' option." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
228 :type 'string |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
229 :group 'vc |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
230 :version "21.1") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
231 |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
232 (defcustom vc-dired-recurse t |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
233 "*If non-nil, show directory trees recursively in VC Dired." |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
234 :type 'boolean |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
235 :group 'vc |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
236 :version "20.3") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
237 |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
238 (defcustom vc-dired-terse-display t |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
239 "*If non-nil, show only locked files in VC Dired." |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
240 :type 'boolean |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
241 :group 'vc |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
242 :version "20.3") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
243 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
244 (defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
245 "*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
|
246 :type '(repeat string) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
247 :group 'vc) |
1335
d649d430148d
(vc-checkin-switches): New defvar.
Roland McGrath <roland@gnu.org>
parents:
1243
diff
changeset
|
248 |
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
|
249 (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
|
250 "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
|
251 |
2705
b4587e7ff4e5
(diff-switches): Define var here as well as in diff.el.
Richard M. Stallman <rms@gnu.org>
parents:
2692
diff
changeset
|
252 ;;; 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
|
253 (defvar diff-switches "-c" |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
254 "*A string or list of strings specifying switches to be passed to diff.") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
255 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
256 ;;;###autoload |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
257 (defcustom vc-checkin-hook nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
258 "*Normal hook (list of functions) run after a checkin is done. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
259 See `run-hooks'." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
260 :type 'hook |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
261 :options '(vc-comment-to-change-log) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
262 :group 'vc) |
2705
b4587e7ff4e5
(diff-switches): Define var here as well as in diff.el.
Richard M. Stallman <rms@gnu.org>
parents:
2692
diff
changeset
|
263 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
264 ;;;###autoload |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
265 (defcustom vc-before-checkin-hook nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
266 "*Normal hook (list of functions) run before a file gets checked in. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
267 See `run-hooks'." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
268 :type 'hook |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
269 :group 'vc) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
270 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
271 (defcustom vc-logentry-check-hook nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
272 "*Normal hook run by `vc-backend-logentry-check'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
273 Use this to impose your own rules on the entry in addition to any the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
274 version control backend imposes itself." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
275 :type 'hook |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
276 :group 'vc) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
277 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
278 ;; Annotate customization |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
279 (defcustom vc-annotate-color-map |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
280 '(( 26.3672 . "#FF0000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
281 ( 52.7344 . "#FF3800") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
282 ( 79.1016 . "#FF7000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
283 (105.4688 . "#FFA800") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
284 (131.8359 . "#FFE000") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
285 (158.2031 . "#E7FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
286 (184.5703 . "#AFFF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
287 (210.9375 . "#77FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
288 (237.3047 . "#3FFF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
289 (263.6719 . "#07FF00") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
290 (290.0391 . "#00FF31") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
291 (316.4063 . "#00FF69") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
292 (342.7734 . "#00FFA1") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
293 (369.1406 . "#00FFD9") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
294 (395.5078 . "#00EEFF") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
295 (421.8750 . "#00B6FF") |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
296 (448.2422 . "#007EFF")) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
297 "*Association list of age versus color, for \\[vc-annotate]. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
298 Ages are given in units of 2**-16 seconds. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
299 Default is eighteen steps using a twenty day increment." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
300 :type 'alist |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
301 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
302 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
303 (defcustom vc-annotate-very-old-color "#0046FF" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
304 "*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
|
305 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
306 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
307 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
308 (defcustom vc-annotate-background "black" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
309 "*Background color for \\[vc-annotate]. |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
310 Default color is used if nil." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
311 :type 'string |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
312 :group 'vc) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
313 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
314 (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
|
315 "*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
|
316 List of factors, used to expand/compress the time scale. See `vc-annotate'." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
317 :type '(repeat number) |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
318 :group 'vc) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
319 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
320 ;; vc-annotate functionality (CVS only). |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
321 (defvar vc-annotate-mode nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
322 "Variable indicating if VC-Annotate mode is active.") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
323 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
324 (defvar vc-annotate-mode-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
325 (let ((m (make-sparse-keymap))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
326 (define-key m [menu-bar] (make-sparse-keymap "VC-Annotate")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
327 m) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
328 "Local keymap used for VC-Annotate mode.") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
329 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
330 (defvar vc-annotate-mode-menu nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
331 "Local keymap used for VC-Annotate mode's menu bar menu.") |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
332 |
904 | 333 ;; Header-insertion hair |
334 | |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
335 (defcustom vc-static-header-alist |
904 | 336 '(("\\.c$" . |
337 "\n#ifndef lint\nstatic char vcid[] = \"\%s\";\n#endif /* lint */\n")) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
338 "*Associate static header string templates with file types. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
339 A \%s in the template is replaced with the first string associated with |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
340 the file's version control type in `vc-header-alist'." |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
341 :type '(repeat (cons :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
342 (regexp :tag "File Type") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
343 (string :tag "Header String"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
344 :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
|
345 |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
346 (defcustom vc-comment-alist |
904 | 347 '((nroff-mode ".\\\"" "")) |
348 "*Special comment delimiters to be used in generating vc headers only. | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
349 Add an entry in this list if you need to override the normal `comment-start' |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
350 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
|
351 is sensitive to blank lines." |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
352 :type '(repeat (list :format "%v" |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
353 (symbol :tag "Mode") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
354 (string :tag "Comment Start") |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
355 (string :tag "Comment End"))) |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
356 :group 'vc) |
904 | 357 |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
358 ;; Default is to be extra careful for super-user. |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
359 ;; TODO: This variable is no longer used; the corresponding checks |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
360 ;; are always done now. If that turns out to be fast enough, |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
361 ;; the variable can be obsoleted. |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
362 (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
|
363 "*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
|
364 Verify that the file really is not locked |
17672
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
365 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
|
366 :type 'boolean |
3e14521699ff
Use defgroup and defcustom.
Richard M. Stallman <rms@gnu.org>
parents:
17410
diff
changeset
|
367 :group 'vc) |
5201
b27badfb4040
(vc-buffer-sync): Signal error if user says no.
Richard M. Stallman <rms@gnu.org>
parents:
5015
diff
changeset
|
368 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
369 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
370 ;;; The main keymap |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
371 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
372 (defvar vc-prefix-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
373 (let ((map (make-sparse-keymap))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
374 (define-key map "a" 'vc-update-change-log) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
375 (define-key map "c" 'vc-cancel-version) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
376 (define-key map "d" 'vc-directory) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
377 (define-key map "g" 'vc-annotate) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
378 (define-key map "h" 'vc-insert-headers) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
379 (define-key map "i" 'vc-register) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
380 (define-key map "l" 'vc-print-log) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
381 (define-key map "m" 'vc-merge) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
382 (define-key map "r" 'vc-retrieve-snapshot) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
383 (define-key map "s" 'vc-create-snapshot) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
384 (define-key map "u" 'vc-revert-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
385 (define-key map "v" 'vc-next-action) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
386 (define-key map "=" 'vc-diff) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
387 (define-key map "~" 'vc-version-other-window) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
388 map)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
389 (fset 'vc-prefix-map vc-prefix-map) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
390 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
391 ;; Initialization code, to be done just once at load-time |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
392 (defvar vc-log-mode-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
393 (let ((map (make-sparse-keymap))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
394 (define-key map "\M-n" 'vc-next-comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
395 (define-key map "\M-p" 'vc-previous-comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
396 (define-key map "\M-r" 'vc-comment-search-reverse) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
397 (define-key map "\M-s" 'vc-comment-search-forward) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
398 (define-key map "\C-c\C-c" 'vc-finish-logentry) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
399 map)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
400 ;; Compatibility with old name. Should we bother ? |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
401 (defvar vc-log-entry-mode vc-log-mode-map) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
402 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
403 |
904 | 404 ;; Variables the user doesn't need to know about. |
405 (defvar vc-log-operation nil) | |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
406 (defvar vc-log-after-operation-hook nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
407 (defvar vc-annotate-buffers nil |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
408 "Alist of current \"Annotate\" buffers and their corresponding backends. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
409 The keys are \(BUFFER . BACKEND\). See also `vc-annotate-get-backend'.") |
8350 | 410 ;; In a log entry buffer, this is a local variable |
411 ;; that points to the buffer for which it was made | |
412 ;; (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
|
413 (defvar vc-parent-buffer nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
414 (put 'vc-parent-buffer 'permanent-local t) |
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
|
415 (defvar vc-parent-buffer-name nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
416 (put 'vc-parent-buffer-name 'permanent-local t) |
904 | 417 |
1494
64f5e84c822b
(vc-admin): Pass t as noquery arg to vc-resynch-window.
Richard M. Stallman <rms@gnu.org>
parents:
1478
diff
changeset
|
418 (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
|
419 (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
|
420 |
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
|
421 (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
|
422 (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
|
423 |
15036
e782b987fbdb
(vc-comment-ring): Initialise using make-ring.
Richard M. Stallman <rms@gnu.org>
parents:
14855
diff
changeset
|
424 (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
|
425 (defvar vc-comment-ring-index nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
426 (defvar vc-last-comment-match "") |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
427 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
428 ;;; functions that operate on RCS revision numbers. This code should |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
429 ;;; also be moved into the backends. It stays for now, however, since |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
430 ;;; it is used in code below. |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
431 (defun vc-trunk-p (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
432 "Return t if REV is a revision on the trunk." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
433 (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
|
434 |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
435 (defun vc-branch-p (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
436 "Return t if REV is a branch revision." |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
437 (not (eq nil (string-match "\\`[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*\\'" rev)))) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
438 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
439 (defun vc-branch-part (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
440 "Return the branch part of a revision number REV." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
441 (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
|
442 |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
443 (defun vc-minor-part (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
444 "Return the minor version number of a revision number REV." |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
445 (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
|
446 (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
|
447 |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
448 (defun vc-previous-version (rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
449 "Guess the version number immediately preceding REV." |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
450 (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
|
451 (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
|
452 (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
|
453 ;; 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
|
454 (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
|
455 (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
|
456 ;; 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
|
457 ;; 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
|
458 "" |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
459 ;; 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
|
460 ;; 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
|
461 (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
|
462 |
904 | 463 ;; File property caching |
464 | |
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
|
465 (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
|
466 "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
|
467 (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
|
468 (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
|
469 ;; 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
|
470 ;; 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
|
471 (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
|
472 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
473 (defmacro with-vc-properties (file form settings) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
474 "Execute FORM, then set per-file properties for FILE, but only those |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
475 that have not been set during the execution of FORM. SETTINGS is a list |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
476 of two-element lists, each of which has the form (PROPERTY VALUE)." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
477 `(let ((vc-touched-properties (list t)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
478 (filename ,file)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
479 ,form |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
480 (mapcar (lambda (setting) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
481 (let ((property (nth 0 setting)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
482 (value (nth 1 setting))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
483 (unless (memq property vc-touched-properties) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
484 (put (intern filename vc-file-prop-obarray) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
485 property value)))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
486 ,settings))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
487 |
904 | 488 ;; Random helper functions |
489 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
490 (defsubst vc-editable-p (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
491 (or (eq (vc-checkout-model file) 'implicit) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
492 (eq (vc-state file) 'edited) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
493 (eq (vc-state file) 'needs-merge))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
494 |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
495 ;;; Two macros for elisp programming |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
496 ;;;###autoload |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
497 (defmacro with-vc-file (file comment &rest body) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
498 "Check out a writable copy of FILE if necessary and execute the body. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
499 Check in FILE with COMMENT (a string) after BODY has been executed. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
500 FILE is passed through `expand-file-name'; BODY executed within |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
501 `save-excursion'. If FILE is not under version control, or locked by |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
502 somebody else, signal error." |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
503 `(let ((file (expand-file-name ,file))) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
504 (or (vc-registered file) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
505 (error (format "File not under version control: `%s'" file))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
506 (unless (vc-editable-p file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
507 (let ((state (vc-state file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
508 (if (stringp state) (error (format "`%s' is locking `%s'" state file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
509 (vc-checkout file t)))) |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
510 (save-excursion |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
511 ,@body) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
512 (vc-checkin file nil ,comment))) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
513 |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
514 ;;;###autoload |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
515 (defmacro edit-vc-file (file comment &rest body) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
516 "Edit FILE under version control, executing body. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
517 Checkin with COMMENT after executing BODY. |
23635
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
518 This macro uses `with-vc-file', passing args to it. |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
519 However, before executing BODY, find FILE, and after BODY, save buffer." |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
520 `(with-vc-file |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
521 ,file ,comment |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
522 (find-file ,file) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
523 ,@body |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
524 (save-buffer))) |
9717d57c40c1
(with-vc-file, edit-vc-file): New macros.
André Spiegel <spiegel@gnu.org>
parents:
23592
diff
changeset
|
525 |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
526 (defun vc-ensure-vc-buffer () |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
527 "Make sure that the current buffer visits a version-controlled file." |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
528 (if vc-dired-mode |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
529 (set-buffer (find-file-noselect (dired-get-filename))) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
530 (while vc-parent-buffer |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
531 (pop-to-buffer vc-parent-buffer)) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
532 (if (not (buffer-file-name)) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
533 (error "Buffer %s is not associated with a file" (buffer-name)) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
534 (if (not (vc-backend (buffer-file-name))) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
535 (error "File %s is not under version control" (buffer-file-name)))))) |
2745
adf91f018312
(vc-diff): Report an error if the buffer isn't registered.
Richard M. Stallman <rms@gnu.org>
parents:
2706
diff
changeset
|
536 |
904 | 537 (defvar vc-binary-assoc nil) |
22534
442d61eaab83
(vc-binary-suffixes): New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
22504
diff
changeset
|
538 (defvar vc-binary-suffixes |
442d61eaab83
(vc-binary-suffixes): New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
22504
diff
changeset
|
539 (if (memq system-type '(ms-dos windows-nt)) |
442d61eaab83
(vc-binary-suffixes): New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
22504
diff
changeset
|
540 '(".exe" ".com" ".bat" ".cmd" ".btm" "") |
442d61eaab83
(vc-binary-suffixes): New variable.
Eli Zaretskii <eliz@gnu.org>
parents:
22504
diff
changeset
|
541 '(""))) |
904 | 542 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
543 (defun vc-process-filter (p s) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
544 "An alternative output filter for async process P. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
545 The only difference with the default filter is to insert S after markers." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
546 (with-current-buffer (process-buffer p) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
547 (save-excursion |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
548 (let ((inhibit-read-only t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
549 (goto-char (process-mark p)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
550 (insert s) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
551 (set-marker (process-mark p) (point)))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
552 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
553 (defun vc-setup-buffer (&optional buf) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
554 "Prepare BUF for executing a VC command and make it the current buffer. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
555 BUF defaults to \"*vc*\", can be a string and will be created if necessary." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
556 (unless buf (setq buf "*vc*")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
557 (let ((camefrom (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
558 (olddir default-directory)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
559 (set-buffer (get-buffer-create buf)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
560 (kill-all-local-variables) |
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
|
561 (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
|
562 (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
|
563 (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
|
564 (setq default-directory olddir) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
565 (let ((inhibit-read-only t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
566 (erase-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
567 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
568 (defun vc-exec-after (code) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
569 "Eval CODE when the current buffer's process is done. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
570 If the current buffer has no process, just evaluate CODE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
571 Else, add CODE to the process' sentinel." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
572 (let ((proc (get-buffer-process (current-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
573 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
574 ;; If there's no background process, just execute the code. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
575 ((null proc) (eval code)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
576 ;; If the background process has exited, reap it and try again |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
577 ((eq (process-status proc) 'exit) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
578 (delete-process proc) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
579 (vc-exec-after code)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
580 ;; If a process is running, add CODE to the sentinel |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
581 ((eq (process-status proc) 'run) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
582 (let ((sentinel (process-sentinel proc))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
583 (set-process-sentinel proc |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
584 `(lambda (p s) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
585 (with-current-buffer ',(current-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
586 (goto-char (process-mark p)) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
587 ,@(append (cdr (cdr (cdr ;strip off `with-current-buffer buf |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
588 ; (goto-char...)' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
589 (car (cdr (cdr ;strip off `lambda (p s)' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
590 sentinel)))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
591 (list `(vc-exec-after ',code)))))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
592 (t (error "Unexpected process state")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
593 nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
594 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
595 (defvar vc-post-command-functions nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
596 "Hook run at the end of `vc-do-command'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
597 Each function is called inside the buffer in which the command was run |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
598 and is passed 3 argument: the COMMAND, the FILE and the FLAGS.") |
1674
75e8a7f920c7
* vc.el (vc-do-command): Set the default directory of the *vc*
Jim Blandy <jimb@redhat.com>
parents:
1636
diff
changeset
|
599 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
600 (defun vc-do-command (buffer okstatus command file &rest flags) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
601 "Execute a version control command, notifying user and checking for errors. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
602 Output from COMMAND goes to BUFFER, or *vc* if BUFFER is nil or the current |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
603 buffer (which is assumed to be properly setup) if BUFFER is t. The |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
604 command is considered successful if its exit status does not exceed |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
605 OKSTATUS (if OKSTATUS is nil, that means to ignore errors, if it is 'async, |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
606 that means not to wait for termination of the subprocess). FILE is |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
607 the name of the working file (may also be nil, to execute commands |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
608 that don't expect a file name). If an optional list of FLAGS is present, |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
609 that is inserted into the command line before the filename." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
610 (and file (setq file (expand-file-name file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
611 (if vc-command-messages |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
612 (message "Running %s on %s..." command file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
613 (save-current-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
614 (unless (eq buffer t) (vc-setup-buffer buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
615 (let ((squeezed nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
616 (inhibit-read-only t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
617 (status 0)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
618 (setq squeezed (delq nil (copy-sequence flags))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
619 (when file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
620 ;; FIXME: file-relative-name can return a bogus result because |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
621 ;; it doesn't look at the actual file-system to see if symlinks |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
622 ;; come into play. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
623 (setq squeezed (append squeezed (list (file-relative-name file))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
624 (let ((exec-path (append vc-path exec-path)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
625 ;; Add vc-path to PATH for the execution of this command. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
626 (process-environment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
627 (cons (concat "PATH=" (getenv "PATH") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
628 path-separator |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
629 (mapconcat 'identity vc-path path-separator)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
630 process-environment)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
631 (w32-quote-process-args t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
632 (if (eq okstatus 'async) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
633 (let ((proc (apply 'start-process command (current-buffer) command |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
634 squeezed))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
635 (message "Running %s in the background..." command) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
636 ;;(set-process-sentinel proc (lambda (p msg) (delete-process p))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
637 (set-process-filter proc 'vc-process-filter) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
638 (vc-exec-after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
639 `(message "Running %s in the background... done" ',command))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
640 (setq status (apply 'call-process command nil t nil squeezed)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
641 (when (or (not (integerp status)) (and okstatus (< okstatus status))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
642 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
643 (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
644 (shrink-window-if-larger-than-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
645 (error "Running %s...FAILED (%s)" command |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
646 (if (integerp status) (format "status %d" status) status)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
647 (if vc-command-messages |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
648 (message "Running %s...OK" command))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
649 (vc-exec-after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
650 `(run-hook-with-args 'vc-post-command-functions ',command ',file ',flags)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
651 status))) |
904 | 652 |
1635
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
653 (defun vc-position-context (posn) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
654 "Save a bit of the text around POSN in the current buffer. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
655 Used to help us find the corresponding position again later |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
656 if markers are destroyed or corrupted." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
657 ;; A lot of this was shamelessly lifted from Sebastian Kremer's |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
658 ;; 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
|
659 (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
|
660 (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
|
661 (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
|
662 (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
|
663 |
e3c02a517030
Thu Nov 19 16:44:24 1992 Jim Blandy (jimb@totoro.cs.oberlin.edu)
Jim Blandy <jimb@redhat.com>
parents:
1575
diff
changeset
|
664 (defun vc-find-position-by-context (context) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
665 "Return the position of CONTEXT in the current buffer, or nil if not found." |
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
|
666 (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
|
667 (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
|
668 (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
|
669 (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
|
670 (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
|
671 (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
|
672 (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
|
673 (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
|
674 ;; 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
|
675 ;; 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
|
676 (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
|
677 ;; 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
|
678 ;; 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
|
679 (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
|
680 ;; 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
|
681 (- (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
|
682 |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
683 (defun vc-context-matches-p (posn context) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
684 "Return t if POSN matches CONTEXT, nil otherwise." |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
685 (let* ((context-string (nth 2 context)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
686 (len (length context-string)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
687 (end (+ posn len))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
688 (if (> end (1+ (buffer-size))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
689 nil |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
690 (string= context-string (buffer-substring posn end))))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
691 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
692 (defun vc-buffer-context () |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
693 "Return a list (POINT-CONTEXT MARK-CONTEXT REPARSE). |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
694 Used by `vc-restore-buffer-context' to 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
|
695 (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
|
696 ;; 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
|
697 (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
|
698 (vc-position-context (mark-marker)))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
699 ;; 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
|
700 (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
|
701 ;; 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
|
702 (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
|
703 (let ((curbuf (current-buffer))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
704 ;; 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
|
705 ;; 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
|
706 ;; 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
|
707 (save-excursion |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
708 (mapcar (lambda (buffer) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
709 (set-buffer buffer) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
710 (let ((errors (or |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
711 compilation-old-error-list |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
712 compilation-error-list)) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
713 (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
|
714 (while (and (consp errors) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
715 (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
|
716 (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
|
717 (eq buffer |
3a56b8caf6c9
(vc-revert-buffer1): Ignore non-marker elts of compilation-error-list.
Roland McGrath <roland@gnu.org>
parents:
2580
diff
changeset
|
718 (marker-buffer |
2617
e2e5dfa162b4
(vc-revert-buffer1): Fix format of compilation-error-list.
Richard M. Stallman <rms@gnu.org>
parents:
2612
diff
changeset
|
719 (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
|
720 (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
|
721 (setq errors (cdr errors))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
722 (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
|
723 (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
|
724 (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
|
725 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
726 (defun vc-restore-buffer-context (context) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
727 "Restore point/mark, and reparse any affected compilation buffers. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
728 CONTEXT is that which `vc-buffer-context' returns." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
729 (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
|
730 (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
|
731 (reparse (nth 2 context))) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
732 ;; Reparse affected compilation buffers. |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
733 (while reparse |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
734 (if (car reparse) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
735 (with-current-buffer (car reparse) |
2554
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
736 (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
|
737 ;; 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
|
738 ;; 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
|
739 (error-pos (marker-position |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
740 (car (car-safe compilation-error-list))))) |
5686672705bf
(vc-revert-buffer1): Completely rewrote compilation reparsing code.
Roland McGrath <roland@gnu.org>
parents:
2493
diff
changeset
|
741 ;; 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
|
742 (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
|
743 ;; 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
|
744 ;; 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
|
745 (while (and compilation-error-list |
2558
78a9cebdb22c
(vc-revert-buffer1): Typo fix in last change.
Roland McGrath <roland@gnu.org>
parents:
2555
diff
changeset
|
746 (/= 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
|
747 (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
|
748 (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
|
749 |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
750 ;; if necessary, restore point and mark |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
751 (if (not (vc-context-matches-p (point) point-context)) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
752 (let ((new-point (vc-find-position-by-context point-context))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
753 (if new-point (goto-char new-point)))) |
21212
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
754 (and mark-active |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
755 mark-context |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
756 (not (vc-context-matches-p (mark) mark-context)) |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
757 (let ((new-mark (vc-find-position-by-context mark-context))) |
73a8874d25ce
(vc-restore-buffer-context): Only try to restore mark if it is active.
André Spiegel <spiegel@gnu.org>
parents:
21113
diff
changeset
|
758 (if new-mark (set-mark new-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
|
759 |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
760 (defun vc-revert-buffer1 (&optional arg no-confirm) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
761 "Revert buffer, trying to keep point and mark where user expects them. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
762 Tries to be clever in the face of changes due to expanded version control |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
763 key words. This is important for typeahead to work as expected. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
764 ARG and NO-CONFIRM are passed on to `revert-buffer'." |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
765 (interactive "P") |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
766 (widen) |
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
767 (let ((context (vc-buffer-context))) |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
768 ;; Use save-excursion here, because it may be able to restore point |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
769 ;; and mark properly even in cases where vc-restore-buffer-context |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
770 ;; would fail. However, save-excursion might also get it wrong -- |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
771 ;; in this case, vc-restore-buffer-context gives it a second try. |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
772 (save-excursion |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
773 ;; t means don't call normal-mode; |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
774 ;; that's to preserve various minor modes. |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
775 (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
|
776 (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
|
777 |
904 | 778 |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
779 (defun vc-buffer-sync (&optional not-urgent) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
780 "Make sure the current buffer and its working file are in sync. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
781 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
|
782 (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
|
783 (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
|
784 (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
|
785 (save-buffer) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
786 (unless not-urgent |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
787 (error "Aborted"))))) |
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
788 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
789 (defun vc-workfile-unchanged-p (file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
790 "Has FILE changed since last checkout?" |
904 | 791 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
792 (lastmod (nth 5 (file-attributes file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
793 (if checkout-time |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
794 (equal checkout-time lastmod) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
795 (let ((unchanged (vc-call workfile-unchanged-p file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
796 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
797 unchanged)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
798 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
799 (defun vc-default-workfile-unchanged-p (file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
800 "Default check whether FILE is unchanged: diff against master version." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
801 (zerop (vc-call diff file (vc-workfile-version file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
802 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
803 (defun vc-recompute-state (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
804 "Force a recomputation of the version control state of FILE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
805 The state is computed using the exact, and possibly expensive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
806 function `vc-BACKEND-state', not the heuristic." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
807 (vc-file-setprop file 'vc-state (vc-call state file))) |
904 | 808 |
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
|
809 (defun vc-next-action-on-file (file verbose &optional comment) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
810 "Do The Right Thing for a given version-controlled FILE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
811 If COMMENT is specified, it will be used as an admin or checkin comment. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
812 If VERBOSE is non-nil, query the user rather than using default parameters." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
813 (let ((visited (get-file-buffer file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
814 state version) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
815 (when visited |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
816 ;; Check relation of buffer and file, and make sure |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
817 ;; user knows what he's doing. First, finding the file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
818 ;; will check whether the file on disk is newer. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
819 (if vc-dired-mode |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
820 (find-file-other-window file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
821 (find-file file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
822 (if (not (verify-visited-file-modtime (current-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
823 (if (yes-or-no-p "Replace file on disk with buffer contents? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
824 (write-file (buffer-file-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
825 (error "Aborted")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
826 ;; Now, check if we have unsaved changes. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
827 (vc-buffer-sync t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
828 (if (buffer-modified-p) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
829 (or (y-or-n-p "Operate on disk file, keeping modified buffer? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
830 (error "Aborted"))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
831 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
832 ;; Do the right thing |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
833 (if (not (vc-registered file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
834 (vc-register verbose comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
835 (vc-recompute-state file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
836 (setq state (vc-state file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
837 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
838 ;; up-to-date |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
839 ((or (eq state 'up-to-date) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
840 (and verbose (eq state 'needs-patch))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
841 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
842 (verbose |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
843 ;; go to a different version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
844 (setq version (read-string "Branch or version to move to: ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
845 (vc-checkout file (eq (vc-checkout-model file) 'implicit) version)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
846 ((not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
847 ;; check the file out |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
848 (vc-checkout file t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
849 (t |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
850 ;; do nothing |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
851 (message "%s is up-to-date" file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
852 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
853 ;; Abnormal: edited but read-only |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
854 ((and visited (eq state 'edited) buffer-read-only) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
855 ;; Make the file+buffer read-write. If the user really wanted to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
856 ;; commit, he'll get a chance to do that next time around, anyway. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
857 (message "File is edited but read-only; making it writable") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
858 (set-file-modes buffer-file-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
859 (logior (file-modes buffer-file-name) 128)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
860 (toggle-read-only -1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
861 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
862 ;; edited |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
863 ((eq state 'edited) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
864 (cond |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
865 ;; For files with locking, if the file does not contain |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
866 ;; any changes, just let go of the lock, i.e. revert. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
867 ((and (not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
868 (vc-workfile-unchanged-p file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
869 ;; If buffer is modified, that means the user just |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
870 ;; said no to saving it; in that case, don't revert, |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
871 ;; because the user might intend to save after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
872 ;; finishing the log entry. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
873 (not (and visited (buffer-modified-p)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
874 ;; DO NOT revert the file without asking the user! |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
875 (if (not visited) (find-file-other-window file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
876 (if (yes-or-no-p "Revert to master version? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
877 (vc-revert-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
878 (t ;; normal action |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
879 (if verbose (setq version (read-string "New version: "))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
880 (vc-checkin file version comment)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
881 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
882 ;; locked by somebody else |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
883 ((stringp state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
884 (if comment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
885 (error "Sorry, you can't steal the lock on %s this way" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
886 (file-name-nondirectory file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
887 (vc-steal-lock file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
888 (if verbose (read-string "Version to steal: ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
889 (vc-workfile-version file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
890 state)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
891 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
892 ;; needs-patch |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
893 ((eq state 'needs-patch) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
894 (if (yes-or-no-p (format |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
895 "%s is not up-to-date. Get latest version? " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
896 (file-name-nondirectory file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
897 (vc-checkout file (eq (vc-checkout-model file) 'implicit) "") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
898 (if (and (not (eq (vc-checkout-model file) 'implicit)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
899 (yes-or-no-p "Lock this version? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
900 (vc-checkout file t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
901 (error "Aborted")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
902 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
903 ;; needs-merge |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
904 ((eq state 'needs-merge) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
905 (if (yes-or-no-p (format |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
906 "%s is not up-to-date. Merge in changes now? " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
907 (file-name-nondirectory file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
908 (vc-maybe-resolve-conflicts file (vc-call merge-news file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
909 (error "Aborted"))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
910 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
911 ;; unlocked-changes |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
912 ((eq state 'unlocked-changes) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
913 (if (not visited) (find-file-other-window file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
914 (if (save-window-excursion |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
915 (vc-version-diff file (vc-workfile-version file) nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
916 (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
917 (insert-string (format "Changes to %s since last lock:\n\n" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
918 file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
919 (not (beep)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
920 (yes-or-no-p (concat "File has unlocked changes. " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
921 "Claim lock retaining changes? "))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
922 (progn (vc-call steal-lock file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
923 ;; Must clear any headers here because they wouldn't |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
924 ;; show that the file is locked now. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
925 (vc-clear-headers file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
926 (vc-mode-line file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
927 (if (not (yes-or-no-p |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
928 "Revert to checked-in version, instead? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
929 (error "Checkout aborted") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
930 (vc-revert-buffer1 t t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
931 (vc-checkout file 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
|
932 |
23792
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
933 (defvar vc-dired-window-configuration) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
934 |
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 (defun vc-next-action-dired (file rev comment) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
936 "Call `vc-next-action-on-file' on all the marked files. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
937 Ignores FILE and REV, but passes on COMMENT." |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
938 (let ((dired-buffer (current-buffer)) |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
939 (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
|
940 (dired-map-over-marks |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
941 (let ((file (dired-get-filename))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
942 (message "Processing %s..." file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
943 (vc-next-action-on-file file nil comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
944 (set-buffer dired-buffer) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
945 (set-window-configuration vc-dired-window-configuration) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
946 (message "Processing %s...done" file)) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
947 nil t)) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
948 (dired-move-to-filename)) |
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 |
927 | 950 ;; Here's the major entry point. |
904 | 951 |
927 | 952 ;;;###autoload |
904 | 953 (defun vc-next-action (verbose) |
954 "Do the next logical checkin or checkout operation on the current file. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
955 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
956 If you call this from within a VC dired buffer with no files marked, |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
957 it will operate on the file in the current line. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
958 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
959 If you call this from within a VC dired buffer, and one or more |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
960 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
|
961 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
|
962 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
|
963 lock steals will raise an error. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
964 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
965 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
|
966 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
967 For RCS and SCCS files: |
904 | 968 If the file is not already registered, this registers it for version |
21517
4d5cd99a3d51
(vc-next-action-on-file): Don't check out after registering. This is
André Spiegel <spiegel@gnu.org>
parents:
21448
diff
changeset
|
969 control. |
904 | 970 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
|
971 a writable and locked file ready for editing. |
904 | 972 If the file is checked out and locked by the calling user, this |
973 first checks to see if the file has changed since checkout. If not, | |
974 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
|
975 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
|
976 of a log message; when the message has been entered, it checks in the |
904 | 977 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
|
978 the variable `vc-keep-workfiles' is non-nil (which is its default), a |
904 | 979 read-only copy of the changed file is left in place afterwards. |
980 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
|
981 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
|
982 |
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
983 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
|
984 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
|
985 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
|
986 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
|
987 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
|
988 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
|
989 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
|
990 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
|
991 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
|
992 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
|
993 |
904 | 994 (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
|
995 (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
|
996 (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
|
997 (let ((files (dired-get-marked-files))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
998 (set (make-local-variable 'vc-dired-window-configuration) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
999 (current-window-configuration)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1000 (if (string= "" |
12968
a0d985336555
(vc-dired-update-line): Don't use dired-do-redisplay.
André Spiegel <spiegel@gnu.org>
parents:
12943
diff
changeset
|
1001 (mapconcat |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1002 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1003 (if (not (vc-up-to-date-p f)) "@" "")) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1004 files "")) |
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1005 (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
|
1006 (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
|
1007 "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
|
1008 '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
|
1009 (throw 'nogo nil))) |
21448
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1010 (while vc-parent-buffer |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1011 (pop-to-buffer vc-parent-buffer)) |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1012 (if buffer-file-name |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1013 (vc-next-action-on-file buffer-file-name verbose) |
1b5746e92464
(vc-next-action): Fixed bug that prevented registering files using C-x v v.
André Spiegel <spiegel@gnu.org>
parents:
21370
diff
changeset
|
1014 (error "Buffer %s is not associated with a file" (buffer-name))))) |
904 | 1015 |
1016 ;;; These functions help the vc-next-action entry point | |
1017 | |
927 | 1018 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1019 (defun vc-register (&optional set-version comment) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1020 "Register the current file into a version control system. |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1021 With prefix argument SET-VERSION, allow user to specify initial version |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1022 level. If COMMENT is present, use that as an initial comment. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1023 |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1024 The version control system to use is found by cycling through the list |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1025 `vc-handled-backends'. The first backend in that list which declares |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1026 itself responsible for the file (usually because other files in that |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1027 directory are already registered under that backend) will be used to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1028 register the file. If no backend declares itself responsible, the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1029 first backend that could register the file is used." |
904 | 1030 (interactive "P") |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1031 (unless buffer-file-name (error "No visited file")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1032 (when (vc-backend buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1033 (if (vc-registered buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1034 (error "This file is already registered") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1035 (unless (y-or-n-p "Previous master file has vanished. Make a new one? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1036 (error "Aborted")))) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1037 ;; 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
|
1038 ;; 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
|
1039 (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
|
1040 (zerop (buffer-size)) |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
1041 (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
|
1042 (set-buffer-modified-p t)) |
904 | 1043 (vc-buffer-sync) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1044 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1045 (vc-start-entry buffer-file-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1046 (if set-version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1047 (read-string "Initial version level for %s: " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1048 (buffer-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1049 ;; TODO: Use backend-specific init version. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1050 vc-default-init-version) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1051 (or comment (not vc-initial-comment)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1052 "Enter initial comment." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1053 (lambda (file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1054 (message "Registering %s... " file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1055 (let ((backend (vc-responsible-backend file))) |
31520
f9d2d484e1e2
* vc-sccs.el (vc-sccs-register):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31435
diff
changeset
|
1056 (vc-file-clearprops file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1057 (vc-call-backend backend 'register file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1058 (vc-file-setprop file 'vc-backend backend) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1059 (unless vc-make-backup-files |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1060 (make-local-variable 'backup-inhibited) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1061 (setq backup-inhibited t))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1062 (message "Registering %s... done" file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1063 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1064 (defun vc-responsible-backend (file &optional register) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1065 "Return the name of the backend system that is responsible for FILE. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1066 If no backend in variable `vc-handled-backends' declares itself |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1067 responsible, the first backend in that list will be returned (if optional |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1068 arg REGISTER is non-nil, return the first backend that could register the |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1069 file). |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1070 FILE can also be a directory name (ending with a slash)." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1071 (if (null vc-handled-backends) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1072 (error "Cannot register, no backends in `vc-handled-backends'")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1073 (or (and (not (file-directory-p file)) (vc-backend file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1074 (catch 'found |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1075 (mapcar (lambda (backend) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1076 (if (vc-call-backend backend 'responsible-p file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1077 (throw 'found backend))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1078 vc-handled-backends) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1079 (if register |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1080 (mapcar (lambda (backend) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1081 (if (vc-call-backend backend 'could-register file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1082 (throw 'found backend))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1083 vc-handled-backends) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1084 (car vc-handled-backends))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1085 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1086 (defun vc-default-responsible-p (backend file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1087 "Indicate whether BACKEND is reponsible for FILE. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1088 The default is to return nil always." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1089 nil) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1090 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1091 (defun vc-default-could-register (backend file) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1092 "Return non-nil if BACKEND could be used to register FILE. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1093 The default implementation returns t for all files." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1094 t) |
904 | 1095 |
1478
429e23e87072
(vc-resynch-window): New arg NOQUERY. Pass it to vc-revert-buffer1.
Richard M. Stallman <rms@gnu.org>
parents:
1352
diff
changeset
|
1096 (defun vc-resynch-window (file &optional keep noquery) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1097 "If FILE is in the current buffer, either revert or unvisit it. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1098 The choice between revert (to see expanded keywords) and unvisit depends on |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1099 `vc-keep-workfiles'. NOQUERY if non-nil inhibits confirmation for |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1100 reverting. NOQUERY should be t *only* if it is known the only |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1101 difference between the buffer and the file is due to version control |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1102 rather than user editing!" |
904 | 1103 (and (string= buffer-file-name file) |
1104 (if keep | |
1105 (progn | |
1905
494dd05d460c
* files.el (revert-buffer): Reverse the sense of the first
Jim Blandy <jimb@redhat.com>
parents:
1674
diff
changeset
|
1106 (vc-revert-buffer1 t noquery) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1107 ;; TODO: Adjusting view mode might no longer be necessary |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1108 ;; after RMS change to files.el of 1999-08-08. Investigate |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1109 ;; this when we install the new VC. |
20602
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1110 (and view-read-only |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1111 (if (file-writable-p file) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1112 (and view-mode |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1113 (let ((view-old-buffer-read-only nil)) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1114 (view-mode-exit))) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1115 (and (not view-mode) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1116 (not (eq (get major-mode 'mode-class) 'special)) |
e8566ea47491
(vc-resynch-window): Behave properly when view-read-only is non-nil.
André Spiegel <spiegel@gnu.org>
parents:
19484
diff
changeset
|
1117 (view-mode-enter)))) |
904 | 1118 (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
|
1119 (kill-buffer (current-buffer))))) |
904 | 1120 |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1121 (defun vc-resynch-buffer (file &optional keep noquery) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1122 "If FILE is currently visited, resynch its buffer." |
21113
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1123 (if (string= buffer-file-name file) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1124 (vc-resynch-window file keep noquery) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1125 (let ((buffer (get-file-buffer file))) |
fcf0d1459d81
(vc-context-matches-p): New function.
André Spiegel <spiegel@gnu.org>
parents:
20988
diff
changeset
|
1126 (if buffer |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1127 (with-current-buffer buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1128 (vc-resynch-window file keep noquery))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1129 (vc-dired-resynch-file file)) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1130 |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1131 (defun vc-start-entry (file rev comment msg action &optional after-hook) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1132 "Accept a comment for an operation on FILE revision REV. |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1133 If COMMENT is nil, pop up a VC-log buffer, emit MSG, and set the |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1134 action on close to ACTION; otherwise, do action immediately. Remember |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1135 the file's buffer in `vc-parent-buffer' (current one if no file). |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1136 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
|
1137 (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
|
1138 (if vc-before-checkin-hook |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1139 (if file |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1140 (with-current-buffer parent |
17274
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1141 (run-hooks 'vc-before-checkin-hook)) |
c8228f461dda
(vc-checkin-hook): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
17201
diff
changeset
|
1142 (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
|
1143 (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
|
1144 (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
|
1145 (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
|
1146 (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
|
1147 (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
|
1148 (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
|
1149 (if file (vc-mode-line file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1150 (vc-log-edit file) |
8159
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1151 (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
|
1152 (if after-hook |
513f25ffd93d
(vc-start-entry): New arg after-hook.
Richard M. Stallman <rms@gnu.org>
parents:
8120
diff
changeset
|
1153 (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
|
1154 (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
|
1155 (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
|
1156 (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
|
1157 (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
|
1158 (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
|
1159 (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
|
1160 (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
|
1161 (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
|
1162 (vc-finish-logentry nil))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1163 (message "%s Type C-c C-c when done" msg)))) |
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
|
1164 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
1165 (defun vc-checkout (file &optional writable rev) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1166 "Retrieve a copy of the revision REV of FILE. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1167 If WRITABLE is non-nil, make sure the retrieved file is writable. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1168 REV defaults to the latest revision." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1169 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1170 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1171 (condition-case err |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1172 (vc-call checkout file writable rev) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1173 (file-error |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1174 ;; Maybe the backend is not installed ;-( |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1175 (when writable |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1176 (let ((buf (get-file-buffer file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1177 (when buf (with-current-buffer buf (toggle-read-only -1))))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1178 (signal (car err) (cdr err)))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1179 `((vc-state ,(if (or (eq (vc-checkout-model file) 'implicit) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1180 (not writable)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1181 (if (vc-call latest-on-branch-p file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1182 'up-to-date |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1183 'needs-patch) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1184 'edited)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1185 (vc-checkout-time ,(nth 5 (file-attributes file))))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1186 (vc-resynch-buffer file t t)) |
904 | 1187 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1188 (defun vc-steal-lock (file rev owner) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1189 "Steal the lock on FILE." |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1190 (let (file-description) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1191 (if rev |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1192 (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
|
1193 (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
|
1194 (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
|
1195 file-description owner))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1196 (error "Steal canceled")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1197 (compose-mail owner (format "Stolen lock on %s" file-description) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1198 nil nil nil nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1199 (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
|
1200 (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
|
1201 (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
|
1202 (insert |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1203 (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
|
1204 (current-time-string) |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1205 ".\n") |
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
1206 (message "Please explain why you stole the lock. Type C-c C-c when done."))) |
904 | 1207 |
1208 (defun vc-finish-steal (file version) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1209 ;; This is called when the notification has been sent. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1210 (message "Stealing lock on %s..." file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1211 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1212 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1213 (vc-call steal-lock file version) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1214 `((vc-state edited))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1215 (vc-resynch-buffer file t t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1216 (message "Stealing lock on %s...done" file)) |
904 | 1217 |
1218 (defun vc-checkin (file &optional rev comment) | |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1219 "Check in FILE. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1220 The optional argument REV may be a string specifying the new version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1221 level (if nil increment the current level). COMMENT is a comment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1222 string; if omitted, a buffer is popped up to accept a comment. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1223 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1224 If `vc-keep-workfiles' is nil, FILE is deleted afterwards, provided |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1225 that the version control system supports this mode of operation. |
20967 | 1226 |
1227 Runs the normal hook `vc-checkin-hook'." | |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1228 (vc-start-entry |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1229 file rev comment |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1230 "Enter a change comment." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1231 (lambda (file rev comment) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1232 (message "Checking in %s..." file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1233 ;; "This log message intentionally left almost blank". |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1234 ;; RCS 5.7 gripes about white-space-only comments too. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1235 (or (and comment (string-match "[^\t\n ]" comment)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1236 (setq comment "*** empty log message ***")) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1237 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1238 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1239 ;; Change buffers to get local value of vc-checkin-switches. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1240 (with-current-buffer (or (get-file-buffer file) (current-buffer)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1241 (vc-call checkin file rev comment)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1242 `((vc-state up-to-date) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1243 (vc-checkout-time ,(nth 5 (file-attributes file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1244 (vc-workfile-version nil))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1245 (message "Checking in %s...done" file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1246 'vc-checkin-hook)) |
904 | 1247 |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1248 (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
|
1249 "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
|
1250 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
|
1251 Second arg is file name of change log. \ |
20967 | 1252 If nil, uses `change-log-default-name'. |
1253 | |
1254 May be useful as a `vc-checkin-hook' to update change logs automatically." | |
4158
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
1255 (interactive (if current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
1256 (list current-prefix-arg |
469c093061bf
(vc-comment-to-change-log): Copy interactive spec from
Roland McGrath <roland@gnu.org>
parents:
4156
diff
changeset
|
1257 (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
|
1258 ;; 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
|
1259 ;; before binding it. |
49029e28ed2c
(vc-comment-to-change-log): Load add-log before binding
Karl Heuer <kwzh@gnu.org>
parents:
5732
diff
changeset
|
1260 (require 'add-log) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1261 (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
|
1262 (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
|
1263 ;; 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
|
1264 (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
|
1265 end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1266 ;; 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
|
1267 (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
|
1268 ;; 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
|
1269 (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
|
1270 (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
|
1271 ;; 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
|
1272 ;; 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
|
1273 (delete-char -2)) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1274 ;; 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
|
1275 (just-one-space) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1276 ;; 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
|
1277 (let ((indentation (current-indentation))) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1278 (save-excursion |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1279 (while (< (point) end) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1280 (forward-line 1) |
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1281 (indent-to indentation)) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1282 (setq end (point)))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1283 ;; 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
|
1284 (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
|
1285 (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
|
1286 (beginning-of-line) |
4156
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1287 (fill-region (point) end)) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1288 ;; 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
|
1289 ;; 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
|
1290 (skip-syntax-forward " " end) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1291 (delete-char (- (skip-syntax-backward " "))) |
0000c3af1836
(vc-comment-to-change-log): Canonicalize following whitespace after
Roland McGrath <roland@gnu.org>
parents:
4155
diff
changeset
|
1292 (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
|
1293 (insert "\n")))) |
4155
9f0a271fa24f
(vc-comment-to-change-log): Complete rewrite. Do not use
Roland McGrath <roland@gnu.org>
parents:
4000
diff
changeset
|
1294 |
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
|
1295 (defun vc-finish-logentry (&optional nocomment) |
904 | 1296 "Complete the operation implied by the current log entry." |
1297 (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
|
1298 ;; Check and record the comment, if any. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1299 (unless nocomment |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1300 ;; Comment too long? |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1301 (vc-call-backend (or (and vc-log-file (vc-backend vc-log-file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1302 (vc-responsible-backend default-directory)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1303 'logentry-check) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1304 (run-hooks 'vc-logentry-check-hook) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1305 ;; Record the comment in the comment ring |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1306 (let ((comment (buffer-string))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1307 (unless (and (ring-p vc-comment-ring) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1308 (not (ring-empty-p vc-comment-ring)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1309 (equal comment (ring-ref vc-comment-ring 0))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1310 (ring-insert vc-comment-ring comment)))) |
5428
e66b058ec9f6
(vc-finish-logentry): Sync the buffer in case the user modified it while
Paul Eggert <eggert@twinsun.com>
parents:
5338
diff
changeset
|
1311 ;; 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
|
1312 ;; But not if it is a vc-dired buffer. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1313 (with-current-buffer vc-parent-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1314 (or vc-dired-mode (vc-buffer-sync))) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1315 (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
|
1316 ;; 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
|
1317 (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
|
1318 (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
|
1319 (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
|
1320 (log-entry (buffer-string)) |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1321 (after-hook vc-log-after-operation-hook) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1322 (tmp-vc-parent-buffer vc-parent-buffer)) |
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
|
1323 (pop-to-buffer vc-parent-buffer) |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1324 ;; 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
|
1325 (save-excursion |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1326 (funcall log-operation |
12885
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1327 log-file |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1328 log-version |
5c1941d38daa
(vc-next-action-on-file): Changed doc string, CVS case.
André Spiegel <spiegel@gnu.org>
parents:
12876
diff
changeset
|
1329 log-entry)) |
20661
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1330 ;; Remove checkin window (after the checkin so that if that fails |
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1331 ;; we don't zap the *VC-log* buffer and the typing therein). |
e3498221274f
(vc-finish-logentry): Move killing the log buffer after
Karl Heuer <kwzh@gnu.org>
parents:
20602
diff
changeset
|
1332 (let ((logbuf (get-buffer "*VC-log*"))) |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1333 (cond ((and logbuf vc-delete-logbuf-window) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1334 (delete-windows-on logbuf (selected-frame)) |
22721 | 1335 ;; Kill buffer and delete any other dedicated windows/frames. |
24477
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1336 (kill-buffer logbuf)) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1337 (t (pop-to-buffer "*VC-log*") |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1338 (bury-buffer) |
b3b029a06e34
(vc-delete-logbuf-window): New var.
Karl Heuer <kwzh@gnu.org>
parents:
24139
diff
changeset
|
1339 (pop-to-buffer tmp-vc-parent-buffer)))) |
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
|
1340 ;; 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
|
1341 (if buffer-file-name |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1342 (vc-resynch-buffer buffer-file-name vc-keep-workfiles t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1343 (if vc-dired-mode |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1344 (dired-move-to-filename)) |
17101
436e2bd4efcc
(vc-log-mode): New optional arg FILE. Set vc-log-file here.
Karl Heuer <kwzh@gnu.org>
parents:
16993
diff
changeset
|
1345 (run-hooks after-hook 'vc-finish-logentry-hook))) |
904 | 1346 |
1347 ;; Code for access to the comment ring | |
1348 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1349 (defun vc-new-comment-index (stride len) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1350 (mod (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1351 (vc-comment-ring-index (+ vc-comment-ring-index stride)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1352 ;; Initialize the index on the first use of this command |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1353 ;; so that the first M-p gets index 0, and the first M-n gets |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1354 ;; index -1. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1355 ((> stride 0) (1- stride)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1356 (t stride)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1357 len)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1358 |
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
|
1359 (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
|
1360 "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
|
1361 (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
|
1362 (let ((len (ring-length vc-comment-ring))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1363 (if (<= len 0) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1364 (progn (message "Empty comment ring") (ding)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1365 (erase-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1366 (setq vc-comment-ring-index (vc-new-comment-index arg len)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1367 (message "Comment %d" (1+ vc-comment-ring-index)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1368 (insert (ring-ref vc-comment-ring vc-comment-ring-index))))) |
904 | 1369 |
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
|
1370 (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
|
1371 "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
|
1372 (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
|
1373 (vc-previous-comment (- arg))) |
904 | 1374 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1375 (defun vc-comment-search-reverse (str &optional stride) |
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
|
1376 "Searches backwards through comment history for substring match." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1377 ;; Why substring rather than regexp ? -sm |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1378 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1379 (list (read-string "Comment substring: " nil nil vc-last-comment-match))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1380 (unless stride (setq stride 1)) |
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
|
1381 (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
|
1382 (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
|
1383 (setq vc-last-comment-match str)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1384 (let* ((str (regexp-quote str)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1385 (len (ring-length vc-comment-ring)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1386 (n (vc-new-comment-index stride len))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1387 (while (progn (when (or (>= n len) (< n 0)) (error "Not found")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1388 (not (string-match str (ring-ref vc-comment-ring n)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1389 (setq n (+ n stride))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1390 (setq vc-comment-ring-index n) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1391 (vc-previous-comment 0))) |
904 | 1392 |
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
|
1393 (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
|
1394 "Searches forwards through comment history for substring match." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1395 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1396 (list (read-string "Comment substring: " nil nil vc-last-comment-match))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1397 (vc-comment-search-reverse str -1)) |
904 | 1398 |
1399 ;; Additional entry points for examining version histories | |
1400 | |
927 | 1401 ;;;###autoload |
5338
b3a78854c791
(vc-buffer-sync, vc-diff): New arg NOT-URGENT.
Richard M. Stallman <rms@gnu.org>
parents:
5263
diff
changeset
|
1402 (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
|
1403 "Display diffs between file versions. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1404 Normally this compares the current file and buffer with the most recent |
2667
62869d996485
(vc-backend-diff): Use diff-switches, not vc-diff-options.
Richard M. Stallman <rms@gnu.org>
parents:
2666
diff
changeset
|
1405 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
|
1406 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
|
1407 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
|
1408 (interactive (list current-prefix-arg t)) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1409 (vc-ensure-vc-buffer) |
904 | 1410 (if historic |
1411 (call-interactively 'vc-version-diff) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1412 (let ((file buffer-file-name)) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1413 (vc-buffer-sync not-urgent) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1414 (if (vc-workfile-unchanged-p buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1415 (message "No changes to %s since latest version" file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1416 (vc-version-diff file nil nil))))) |
904 | 1417 |
1418 (defun vc-version-diff (file rel1 rel2) | |
1419 "For FILE, report diffs between two stored versions REL1 and REL2 of it. | |
1420 If FILE is a directory, generate diffs between versions for all registered | |
1421 files in or below it." | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1422 (interactive |
27436
564f85cd6921
(vc-version-diff): Make sure file name is expanded.
Gerd Moellmann <gerd@gnu.org>
parents:
26685
diff
changeset
|
1423 (let ((file (expand-file-name |
564f85cd6921
(vc-version-diff): Make sure file name is expanded.
Gerd Moellmann <gerd@gnu.org>
parents:
26685
diff
changeset
|
1424 (read-file-name (if buffer-file-name |
564f85cd6921
(vc-version-diff): Make sure file name is expanded.
Gerd Moellmann <gerd@gnu.org>
parents:
26685
diff
changeset
|
1425 "File or dir to diff: (default visited file) " |
564f85cd6921
(vc-version-diff): Make sure file name is expanded.
Gerd Moellmann <gerd@gnu.org>
parents:
26685
diff
changeset
|
1426 "File or dir to diff: ") |
564f85cd6921
(vc-version-diff): Make sure file name is expanded.
Gerd Moellmann <gerd@gnu.org>
parents:
26685
diff
changeset
|
1427 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
|
1428 (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
|
1429 ;; 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
|
1430 (cond |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1431 ;; if it's a directory, don't supply any version default |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1432 ((file-directory-p file) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1433 nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1434 ;; if the file is not up-to-date, use current version as older version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1435 ((not (vc-up-to-date-p file)) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1436 (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
|
1437 ;; 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
|
1438 (t |
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1439 (setq rel1-default (vc-previous-version (vc-workfile-version file))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1440 (if (string= rel1-default "") (setq rel1-default nil)) |
19055
5439070e5d46
(vc-backend-checkin): For CVS, forget the checkout model after commit.
Richard M. Stallman <rms@gnu.org>
parents:
18857
diff
changeset
|
1441 (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
|
1442 ;; construct argument list |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1443 (list file |
19126
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1444 (read-string (if rel1-default |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1445 (concat "Older version: (default " |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1446 rel1-default ") ") |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1447 "Older version: ") |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1448 nil nil rel1-default) |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1449 (read-string (if rel2-default |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1450 (concat "Newer version: (default " |
c57d673ff676
(vc-version-diff): Use defaults, not initial input,
Richard M. Stallman <rms@gnu.org>
parents:
19055
diff
changeset
|
1451 rel2-default ") ") |
19177
31175a4bf0a6
(vc-version-diff): Change the Newer version prompt.
Richard M. Stallman <rms@gnu.org>
parents:
19126
diff
changeset
|
1452 "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
|
1453 nil nil rel2-default)))) |
904 | 1454 (if (string-equal rel1 "") (setq rel1 nil)) |
1455 (if (string-equal rel2 "") (setq rel2 nil)) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1456 (vc-setup-buffer "*vc-diff*") |
904 | 1457 (if (file-directory-p file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1458 (let ((inhibit-read-only t)) |
2085
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1459 (insert "Diffs between " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1460 (or rel1 "last version checked in") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1461 " and " |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1462 (or rel2 "current workfile(s)") |
a5e2213a5c4a
Version 5 baseline.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2054
diff
changeset
|
1463 ":\n\n") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1464 (setq default-directory (file-name-as-directory file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1465 ;; FIXME: this should do a single exec in CVS. |
904 | 1466 (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
|
1467 default-directory |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1468 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1469 (vc-exec-after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1470 `(progn |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1471 (message "Looking at %s" ',f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1472 (vc-call-backend ',(vc-backend file) 'diff ',f ',rel1 ',rel2))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1473 (vc-exec-after `(let ((inhibit-read-only t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1474 (insert "\nEnd of diffs.\n")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1475 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1476 (cd (file-name-directory file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1477 (vc-call diff file rel1 rel2)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1478 (if (and (zerop (buffer-size)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1479 (not (get-buffer-process (current-buffer)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1480 (progn |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1481 (if rel1 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1482 (if rel2 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1483 (message "No changes to %s between %s and %s" file rel1 rel2) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1484 (message "No changes to %s since %s" file rel1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1485 (message "No changes to %s since latest version" file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1486 nil) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1487 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1488 ;; Gnus-5.8.5 sets up an autoload for diff-mode, even if it's |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1489 ;; not available. Work around that. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1490 (if (require 'diff-mode nil t) (diff-mode)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1491 (vc-exec-after '(progn (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1492 (shrink-window-if-larger-than-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1493 t)) |
904 | 1494 |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1495 ;;;###autoload |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1496 (defun vc-version-other-window (rev) |
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1497 "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
|
1498 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
|
1499 If `F.~REV~' already exists, it is used instead of being re-created." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1500 (interactive "sVersion to visit (default is workfile version): ") |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1501 (vc-ensure-vc-buffer) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1502 (let* ((version (if (string-equal rev "") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1503 (vc-workfile-version buffer-file-name) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1504 rev)) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1505 (filename (concat buffer-file-name ".~" version "~"))) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1506 (or (file-exists-p filename) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1507 (vc-call checkout buffer-file-name nil version filename)) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1508 (find-file-other-window filename))) |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
1509 |
904 | 1510 ;; Header-insertion code |
1511 | |
927 | 1512 ;;;###autoload |
904 | 1513 (defun vc-insert-headers () |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1514 "Insert headers in a file for use with your version control system. |
23235 | 1515 Headers desired are inserted at point, and are pulled from |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1516 the variable `vc-BACKEND-header'." |
904 | 1517 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1518 (vc-ensure-vc-buffer) |
904 | 1519 (save-excursion |
1520 (save-restriction | |
1521 (widen) | |
1522 (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
|
1523 (y-or-n-p "Version headers already exist. Insert another set? ")) |
904 | 1524 (progn |
1525 (let* ((delims (cdr (assq major-mode vc-comment-alist))) | |
1526 (comment-start-vc (or (car delims) comment-start "#")) | |
1527 (comment-end-vc (or (car (cdr delims)) comment-end "")) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1528 (hdsym (vc-make-backend-sym (vc-backend (buffer-file-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1529 'header)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1530 (hdstrings (and (boundp hdsym) (symbol-value hdsym)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1531 (mapcar (lambda (s) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1532 (insert comment-start-vc "\t" s "\t" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1533 comment-end-vc "\n")) |
904 | 1534 hdstrings) |
1535 (if vc-static-header-alist | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1536 (mapcar (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1537 (if (string-match (car f) buffer-file-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1538 (insert (format (cdr f) (car hdstrings))))) |
904 | 1539 vc-static-header-alist)) |
1540 ) | |
1541 ))))) | |
1542 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1543 (defun vc-clear-headers (&optional file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1544 "Clear all version headers in the current buffer (or FILE). |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1545 I.e. reset them to the non-expanded form." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1546 (let* ((filename (or file buffer-file-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1547 (visited (find-buffer-visiting filename)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1548 (backend (vc-backend filename))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1549 (when (vc-find-backend-function backend 'clear-headers) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1550 (if visited |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1551 (let ((context (vc-buffer-context))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1552 ;; save-excursion may be able to relocate point and mark |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1553 ;; properly. If it fails, vc-restore-buffer-context |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1554 ;; will give it a second try. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1555 (save-excursion |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1556 (vc-call-backend backend 'clear-headers)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1557 (vc-restore-buffer-context context)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1558 (find-file filename) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1559 (vc-call-backend backend 'clear-headers) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1560 (kill-buffer filename))))) |
12872
857663042672
(vc-revert-buffer1): Split part of the function into vc-buffer-context
André Spiegel <spiegel@gnu.org>
parents:
12819
diff
changeset
|
1561 |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1562 ;;;###autoload |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1563 (defun vc-merge () |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1564 "Merge changes between two versions into the current buffer's file. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1565 This asks for two versions to merge from in the minibuffer. If the |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1566 first version is a branch number, then merge all changes from that |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1567 branch. If the first version is empty, merge news, i.e. recent changes |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1568 from the current branch. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1569 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1570 See Info node `Merging'." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1571 (interactive) |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1572 (vc-ensure-vc-buffer) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1573 (vc-buffer-sync) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1574 (let* ((file buffer-file-name) |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1575 (backend (vc-backend file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1576 (state (vc-state file)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1577 first-version second-version status) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1578 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1579 ((stringp state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1580 (error "File is locked by %s" state)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1581 ((not (vc-editable-p file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1582 (if (y-or-n-p |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1583 "File must be checked out for merging. Check out now? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1584 (vc-checkout file t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1585 (error "Merge aborted")))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1586 (setq first-version |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1587 (read-string (concat "Branch or version to merge from " |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1588 "(default: news on current branch): "))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1589 (if (string= first-version "") |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1590 (if (not (vc-find-backend-function backend 'merge-news)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1591 (error "Sorry, merging news is not implemented for %s" backend) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1592 (setq status (vc-call merge-news file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1593 (if (not (vc-find-backend-function backend 'merge)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1594 (error "Sorry, merging is not implemented for %s" backend) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1595 (if (not (vc-branch-p first-version)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1596 (setq second-version |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1597 (read-string "Second version: " |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1598 (concat (vc-branch-part first-version) "."))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1599 ;; We want to merge an entire branch. Set versions |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1600 ;; accordingly, so that vc-BACKEND-merge understands us. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1601 (setq second-version first-version) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1602 ;; first-version must be the starting point of the branch |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1603 (setq first-version (vc-branch-part first-version))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1604 (setq status (vc-call merge file first-version second-version)))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1605 (vc-maybe-resolve-conflicts file status "WORKFILE" "MERGE SOURCE"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1606 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1607 (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1608 (vc-resynch-buffer file t (not (buffer-modified-p))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1609 (if (zerop status) (message "Merge successful") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1610 (if (fboundp 'smerge-mode) (smerge-mode 1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1611 (if (y-or-n-p "Conflicts detected. Resolve them now? ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1612 (if (fboundp 'smerge-ediff) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1613 (smerge-ediff) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1614 (vc-resolve-conflicts name-A name-B)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1615 (message "File contains conflict markers")))) |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1616 |
23792
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1617 (defvar vc-ediff-windows) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1618 (defvar vc-ediff-result) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1619 (eval-when-compile |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1620 (defvar ediff-buffer-A) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1621 (defvar ediff-buffer-B) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1622 (defvar ediff-buffer-C) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1623 (require 'ediff-util)) |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1624 ;;;###autoload |
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1625 (defun vc-resolve-conflicts (&optional name-A name-B) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1626 "Invoke ediff to resolve conflicts in the current buffer. |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1627 The conflicts must be marked with rcsmerge conflict markers." |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1628 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
1629 (vc-ensure-vc-buffer) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1630 (let* ((found nil) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1631 (file-name (file-name-nondirectory buffer-file-name)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1632 (your-buffer (generate-new-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1633 (concat "*" file-name |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1634 " " (or name-A "WORKFILE") "*"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1635 (other-buffer (generate-new-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1636 (concat "*" file-name |
21368
37b978fc46cb
(vc-merge, vc-backend-merge): New functions.
André Spiegel <spiegel@gnu.org>
parents:
21366
diff
changeset
|
1637 " " (or name-B "CHECKED-IN") "*"))) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1638 (result-buffer (current-buffer))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1639 (save-excursion |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1640 (set-buffer your-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1641 (erase-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1642 (insert-buffer result-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1643 (goto-char (point-min)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1644 (while (re-search-forward (concat "^<<<<<<< " |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1645 (regexp-quote file-name) "\n") nil t) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1646 (setq found t) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1647 (replace-match "") |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1648 (if (not (re-search-forward "^=======\n" nil t)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1649 (error "Malformed conflict marker")) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1650 (replace-match "") |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1651 (let ((start (point))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1652 (if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1653 (error "Malformed conflict marker")) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1654 (delete-region start (point)))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1655 (if (not found) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1656 (progn |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1657 (kill-buffer your-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1658 (kill-buffer other-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1659 (error "No conflict markers found"))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1660 (set-buffer other-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1661 (erase-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1662 (insert-buffer result-buffer) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1663 (goto-char (point-min)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1664 (while (re-search-forward (concat "^<<<<<<< " |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1665 (regexp-quote file-name) "\n") nil t) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1666 (let ((start (match-beginning 0))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1667 (if (not (re-search-forward "^=======\n" nil t)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1668 (error "Malformed conflict marker")) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1669 (delete-region start (point)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1670 (if (not (re-search-forward "^>>>>>>> [0-9.]+\n" nil t)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1671 (error "Malformed conflict marker")) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1672 (replace-match ""))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1673 (let ((config (current-window-configuration)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1674 (ediff-default-variant 'default-B)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1675 |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1676 ;; Fire up ediff. |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1677 |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1678 (set-buffer (ediff-merge-buffers your-buffer other-buffer)) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1679 |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1680 ;; Ediff is now set up, and we are in the control buffer. |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1681 ;; Do a few further adjustments and take precautions for exit. |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1682 |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1683 (make-local-variable 'vc-ediff-windows) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1684 (setq vc-ediff-windows config) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1685 (make-local-variable 'vc-ediff-result) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1686 (setq vc-ediff-result result-buffer) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1687 (make-local-variable 'ediff-quit-hook) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1688 (setq ediff-quit-hook |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1689 (lambda () |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1690 (let ((buffer-A ediff-buffer-A) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1691 (buffer-B ediff-buffer-B) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1692 (buffer-C ediff-buffer-C) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1693 (result vc-ediff-result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1694 (windows vc-ediff-windows)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1695 (ediff-cleanup-mess) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1696 (set-buffer result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1697 (erase-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1698 (insert-buffer buffer-C) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1699 (kill-buffer buffer-A) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1700 (kill-buffer buffer-B) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1701 (kill-buffer buffer-C) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1702 (set-window-configuration windows) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1703 (message "Conflict resolution finished; you may save the buffer")))) |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1704 (message "Please resolve conflicts now; exit ediff when done") |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1705 nil)))) |
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
1706 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1707 ;; 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
|
1708 ;; 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
|
1709 |
23792
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1710 (defvar vc-dired-switches) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1711 (defvar vc-dired-terse-mode) |
ec06ad058029
(vc-dired-window-configuration, vc-ediff-windows,
André Spiegel <spiegel@gnu.org>
parents:
23635
diff
changeset
|
1712 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1713 (defvar vc-dired-mode-map |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1714 (let ((map (make-sparse-keymap)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1715 (vmap (make-sparse-keymap))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1716 (define-key map "\C-xv" vc-prefix-map) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1717 ;; Emacs-20 has a lousy keymap inheritance that won't work here. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1718 ;; Emacs-21's is still lousy but just better enough that it'd work. -sm |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1719 ;; (set-keymap-parent vmap vc-prefix-map) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1720 (setq vmap vc-prefix-map) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1721 (define-key map "v" vmap) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1722 (define-key vmap "t" 'vc-dired-toggle-terse-mode) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1723 map)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1724 |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1725 (define-derived-mode vc-dired-mode dired-mode "Dired under VC" |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1726 "The major mode used in VC directory buffers. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1727 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1728 It works like Dired, but lists only files under version control, with |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1729 the current VC state of each file being indicated in the place of the |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1730 file's link count, owner, group and size. Subdirectories are also |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1731 listed, and you may insert them into the buffer as desired, like in |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1732 Dired. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1733 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1734 All Dired commands operate normally, with the exception of `v', which |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1735 is redefined as the version control prefix, so that you can type |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1736 `vl', `v=' etc. to invoke `vc-print-log', `vc-diff', and the like on |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1737 the file named in the current Dired buffer line. `vv' invokes |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1738 `vc-next-action' on this file, or on all files currently marked. |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1739 There is a special command, `*l', to mark all files currently locked." |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1740 ;; define-derived-mode does it for us in Emacs-21, but not in Emacs-20. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1741 ;; We do it here because dired might not be loaded yet |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1742 ;; when vc-dired-mode-map is initialized. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1743 (set-keymap-parent vc-dired-mode-map dired-mode-map) |
21370
e8224143df73
(vc-dired-mode): Make dired-after-readin-hook a local hook, not a local variable.
André Spiegel <spiegel@gnu.org>
parents:
21368
diff
changeset
|
1744 (make-local-hook 'dired-after-readin-hook) |
e8224143df73
(vc-dired-mode): Make dired-after-readin-hook a local hook, not a local variable.
André Spiegel <spiegel@gnu.org>
parents:
21368
diff
changeset
|
1745 (add-hook 'dired-after-readin-hook 'vc-dired-hook nil t) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1746 ;; The following is slightly modified from dired.el, |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1747 ;; because file lines look a bit different in vc-dired-mode. |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1748 (set (make-local-variable 'dired-move-to-filename-regexp) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1749 (let* |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1750 ((l "\\([A-Za-z]\\|[^\0-\177]\\)") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1751 ;; In some locales, month abbreviations are as short as 2 letters, |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1752 ;; and they can be padded on the right with spaces. |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1753 (month (concat l l "+ *")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1754 ;; Recognize any non-ASCII character. |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1755 ;; The purpose is to match a Kanji character. |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1756 (k "[^\0-\177]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1757 ;; (k "[^\x00-\x7f\x80-\xff]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1758 (s " ") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1759 (yyyy "[0-9][0-9][0-9][0-9]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1760 (mm "[ 0-1][0-9]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1761 (dd "[ 0-3][0-9]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1762 (HH:MM "[ 0-2][0-9]:[0-5][0-9]") |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1763 (western (concat "\\(" month s dd "\\|" dd s month "\\)" |
24852
fb28ec3f61c7
Undo previous undo -- spiegel's change already corrected rms's.
Karl Heuer <kwzh@gnu.org>
parents:
24850
diff
changeset
|
1764 s "\\(" HH:MM "\\|" s yyyy"\\|" yyyy s "\\)")) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1765 (japanese (concat mm k s dd k s "\\(" s HH:MM "\\|" yyyy k "\\)"))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1766 ;; the .* below ensures that we find the last match on a line |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1767 (concat ".*" s "\\(" western "\\|" japanese "\\)" s))) |
22356
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
1768 (and (boundp 'vc-dired-switches) |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
1769 vc-dired-switches |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
1770 (set (make-local-variable 'dired-actual-switches) |
a1f8c5a5c3e1
(vc-directory): Bind vc-dired-switches in order to pass switches to vc-dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
22345
diff
changeset
|
1771 vc-dired-switches)) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1772 (set (make-local-variable 'vc-dired-terse-mode) vc-dired-terse-display) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1773 (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
|
1774 |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1775 (defun vc-dired-toggle-terse-mode () |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1776 "Toggle terse display in VC Dired." |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1777 (interactive) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1778 (if (not vc-dired-mode) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1779 nil |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1780 (setq vc-dired-terse-mode (not vc-dired-terse-mode)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1781 (if vc-dired-terse-mode |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1782 (vc-dired-hook) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1783 (revert-buffer)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1784 |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1785 (defun vc-dired-mark-locked () |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1786 "Mark all files currently locked." |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1787 (interactive) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1788 (dired-mark-if (let ((f (dired-get-filename nil t))) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1789 (and f |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1790 (not (file-directory-p f)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1791 (not (vc-up-to-date-p f)))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1792 "locked file")) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1793 |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1794 (define-key vc-dired-mode-map "*l" 'vc-dired-mark-locked) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1795 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1796 (defun vc-default-dired-state-info (backend file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1797 (let ((state (vc-state file))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1798 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1799 ((stringp state) (concat "(" state ")")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1800 ((eq state 'edited) (concat "(" (vc-user-login-name) ")")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1801 ((eq state 'needs-merge) "(merge)") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1802 ((eq state 'needs-patch) "(patch)") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1803 ((eq state 'unlocked-changes) "(stale)")))) |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
1804 |
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
|
1805 (defun vc-dired-reformat-line (x) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1806 "Reformat a directory-listing line. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1807 Replace various columns with version control information. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1808 This code, like dired, assumes UNIX -l format." |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1809 (beginning-of-line) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1810 (let ((pos (point)) limit perm date-and-file) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1811 (end-of-line) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1812 (setq limit (point)) |
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1813 (goto-char pos) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1814 (when |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1815 (or |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1816 (re-search-forward ;; owner and group |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1817 "^\\(..[drwxlts-]+ \\) *[0-9]+ [^ ]+ +[^ ]+ +[0-9]+\\( .*\\)" |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1818 limit t) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1819 (re-search-forward ;; only owner displayed |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1820 "^\\(..[drwxlts-]+ \\) *[0-9]+ [^ ]+ +[0-9]+\\( .*\\)" |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1821 limit t) |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1822 (re-search-forward ;; OS/2 -l format, no links, owner, group |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1823 "^\\(..[drwxlts-]+ \\) *[0-9]+\\( .*\\)" |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1824 limit t)) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1825 (setq perm (match-string 1) |
21560
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1826 date-and-file (match-string 2)) |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1827 (setq x (substring (concat x " ") 0 10)) |
9e3de167472c
(vc-dired-mode): Redefine dired-move-to-filename-regexp locally.
André Spiegel <spiegel@gnu.org>
parents:
21559
diff
changeset
|
1828 (replace-match (concat perm x date-and-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
|
1829 |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1830 (defun vc-dired-hook () |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1831 "Reformat the listing according to version control. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1832 Called by dired after any portion of a vc-dired buffer has been read in." |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1833 (message "Getting version information... ") |
21908
e35eb91f05cc
(vc-fetch-cvs-status): Don't specify DIR on the command line.
André Spiegel <spiegel@gnu.org>
parents:
21669
diff
changeset
|
1834 (let (subdir filename (buffer-read-only nil) cvs-dir) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1835 (goto-char (point-min)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1836 (while (not (eobp)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1837 (cond |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1838 ;; subdir header line |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1839 ((setq subdir (dired-get-subdir)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1840 ;; if the backend supports it, get the state |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1841 ;; of all files in this directory at once |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1842 (let ((backend (vc-responsible-backend subdir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1843 (if (vc-find-backend-function backend 'dir-state) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1844 (vc-call-backend backend 'dir-state subdir))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1845 (forward-line 1) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1846 ;; erase (but don't remove) the "total" line |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1847 (delete-region (point) (line-end-position)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1848 (beginning-of-line) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1849 (forward-line 1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1850 ;; file line |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1851 ((setq filename (dired-get-filename nil t)) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1852 (cond |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1853 ;; subdir |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1854 ((file-directory-p filename) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1855 (cond |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1856 ((member (file-name-nondirectory filename) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1857 vc-directory-exclusion-list) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1858 (let ((pos (point))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1859 (dired-kill-tree filename) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1860 (goto-char pos) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1861 (dired-kill-line))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1862 (vc-dired-terse-mode |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1863 ;; Don't show directories in terse mode. Don't use |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1864 ;; dired-kill-line to remove it, because in recursive listings, |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1865 ;; that would remove the directory contents as well. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1866 (delete-region (line-beginning-position) |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1867 (progn (forward-line 1) (point)))) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1868 ((string-match "\\`\\.\\.?\\'" (file-name-nondirectory filename)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1869 (dired-kill-line)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1870 (t |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1871 (vc-dired-reformat-line nil) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1872 (forward-line 1)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1873 ;; ordinary file |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1874 ((and (vc-backend filename) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1875 (not (and vc-dired-terse-mode |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1876 (vc-up-to-date-p filename)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1877 (vc-dired-reformat-line (vc-call dired-state-info filename)) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1878 (forward-line 1)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1879 (t |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1880 (dired-kill-line)))) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1881 ;; any other line |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1882 (t (forward-line 1)))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1883 (vc-dired-purge)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1884 (message "Getting version information... done") |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1885 (save-restriction |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1886 (widen) |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1887 (cond ((eq (count-lines (point-min) (point-max)) 1) |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1888 (goto-char (point-min)) |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1889 (message "No files locked under %s" default-directory))))) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1890 |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1891 (defun vc-dired-purge () |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1892 "Remove empty subdirs." |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1893 (let (subdir) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1894 (goto-char (point-min)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1895 (while (setq subdir (dired-get-subdir)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1896 (forward-line 2) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1897 (if (dired-get-filename nil t) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1898 (if (not (dired-next-subdir 1 t)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1899 (goto-char (point-max))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1900 (forward-line -2) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1901 (if (not (string= (dired-current-directory) default-directory)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1902 (dired-do-kill-lines t "") |
22453
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1903 ;; We cannot remove the top level directory. |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1904 ;; Just make it look a little nicer. |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1905 (forward-line 1) |
9d9df85eb7fb
(vc-dired-hook): Don't use dired-kill-line to remove directory lines
André Spiegel <spiegel@gnu.org>
parents:
22437
diff
changeset
|
1906 (kill-line) |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1907 (if (not (dired-next-subdir 1 t)) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1908 (goto-char (point-max)))))) |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1909 (goto-char (point-min)))) |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1910 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1911 (defun vc-dired-buffers-for-dir (dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1912 "Return a list of all vc-dired buffers that currently display DIR." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1913 (let (result) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1914 ;; Check whether dired is loaded. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1915 (when (fboundp 'dired-buffers-for-dir) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1916 (mapcar (lambda (buffer) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1917 (with-current-buffer buffer |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1918 (if vc-dired-mode |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1919 (setq result (append result (list buffer)))))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1920 (dired-buffers-for-dir dir))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1921 result)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1922 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1923 (defun vc-dired-resynch-file (file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1924 "Update the entries for FILE in any VC Dired buffers that list it." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1925 (let ((buffers (vc-dired-buffers-for-dir (file-name-directory file)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1926 (when buffers |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1927 (mapcar (lambda (buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1928 (with-current-buffer buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1929 (if (dired-goto-file file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1930 ;; bind vc-dired-terse-mode to nil so that |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1931 ;; files won't vanish when they are checked in |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1932 (let ((vc-dired-terse-mode nil)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1933 (dired-do-redisplay 1))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1934 buffers)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1935 |
927 | 1936 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1937 (defun vc-directory (dir read-switches) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1938 "Create a buffer in VC Dired Mode for directory DIR. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1939 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1940 See Info node `VC Dired Mode'. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1941 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1942 With prefix arg READ-SWITCHES, specify a value to override |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1943 `dired-listing-switches' when generating the listing." |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
1944 (interactive "DDired under VC (directory): \nP") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1945 (let ((vc-dired-switches (concat vc-dired-listing-switches |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1946 (if vc-dired-recurse "R" "")))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1947 (if read-switches |
22437
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1948 (setq vc-dired-switches |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1949 (read-string "Dired listing switches: " |
982bf2f2c1de
(vc-dired-recurse, vc-dired-terse-display): New user options.
André Spiegel <spiegel@gnu.org>
parents:
22356
diff
changeset
|
1950 vc-dired-switches))) |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1951 (require 'dired) |
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1952 (require 'dired-aux) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1953 (switch-to-buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1954 (dired-internal-noselect (expand-file-name (file-name-as-directory dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1955 vc-dired-switches |
21357
b0e5a2784761
(vc-next-action-dired): Use dired-do-redisplay. Handle
Richard M. Stallman <rms@gnu.org>
parents:
21329
diff
changeset
|
1956 'vc-dired-mode)))) |
10475
2d9590603a06
Revert Jan 15 and Jan 5 changes.
Richard M. Stallman <rms@gnu.org>
parents:
10431
diff
changeset
|
1957 |
904 | 1958 |
1959 ;; Named-configuration entry points | |
1960 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1961 (defun vc-snapshot-precondition (dir) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1962 "Scan the tree below DIR, looking for non-uptodate files. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1963 If any file is not up-to-date, return the name of the first such file. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1964 \(This means, neither snapshot creation nor retrieval is allowed.\) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1965 If one or more of the files are currently visited, return `visited'. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
1966 Otherwise, return nil." |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1967 (let ((status nil)) |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1968 (catch 'vc-locked-example |
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1969 (vc-file-tree-walk |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1970 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1971 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1972 (if (not (vc-up-to-date-p f)) (throw 'vc-locked-example f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1973 (if (get-file-buffer f) (setq status 'visited))))) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1974 status))) |
904 | 1975 |
927 | 1976 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1977 (defun vc-create-snapshot (dir name branchp) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1978 "Descending recursively from DIR, make a snapshot called NAME. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1979 For each registered file, the version level of its latest version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1980 becomes part of the named configuration. If the prefix argument |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1981 BRANCHP is given, the snapshot is made as a new branch and the files |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1982 are checked out in that new branch." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1983 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1984 (list (read-file-name "Directory: " default-directory default-directory t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1985 (read-string "New snapshot name: ") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1986 current-prefix-arg)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1987 (message "Making %s... " (if branchp "branch" "snapshot")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1988 (if (file-directory-p dir) (setq dir (file-name-as-directory dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1989 (vc-call-backend (vc-responsible-backend dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1990 'create-snapshot dir name branchp) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1991 (message "Making %s... done" (if branchp "branch" "snapshot"))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1992 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1993 (defun vc-default-create-snapshot (backend dir name branchp) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
1994 (when branchp |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1995 (error "VC backend %s does not support module branches" backend)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1996 (let ((result (vc-snapshot-precondition dir))) |
12714
192f537bca2a
(vc-resynch-buffer): New function.
Richard M. Stallman <rms@gnu.org>
parents:
12589
diff
changeset
|
1997 (if (stringp result) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
1998 (error "File %s is not up-to-date" result) |
4656
29bd5f3d0059
(vc-locked-example): Renamed from vc-quiescent-p. Now yields example of
Paul Eggert <eggert@twinsun.com>
parents:
4509
diff
changeset
|
1999 (vc-file-tree-walk |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2000 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2001 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2002 (vc-call assign-name f name)))))) |
904 | 2003 |
927 | 2004 ;;;###autoload |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2005 (defun vc-retrieve-snapshot (dir name) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2006 "Descending recursively from DIR, retrieve the snapshot called NAME. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2007 If NAME is empty, it refers to the latest versions. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2008 If locking is used for the files in DIR, then there must not be any |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2009 locked files at or below DIR (but if NAME is empty, locked files are |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2010 allowed and simply skipped)." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2011 (interactive |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2012 (list (read-file-name "Directory: " default-directory default-directory t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2013 (read-string "Snapshot name to retrieve (default latest versions): "))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2014 (let ((update (yes-or-no-p "Update any affected buffers? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2015 (msg (if (or (not name) (string= name "")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2016 (format "Updating %s... " (abbreviate-file-name dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2017 (format "Retrieving snapshot into %s... " |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2018 (abbreviate-file-name dir))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2019 (message msg) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2020 (vc-call-backend (vc-responsible-backend dir) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2021 'retrieve-snapshot dir name update) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2022 (message (concat msg "done")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2023 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2024 (defun vc-default-retrieve-snapshot (backend dir name update) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2025 (if (string= name "") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2026 (progn |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2027 (vc-file-tree-walk |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2028 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2029 (lambda (f) (and |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2030 (vc-up-to-date-p f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2031 (vc-error-occurred |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2032 (vc-call checkout f nil "") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2033 (if update (vc-resynch-buffer f t t))))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2034 (let ((result (vc-snapshot-precondition dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2035 (if (stringp result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2036 (error "File %s is locked" result) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2037 (setq update (and (eq result 'visited) update)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2038 (vc-file-tree-walk |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2039 dir |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2040 (lambda (f) (and |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2041 (vc-error-occurred |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2042 (vc-call checkout f nil name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2043 (if update (vc-resynch-buffer f t t)))))))))) |
904 | 2044 |
2045 ;; Miscellaneous other entry points | |
2046 | |
927 | 2047 ;;;###autoload |
904 | 2048 (defun vc-print-log () |
2049 "List the change log of the current buffer in a window." | |
2050 (interactive) | |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2051 (vc-ensure-vc-buffer) |
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2052 (let ((file buffer-file-name)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2053 (vc-setup-buffer nil) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2054 (setq default-directory (file-name-directory file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2055 (vc-call print-log file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2056 (pop-to-buffer (current-buffer)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2057 (if (fboundp 'log-view-mode) (log-view-mode)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2058 (vc-exec-after |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2059 `(progn |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2060 (goto-char (point-max)) (forward-line -1) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2061 (while (looking-at "=*\n") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2062 (delete-char (- (match-end 0) (match-beginning 0))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2063 (forward-line -1)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2064 (goto-char (point-min)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2065 (if (looking-at "[\b\t\n\v\f\r ]+") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2066 (delete-char (- (match-end 0) (match-beginning 0)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2067 (shrink-window-if-larger-than-buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2068 ;; move point to the log entry for the current version |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2069 (if (fboundp 'log-view-goto-rev) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2070 (log-view-goto-rev ',(vc-workfile-version file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2071 (if (vc-find-backend-function ',(vc-backend file) 'show-log-entry) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2072 (vc-call-backend ',(vc-backend file) |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2073 'show-log-entry |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2074 ',(vc-workfile-version file)))))))) |
904 | 2075 |
927 | 2076 ;;;###autoload |
904 | 2077 (defun vc-revert-buffer () |
21324
b0abfde79536
* vc.el (vc-resolve-conflicts): New function.
André Spiegel <spiegel@gnu.org>
parents:
21233
diff
changeset
|
2078 "Revert the current buffer's file back to the version it was based on. |
952 | 2079 This asks for confirmation if the buffer contents are not identical |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2080 to that version. Note that for RCS and CVS, this function does not |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2081 automatically pick up newer changes found in the master file; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2082 use \\[universal-argument] \\[vc-next-action] to do so." |
904 | 2083 (interactive) |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2084 (vc-ensure-vc-buffer) |
904 | 2085 (let ((file buffer-file-name) |
13536
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
2086 ;; This operation should always ask for confirmation. |
af2fc95b03f0
(vc-directory): Require dired.
Richard M. Stallman <rms@gnu.org>
parents:
13379
diff
changeset
|
2087 (vc-suppress-confirm nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2088 (obuf (current-buffer))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2089 (unless (vc-workfile-unchanged-p file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2090 (vc-diff nil t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2091 (vc-exec-after `(message nil)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2092 (unwind-protect |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2093 (if (not (yes-or-no-p "Discard changes? ")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2094 (error "Revert canceled")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2095 (if (or (window-dedicated-p (selected-window)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2096 (one-window-p t 'selected-frame)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2097 (make-frame-invisible (selected-frame)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2098 (delete-window)))) |
21329
58dc75416c30
(vc-revert-buffer): Rewrote handling of vc-diff buffer,
André Spiegel <spiegel@gnu.org>
parents:
21325
diff
changeset
|
2099 (set-buffer obuf) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2100 ;; Do the reverting |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2101 (message "Reverting %s..." file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2102 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2103 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2104 (vc-call revert file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2105 `((vc-state up-to-date) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2106 (vc-checkout-time (nth 5 (file-attributes file))))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2107 (vc-resynch-buffer file t t) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2108 (message "Reverting %s...done" file))) |
904 | 2109 |
927 | 2110 ;;;###autoload |
904 | 2111 (defun vc-cancel-version (norevert) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2112 "Get rid of most recently checked in version of this file. |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2113 A prefix argument NOREVERT means do not revert the buffer afterwards." |
904 | 2114 (interactive "P") |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2115 (vc-ensure-vc-buffer) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2116 (let* ((file (buffer-file-name)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2117 (backend (vc-backend file)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2118 (target (vc-workfile-version file)) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
2119 (config (current-window-configuration)) done) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2120 (cond |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2121 ((not (vc-find-backend-function backend 'cancel-version)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2122 (error "Sorry, canceling versions is not supported under %s" backend)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2123 ((not (vc-call latest-on-branch-p file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2124 (error "This is not the latest version; VC cannot cancel it")) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2125 ((not (vc-up-to-date-p file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2126 (error (substitute-command-keys "File is not up to date; use \\[vc-revert-buffer] to discard changes")))) |
13934
ee57ee38cdb5
(vc-cancel-version): Handle versions that start a new branch.
André Spiegel <spiegel@gnu.org>
parents:
13890
diff
changeset
|
2127 (if (null (yes-or-no-p (format "Remove version %s from master? " target))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2128 (error "Aborted") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2129 (setq norevert (or norevert (not |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2130 (yes-or-no-p "Revert buffer to most recent remaining version? ")))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2131 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2132 (message "Removing last change from %s..." file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2133 (with-vc-properties |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2134 file |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2135 (vc-call cancel-version file norevert) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2136 `((vc-state ,(if norevert 'edited 'up-to-date)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2137 (vc-checkout-time ,(if norevert |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2138 0 |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2139 (nth 5 (file-attributes file)))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2140 (vc-workfile-version nil))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2141 (message "Removing last change from %s...done" file) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2142 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2143 (cond |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2144 (norevert ;; clear version headers and mark the buffer modified |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2145 (set-visited-file-name file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2146 (when (not vc-make-backup-files) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2147 ;; inhibit backup for this buffer |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2148 (make-local-variable 'backup-inhibited) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2149 (setq backup-inhibited t)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2150 (setq buffer-read-only nil) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2151 (vc-clear-headers) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2152 (vc-mode-line file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2153 (vc-dired-resynch-file file)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2154 (t ;; revert buffer to file on disk |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2155 (vc-resynch-buffer file t t))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2156 (message "Version %s has been removed from the master" target)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2157 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2158 (defun vc-rename-master (oldmaster newfile templates) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2159 "Rename OLDMASTER to be the master file for NEWFILE based on TEMPLATES." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2160 (let* ((dir (file-name-directory (expand-file-name oldmaster))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2161 (newdir (or (file-name-directory newfile) "")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2162 (newbase (file-name-nondirectory newfile)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2163 (masters |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2164 ;; List of potential master files for `newfile' |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2165 (mapcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2166 (lambda (s) (vc-possible-master s newdir newbase)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2167 templates))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2168 (if (or (file-symlink-p oldmaster) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2169 (file-symlink-p (file-name-directory oldmaster))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2170 (error "This unsafe in the presence of symbolic links")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2171 (rename-file |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2172 oldmaster |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2173 (catch 'found |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2174 ;; If possible, keep the master file in the same directory. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2175 (mapcar (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2176 (if (and f (string= (file-name-directory (expand-file-name f)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2177 dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2178 (throw 'found f))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2179 masters) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2180 ;; If not, just use the first possible place. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2181 (mapcar (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2182 (and f |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2183 (or (not (setq dir (file-name-directory f))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2184 (file-directory-p dir)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2185 (throw 'found f))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2186 masters) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2187 (error "New file lacks a version control directory"))))) |
904 | 2188 |
9044
5ddb0e0adb08
(vc-backend-checkout): Add if-statements to the shell cmds
Richard M. Stallman <rms@gnu.org>
parents:
8726
diff
changeset
|
2189 ;;;###autoload |
904 | 2190 (defun vc-rename-file (old new) |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2191 "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
|
2192 (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
|
2193 ;; 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
|
2194 ;; 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
|
2195 ;; 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
|
2196 ;; 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
|
2197 ;; 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
|
2198 ;; until CVS 2.0 is released. --ceder 1994-01-23 21:27:51 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2199 (let ((oldbuf (get-file-buffer old)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2200 (backend (vc-backend old))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2201 (unless (or (null backend) (vc-find-backend-function backend 'rename-file)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2202 (error "Renaming files under %s is not supported in VC" backend)) |
4991
9da6c6c24ddd
(vc-rename-file): Don't overwrite an existing file.
Richard M. Stallman <rms@gnu.org>
parents:
4854
diff
changeset
|
2203 (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
|
2204 (error "Please save files before moving them")) |
904 | 2205 (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
|
2206 (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
|
2207 (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
|
2208 (error "New file already exists")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2209 (when backend |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2210 (if (and backend (not (vc-up-to-date-p old))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2211 (error "Please check in files before moving them")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2212 (vc-call-backend backend 'rename-file old new)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2213 ;; Move the actual file (unless the backend did it already) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2214 (if (or (not backend) (file-exists-p old)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2215 (rename-file old new)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2216 ;; ?? Renaming a file might change its contents due to keyword expansion. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2217 ;; We should really check out a new copy if the old copy was precisely equal |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2218 ;; to some checked in version. However, testing for this is tricky.... |
904 | 2219 (if oldbuf |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2220 (with-current-buffer oldbuf |
15227
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2221 (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
|
2222 (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
|
2223 (vc-backend new) |
207c2c343394
(vc-rename-file): After renaming, update VC info and modeline.
Richard M. Stallman <rms@gnu.org>
parents:
15036
diff
changeset
|
2224 (vc-mode-line new) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2225 (set-buffer-modified-p nil))))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2226 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2227 ;; Only defined in very recent Emacsen |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2228 (defvar small-temporary-file-directory nil) |
904 | 2229 |
927 | 2230 ;;;###autoload |
1226
573df03a54d8
(vc-update-change-log): Use shell-command, not shell-command-on-region.
Roland McGrath <roland@gnu.org>
parents:
952
diff
changeset
|
2231 (defun vc-update-change-log (&rest args) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2232 "Find change log file and add entries from recent version control logs. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2233 Normally, find log entries for all registered files in the default |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2234 directory. |
15989
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2235 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2236 With prefix arg of \\[universal-argument], 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
|
2237 |
2813c68432c9
(vc-update-change-log): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
15977
diff
changeset
|
2238 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
|
2239 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
|
2240 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
|
2241 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2242 From a program, any ARGS are assumed to be filenames for which |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2243 log entries should be gathered." |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2244 (interactive |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2245 (cond ((consp current-prefix-arg) ;C-u |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2246 (list buffer-file-name)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2247 (current-prefix-arg ;Numeric argument. |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2248 (let ((files nil) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2249 (buffers (buffer-list)) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2250 file) |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2251 (while buffers |
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2252 (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
|
2253 (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
|
2254 (setq files (cons file files))) |
1227
d07030650283
(vc-checkin-hook): New user hook variable.
Roland McGrath <roland@gnu.org>
parents:
1226
diff
changeset
|
2255 (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
|
2256 files)) |
1b954eb0f249
(vc-update-change-log): Ensure that file names inserted into a ChangeLog
Paul Eggert <eggert@twinsun.com>
parents:
3905
diff
changeset
|
2257 (t |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2258 ;; Don't supply any filenames to backend; this means |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2259 ;; it should find all relevant files relative to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2260 ;; the default-directory. |
15977
abc3b3e7ea88
(vc-update-change-log): Remove code which found RCS files
Richard M. Stallman <rms@gnu.org>
parents:
15787
diff
changeset
|
2261 nil))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2262 (vc-call-backend (vc-responsible-backend default-directory) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2263 'update-changelog args)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2264 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2265 (defun vc-default-update-changelog (backend files) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2266 "Default implementation of update-changelog. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2267 Uses `rcs2log' which only works for RCS and CVS." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2268 ;; FIXME: We (c|sh)ould add support for cvs2cl |
14053
c8c5b83d9691
(vc-update-change-log): Use add-log-full-name and
Karl Heuer <kwzh@gnu.org>
parents:
14040
diff
changeset
|
2269 (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
|
2270 (changelog (find-change-log)) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2271 ;; Presumably not portable to non-Unixy systems, along with rcs2log: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2272 (tempfile (funcall |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2273 (if (fboundp 'make-temp-file) 'make-temp-file 'make-temp-name) |
25488
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2274 (expand-file-name "vc" |
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2275 (or small-temporary-file-directory |
48c997ce6c8d
(vc-update-change-log): Use small-temporary-file-directory when non-nil.
Eli Zaretskii <eliz@gnu.org>
parents:
25406
diff
changeset
|
2276 temporary-file-directory)))) |
14855
52f730593064
(vc-update-change-log): Use add-log-full-name and
Richard M. Stallman <rms@gnu.org>
parents:
14734
diff
changeset
|
2277 (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
|
2278 (user-full-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2279 (user-login-name) |
612fe5713ede
(vc-next-action-on-file, vc-update-change-log,
André Spiegel <spiegel@gnu.org>
parents:
16590
diff
changeset
|
2280 (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
|
2281 (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
|
2282 user-mail-address))) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2283 (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
|
2284 (barf-if-buffer-read-only) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2285 (vc-buffer-sync) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2286 (undo-boundary) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2287 (goto-char (point-min)) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2288 (push-mark) |
5669887e3692
(vc-update-change-log): Restore previous default-directory
Richard M. Stallman <rms@gnu.org>
parents:
3895
diff
changeset
|
2289 (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
|
2290 (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
|
2291 (unwind-protect |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2292 (progn |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2293 (setq default-directory odefault) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2294 (if (eq 0 (apply 'call-process |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2295 (expand-file-name "rcs2log" |
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2296 exec-directory) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2297 nil (list t tempfile) nil |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2298 "-c" changelog |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2299 "-u" (concat (vc-user-login-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2300 "\t" full-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2301 "\t" mailing-address) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2302 (mapcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2303 (lambda (f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2304 (file-relative-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2305 (if (file-name-absolute-p f) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2306 f |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2307 (concat odefault f)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2308 files))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2309 "done" |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2310 (pop-to-buffer |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2311 (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
|
2312 (erase-buffer) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2313 (insert-file tempfile) |
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2314 "failed")) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2315 (setq default-directory (file-name-directory changelog)) |
17410
777a31320b0f
(vc-update-change-log): Run `rcs2log' in the correct
Richard M. Stallman <rms@gnu.org>
parents:
17274
diff
changeset
|
2316 (delete-file tempfile))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2317 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2318 ;;; Annotate functionality |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2319 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2320 ;; 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
|
2321 ;; 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
|
2322 ;; parameter). |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2323 (defvar vc-annotate-ratio nil "Global variable.") |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2324 (defvar vc-annotate-backend nil "Global variable.") |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2325 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2326 (defun vc-annotate-get-backend (buffer) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2327 "Return the backend matching \"Annotate\" buffer BUFFER. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2328 Return NIL if no match made. Associations are made based on |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2329 `vc-annotate-buffers'." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2330 (cdr (assoc buffer vc-annotate-buffers))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2331 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2332 (define-derived-mode vc-annotate-mode fundamental-mode "Annotate" |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2333 "Major mode for buffers displaying output from the `annotate' command. |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2334 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2335 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
|
2336 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
|
2337 menu items." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2338 (vc-annotate-add-menu)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2339 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2340 (defun vc-annotate-display-default (&optional event) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2341 "Use the default color spectrum for VC Annotate mode." |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2342 (interactive "e") |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2343 (message "Redisplaying annotation...") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2344 (vc-annotate-display (current-buffer) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2345 nil |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2346 (vc-annotate-get-backend (current-buffer))) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2347 (message "Redisplaying annotation...done")) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2348 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2349 (defun vc-annotate-add-menu () |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2350 "Add the menu 'Annotate' to the menu bar in VC-Annotate mode." |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2351 (setq vc-annotate-mode-menu (make-sparse-keymap "Annotate")) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2352 (define-key vc-annotate-mode-map [menu-bar vc-annotate-mode] |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2353 (cons "VC-Annotate" vc-annotate-mode-menu)) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2354 (define-key vc-annotate-mode-menu [default] |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2355 '("Default" . vc-annotate-display-default)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2356 (let ((menu-elements vc-annotate-menu-elements)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2357 (while menu-elements |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2358 (let* ((element (car menu-elements)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2359 (days (round (* element |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2360 (vc-annotate-car-last-cons vc-annotate-color-map) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2361 0.7585)))) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2362 (setq menu-elements (cdr menu-elements)) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2363 (define-key vc-annotate-mode-menu |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2364 (vector days) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2365 (cons (format "Span %d days" |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2366 days) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2367 `(lambda () |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2368 ,(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
|
2369 (interactive) |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2370 (message "Redisplaying annotation...") |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2371 (vc-annotate-display |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2372 (get-buffer (buffer-name)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2373 (vc-annotate-time-span vc-annotate-color-map ,element) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2374 (vc-annotate-get-backend (current-buffer))) |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2375 (message "Redisplaying annotation...done")))))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2376 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2377 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2378 ;;;; (defun vc-BACKEND-annotate-command (file buffer) ...) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2379 ;;;; Execute "annotate" on FILE by using `call-process' and insert |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2380 ;;;; the contents in BUFFER. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2381 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2382 ;;;###autoload |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2383 (defun vc-annotate (ratio) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2384 "Display the result of the \"Annotate\" command using colors. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2385 \"Annotate\" is defined by `vc-BACKEND-annotate-command'. New lines |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2386 are displayed in red, old in blue. A prefix argument specifies a |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2387 factor for stretching the time scale. |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2388 |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2389 `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
|
2390 mode-specific menu. `vc-annotate-color-map' and |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2391 `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
|
2392 colors. `vc-annotate-background' specifies the background color." |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2393 (interactive "p") |
21366
e7b64d0b3b3d
(vc-ensure-vc-buffer): New function.
André Spiegel <spiegel@gnu.org>
parents:
21357
diff
changeset
|
2394 (vc-ensure-vc-buffer) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2395 (message "Annotating...") |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2396 (let ((temp-buffer-name (concat "*Annotate " (buffer-name) "*")) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2397 (temp-buffer-show-function 'vc-annotate-display) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2398 (vc-annotate-ratio ratio) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2399 (vc-annotate-backend (vc-backend (buffer-file-name)))) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2400 (if (not (vc-find-backend-function vc-annotate-backend 'annotate-command)) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2401 (error "Sorry, annotating is not implemented for %s" |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2402 vc-annotate-backend)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2403 (with-output-to-temp-buffer temp-buffer-name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2404 (vc-call-backend vc-annotate-backend 'annotate-command |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2405 (file-name-nondirectory (buffer-file-name)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2406 (get-buffer temp-buffer-name))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2407 ;; Don't use the temp-buffer-name until the buffer is created |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2408 ;; (only after `with-output-to-temp-buffer'.) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2409 (setq vc-annotate-buffers |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2410 (append vc-annotate-buffers |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2411 (list (cons (get-buffer temp-buffer-name) vc-annotate-backend))))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2412 (message "Annotating... done")) |
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2413 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2414 |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2415 (defun vc-annotate-car-last-cons (a-list) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2416 "Return car of last cons in association list A-LIST." |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2417 (if (not (eq nil (cdr a-list))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2418 (vc-annotate-car-last-cons (cdr a-list)) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2419 (car (car a-list)))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2420 |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2421 (defun vc-annotate-time-span (a-list span &optional quantize) |
31565
de4e73d77734
(vc-dired-listing-switches): Fix :version.
Dave Love <fx@gnu.org>
parents:
31520
diff
changeset
|
2422 "Apply factor SPAN to the time-span of association list A-LIST. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2423 Return the new alist. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2424 Optionally quantize to the factor of QUANTIZE." |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2425 ;; Apply span to each car of every cons |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2426 (if (not (eq nil a-list)) |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2427 (append (list (cons (* (car (car a-list)) span) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2428 (cdr (car a-list)))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2429 (vc-annotate-time-span (nthcdr (or quantize ; optional |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2430 1) ; Default to cdr |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2431 a-list) span quantize)))) |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2432 |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2433 (defun vc-annotate-compcar (threshold a-list) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2434 "Test successive cons cells of association list A-LIST against THRESHOLD. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2435 Return the first cons cell which car is not less than THRESHOLD, |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2436 nil otherwise" |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2437 (let ((i 1) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2438 (tmp-cons (car a-list))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2439 (while (and tmp-cons (< (car tmp-cons) threshold)) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2440 (setq tmp-cons (car (nthcdr i a-list))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2441 (setq i (+ i 1))) |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2442 tmp-cons)) ; Return the appropriate value |
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2443 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2444 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2445 ;;;; (defun vc-BACKEND-annotate-difference (point) ...) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2446 ;;;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2447 ;;;; Return the difference between the age of the line at point and |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2448 ;;;; the current time. Return NIL if there is no more comparison to |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2449 ;;;; be made in the buffer. Return value as defined for |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2450 ;;;; `current-time'. You can safely assume that point is placed at |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2451 ;;;; the beginning of each line, starting at `point-min'. The buffer |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2452 ;;;; that point is placed in is the Annotate output, as defined by |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2453 ;;;; the relevant backend. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2454 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2455 (defun vc-annotate-display (buffer &optional color-map backend) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2456 "Do the VC-Annotate display in BUFFER using COLOR-MAP. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2457 The original annotating file is supposed to be handled by BACKEND. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2458 If BACKEND is NIL, variable VC-ANNOTATE-BACKEND is used instead. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2459 This function is destructive on VC-ANNOTATE-BACKEND when BACKEND is non-nil." |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2460 |
18246
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2461 ;; 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
|
2462 ;; 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
|
2463 ;; vc-annotate since it is not possible to use another parameter |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2464 ;; (see temp-buffer-show-function). |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2465 (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
|
2466 ;; 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
|
2467 ;; being non-nil. |
3b4321d0ee7e
(vc-annotate-mode-variables): Init vc-annotate-mode-menu
Richard M. Stallman <rms@gnu.org>
parents:
18174
diff
changeset
|
2468 (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
|
2469 vc-annotate-ratio))) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2470 (set-buffer buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2471 (display-buffer buffer) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2472 (if (not vc-annotate-mode) ; Turn on vc-annotate-mode if not done |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2473 (vc-annotate-mode)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2474 (goto-char (point-min)) ; Position at the top of the buffer. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2475 ;; Delete old overlays |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2476 (mapcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2477 (lambda (overlay) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2478 (if (overlay-get overlay 'vc-annotation) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2479 (delete-overlay overlay))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2480 (overlays-in (point-min) (point-max))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2481 (goto-char (point-min)) ; Position at the top of the buffer. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2482 |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2483 (if backend (setq vc-annotate-backend backend)) ; Destructive on `vc-annotate-backend' |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2484 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2485 (let ((difference (vc-call-backend vc-annotate-backend 'annotate-difference (point)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2486 (while difference |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2487 (let* |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2488 ((color (or (vc-annotate-compcar |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2489 difference (or color-map vc-annotate-color-map)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2490 (cons nil vc-annotate-very-old-color))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2491 ;; substring from index 1 to remove any leading `#' in the name |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2492 (face-name (concat "vc-annotate-face-" (substring (cdr color) 1))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2493 ;; Make the face if not done. |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2494 (face (or (intern-soft face-name) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2495 (let ((tmp-face (make-face (intern face-name)))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2496 (set-face-foreground tmp-face (cdr color)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2497 (if vc-annotate-background |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2498 (set-face-background tmp-face vc-annotate-background)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2499 tmp-face))) ; Return the face |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2500 (point (point)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2501 overlay) |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2502 (forward-line 1) |
24139
2b3e32c0fc18
(vc-annotate-display): Delete old overlays. Fix check for major-mode.
André Spiegel <spiegel@gnu.org>
parents:
23980
diff
changeset
|
2503 (setq overlay (make-overlay point (point))) |
2b3e32c0fc18
(vc-annotate-display): Delete old overlays. Fix check for major-mode.
André Spiegel <spiegel@gnu.org>
parents:
23980
diff
changeset
|
2504 (overlay-put overlay 'face face) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2505 (overlay-put overlay 'vc-annotation t)) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2506 (setq difference (vc-call-backend vc-annotate-backend 'annotate-difference (point)))))) |
20752
826e4167d1dc
(vc-annotate-compcar): Iterate instead of recursing.
Richard M. Stallman <rms@gnu.org>
parents:
20661
diff
changeset
|
2507 |
18174
238e30645d07
(diff-switches): defvar deleted.
Richard M. Stallman <rms@gnu.org>
parents:
17911
diff
changeset
|
2508 |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2509 ;; Collect back-end-dependent stuff here |
904 | 2510 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2511 (defalias 'vc-default-logentry-check 'ignore) |
11597
d6d53a54da18
(vc-backend-checkout): Pass vc-checkout-switches arg
Richard M. Stallman <rms@gnu.org>
parents:
11080
diff
changeset
|
2512 |
904 | 2513 (defun vc-check-headers () |
2514 "Check if the current file has any headers in it." | |
2515 (interactive) | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2516 (vc-call-backend (vc-backend buffer-file-name) 'check-headers)) |
904 | 2517 |
2518 ;; Back-end-dependent stuff ends here. | |
2519 | |
2520 ;; Set up key bindings for use while editing log messages | |
2521 | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2522 (define-derived-mode vc-log-mode text-mode "VC-Log" |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2523 "Major mode for editing VC log entries. |
904 | 2524 These bindings are added to the global keymap when you enter this mode: |
2525 \\[vc-next-action] perform next logical version-control operation on current file | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2526 \\[vc-register] register current file |
904 | 2527 \\[vc-toggle-read-only] like next-action, but won't register files |
2528 \\[vc-insert-headers] insert version-control headers in current file | |
2529 \\[vc-print-log] display change history of current file | |
2530 \\[vc-revert-buffer] revert buffer to latest version | |
2531 \\[vc-cancel-version] undo latest checkin | |
2532 \\[vc-diff] show diffs between file versions | |
4725
126cf4bdfd35
(vc-version-other-window): New function.
Paul Eggert <eggert@twinsun.com>
parents:
4684
diff
changeset
|
2533 \\[vc-version-other-window] visit old version in another window |
904 | 2534 \\[vc-directory] show all files locked by any user in or below . |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2535 \\[vc-annotate] colorful display of the cvs annotate command |
904 | 2536 \\[vc-update-change-log] add change log entry from recent checkins |
2537 | |
2538 While you are entering a change log message for a version, the following | |
2539 additional bindings will be in effect. | |
2540 | |
2541 \\[vc-finish-logentry] proceed with check in, ending log message entry | |
2542 | |
2543 Whenever you do a checkin, your log comment is added to a ring of | |
2544 saved comments. These can be recalled as follows: | |
2545 | |
2546 \\[vc-next-comment] replace region with next message in comment ring | |
2547 \\[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
|
2548 \\[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
|
2549 \\[vc-comment-search-forward] search backward for regexp in the comment ring |
904 | 2550 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2551 Entry to the change-log submode calls the value of `text-mode-hook', then |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2552 the value of `vc-log-mode-hook'. |
904 | 2553 |
2554 Global user options: | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2555 `vc-initial-comment' If non-nil, require user to enter a change |
904 | 2556 comment upon first checkin of the file. |
2557 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2558 `vc-keep-workfiles' Non-nil value prevents workfiles from being |
904 | 2559 deleted when changes are checked in |
2560 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2561 `vc-suppress-confirm' Suppresses some confirmation prompts, |
904 | 2562 notably for reversions. |
2563 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2564 vc-BACKEND-header Which keywords to insert when adding headers |
904 | 2565 with \\[vc-insert-headers]. Defaults to |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2566 '(\"\%\W\%\") under SCCS, '(\"\$Id\$\") under |
9249
909ae53a446d
(vc-backend-checkin): When CVS checks in a file, it is
Richard M. Stallman <rms@gnu.org>
parents:
9216
diff
changeset
|
2567 RCS and CVS. |
904 | 2568 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2569 `vc-static-header-alist' By default, version headers inserted in C files |
904 | 2570 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
|
2571 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
|
2572 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
|
2573 this by setting this variable to nil, or change |
904 | 2574 the header template by changing it. |
2575 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2576 `vc-command-messages' if non-nil, display run messages from the |
904 | 2577 actual version-control utilities (this is |
2578 intended primarily for people hacking vc | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2579 itself)." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2580 (make-local-variable 'vc-comment-ring-index)) |
904 | 2581 |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2582 (defun vc-log-edit (file) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2583 "Set up `log-edit' for use with VC on FILE. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2584 If `log-edit' is not available, resort to `vc-log-mode'." |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2585 (setq default-directory |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2586 (if file (file-name-directory file) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2587 (with-current-buffer vc-parent-buffer default-directory))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2588 (if (fboundp 'log-edit) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2589 (log-edit 'vc-finish-logentry nil |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2590 (if file `(lambda () ',(list (file-name-nondirectory file))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2591 ;; If FILE is nil, we were called from vc-dired. |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2592 (lambda () |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2593 (with-current-buffer vc-parent-buffer |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2594 (dired-get-marked-files t))))) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2595 (vc-log-mode)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2596 (set (make-local-variable 'vc-log-file) file) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2597 (make-local-variable 'vc-log-version) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31387
diff
changeset
|
2598 (set-buffer-modified-p nil) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2599 (setq buffer-file-name nil)) |
904 | 2600 |
2601 ;;; These things should probably be generally available | |
2602 | |
13012
ac84d1c8c770
(vc-dired-mode): Now a major mode derived from dired-mode.
André Spiegel <spiegel@gnu.org>
parents:
12968
diff
changeset
|
2603 (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
|
2604 "Walk recursively through DIRNAME. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2605 Invoke FUNC f ARGS on each VC-managed 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
|
2606 (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
|
2607 (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
|
2608 |
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2609 (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
|
2610 (if (not (file-directory-p file)) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2611 (if (vc-backend file) (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
|
2612 (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
|
2613 (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
|
2614 (mapcar |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2615 (lambda (f) (or |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2616 (string-equal f ".") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2617 (string-equal f "..") |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2618 (member f vc-directory-exclusion-list) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2619 (let ((dirf (expand-file-name f dir))) |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2620 (or |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2621 (file-symlink-p dirf);; Avoid possible loops |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2622 (vc-file-tree-walk-internal dirf func args))))) |
2054
341337259785
(vc-update-change-log): Check that ChangeLog is writable
Paul Eggert <eggert@twinsun.com>
parents:
2041
diff
changeset
|
2623 (directory-files dir))))) |
904 | 2624 |
2625 (provide 'vc) | |
2626 | |
2627 ;;; DEVELOPER'S NOTES ON CONCURRENCY PROBLEMS IN THIS CODE | |
2628 ;;; | |
2629 ;;; 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
|
2630 ;;; (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
|
2631 ;;; 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
|
2632 ;;; and RCS keyword lookup. AS, 1995/03/24) |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2633 ;;; |
904 | 2634 ;;; A fundamental problem in VC is that there are time windows between |
2635 ;;; vc-next-action's computations of the file's version-control state and | |
2636 ;;; the actions that change it. This is a window open to lossage in a | |
2637 ;;; multi-user environment; someone else could nip in and change the state | |
2638 ;;; of the master during it. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2639 ;;; |
904 | 2640 ;;; The performance problem is that rlog/prs calls are very expensive; we want |
2641 ;;; to avoid them as much as possible. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2642 ;;; |
904 | 2643 ;;; ANALYSIS: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2644 ;;; |
904 | 2645 ;;; The performance problem, it turns out, simplifies in practice to the |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2646 ;;; problem of making vc-state fast. The two other functions that call |
904 | 2647 ;;; prs/rlog will not be so commonly used that the slowdown is a problem; one |
2648 ;;; makes snapshots, the other deletes the calling user's last change in the | |
2649 ;;; master. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2650 ;;; |
904 | 2651 ;;; The race condition implies that we have to either (a) lock the master |
2652 ;;; during the entire execution of vc-next-action, or (b) detect and | |
2653 ;;; recover from errors resulting from dispatch on an out-of-date state. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2654 ;;; |
14040 | 2655 ;;; Alternative (a) appears to be infeasible. The problem is that we can't |
904 | 2656 ;;; guarantee that the lock will ever be removed. Suppose a user starts a |
2657 ;;; checkin, the change message buffer pops up, and the user, having wandered | |
2658 ;;; off to do something else, simply forgets about it? | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2659 ;;; |
904 | 2660 ;;; Alternative (b), on the other hand, works well with a cheap way to speed up |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2661 ;;; vc-state. Usually, if a file is registered, we can read its locked/ |
904 | 2662 ;;; unlocked state and its current owner from its permissions. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2663 ;;; |
904 | 2664 ;;; This shortcut will fail if someone has manually changed the workfile's |
2665 ;;; permissions; also if developers are munging the workfile in several | |
2666 ;;; directories, with symlinks to a master (in this latter case, the | |
2667 ;;; permissions shortcut will fail to detect a lock asserted from another | |
2668 ;;; directory). | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2669 ;;; |
904 | 2670 ;;; Note that these cases correspond exactly to the errors which could happen |
2671 ;;; because of a competing checkin/checkout race in between two instances of | |
2672 ;;; vc-next-action. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2673 ;;; |
904 | 2674 ;;; For VC's purposes, a workfile/master pair may have the following states: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2675 ;;; |
904 | 2676 ;;; A. Unregistered. There is a workfile, there is no master. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2677 ;;; |
904 | 2678 ;;; B. Registered and not locked by anyone. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2679 ;;; |
904 | 2680 ;;; C. Locked by calling user and unchanged. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2681 ;;; |
904 | 2682 ;;; D. Locked by the calling user and changed. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2683 ;;; |
904 | 2684 ;;; E. Locked by someone other than the calling user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2685 ;;; |
904 | 2686 ;;; This makes for 25 states and 20 error conditions. Here's the matrix: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2687 ;;; |
904 | 2688 ;;; VC's idea of state |
2689 ;;; | | |
2690 ;;; V Actual state RCS action SCCS action Effect | |
2691 ;;; A B C D E | |
2692 ;;; A . 1 2 3 4 ci -u -t- admin -fb -i<file> initial admin | |
2693 ;;; B 5 . 6 7 8 co -l get -e checkout | |
2694 ;;; C 9 10 . 11 12 co -u unget; get revert | |
2695 ;;; 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
|
2696 ;;; E 17 18 19 20 . rcs -u -M -l unget -n ; get -g steal lock |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2697 ;;; |
904 | 2698 ;;; All commands take the master file name as a last argument (not shown). |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2699 ;;; |
904 | 2700 ;;; In the discussion below, a "self-race" is a pathological situation in |
2701 ;;; which VC operations are being attempted simultaneously by two or more | |
2702 ;;; Emacsen running under the same username. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2703 ;;; |
904 | 2704 ;;; The vc-next-action code has the following windows: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2705 ;;; |
904 | 2706 ;;; Window P: |
2707 ;;; Between the check for existence of a master file and the call to | |
2708 ;;; admin/checkin in vc-buffer-admin (apparent state A). This window may | |
2709 ;;; never close if the initial-comment feature is on. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2710 ;;; |
904 | 2711 ;;; Window Q: |
2712 ;;; Between the call to vc-workfile-unchanged-p in and the immediately | |
2713 ;;; following revert (apparent state C). | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2714 ;;; |
904 | 2715 ;;; Window R: |
2716 ;;; Between the call to vc-workfile-unchanged-p in and the following | |
2717 ;;; checkin (apparent state D). This window may never close. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2718 ;;; |
904 | 2719 ;;; Window S: |
2720 ;;; Between the unlock and the immediately following checkout during a | |
2721 ;;; revert operation (apparent state C). Included in window Q. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2722 ;;; |
904 | 2723 ;;; Window T: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2724 ;;; Between vc-state and the following checkout (apparent state B). |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2725 ;;; |
904 | 2726 ;;; Window U: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2727 ;;; Between vc-state and the following revert (apparent state C). |
904 | 2728 ;;; Includes windows Q and S. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2729 ;;; |
904 | 2730 ;;; Window V: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2731 ;;; Between vc-state and the following checkin (apparent state |
904 | 2732 ;;; D). This window may never be closed if the user fails to complete the |
2733 ;;; checkin message. Includes window R. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2734 ;;; |
904 | 2735 ;;; Window W: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2736 ;;; Between vc-state and the following steal-lock (apparent |
2750
6f340eabf13f
Improve doc strings and prompt strings.
Richard M. Stallman <rms@gnu.org>
parents:
2745
diff
changeset
|
2737 ;;; state E). This window may never close if the user fails to complete |
904 | 2738 ;;; the steal-lock message. Includes window X. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2739 ;;; |
904 | 2740 ;;; Window X: |
2741 ;;; Between the unlock and the immediately following re-lock during a | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2742 ;;; steal-lock operation (apparent state E). This window may never close |
904 | 2743 ;;; if the user fails to complete the steal-lock message. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2744 ;;; |
904 | 2745 ;;; Errors: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2746 ;;; |
904 | 2747 ;;; Apparent state A --- |
2748 ;;; | |
2749 ;;; 1. File looked unregistered but is actually registered and not locked. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2750 ;;; |
904 | 2751 ;;; Potential cause: someone else's admin during window P, with |
2752 ;;; caller's admin happening before their checkout. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2753 ;;; |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2754 ;;; 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
|
2755 ;;; "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
|
2756 ;;; ci -i option and the message is "<file>,v: already exists". |
904 | 2757 ;;; SCCS: admin will fail with error (ad19). |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2758 ;;; |
904 | 2759 ;;; We can let these errors be passed up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2760 ;;; |
904 | 2761 ;;; 2. File looked unregistered but is actually locked by caller, unchanged. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2762 ;;; |
904 | 2763 ;;; Potential cause: self-race during window P. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2764 ;;; |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2765 ;;; 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
|
2766 ;;; 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
|
2767 ;;; ci -i option, failing with message "<file>,v: already exists". |
904 | 2768 ;;; SCCS: will fail with error (ad19). |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2769 ;;; |
904 | 2770 ;;; Either of these consequences is acceptable. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2771 ;;; |
904 | 2772 ;;; 3. File looked unregistered but is actually locked by caller, changed. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2773 ;;; |
904 | 2774 ;;; Potential cause: self-race during window P. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2775 ;;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2776 ;;; RCS: Prior to version 5.6.4, VC registers the caller's workfile as |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2777 ;;; a delta with a null change comment (the -t- switch will be |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2778 ;;; 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
|
2779 ;;; failing with message "<file>,v: already exists". |
904 | 2780 ;;; SCCS: will fail with error (ad19). |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2781 ;;; |
904 | 2782 ;;; 4. File looked unregistered but is locked by someone else. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2783 ;;; |
904 | 2784 ;;; Potential cause: someone else's admin during window P, with |
2785 ;;; caller's admin happening *after* their checkout. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2786 ;;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2787 ;;; RCS: Prior to version 5.6.4, ci fails with a |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2788 ;;; "no lock set by <user>" message. From 5.6.4 onwards, |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2789 ;;; VC uses the new ci -i option, failing with message |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2790 ;;; "<file>,v: already exists". |
904 | 2791 ;;; SCCS: will fail with error (ad19). |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2792 ;;; |
904 | 2793 ;;; We can let these errors be passed up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2794 ;;; |
904 | 2795 ;;; Apparent state B --- |
2796 ;;; | |
2797 ;;; 5. File looked registered and not locked, but is actually unregistered. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2798 ;;; |
904 | 2799 ;;; Potential cause: master file got nuked during window P. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2800 ;;; |
904 | 2801 ;;; RCS: will fail with "RCS/<file>: No such file or directory" |
2802 ;;; SCCS: will fail with error ut4. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2803 ;;; |
904 | 2804 ;;; We can let these errors be passed up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2805 ;;; |
904 | 2806 ;;; 6. File looked registered and not locked, but is actually locked by the |
2807 ;;; calling user and unchanged. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2808 ;;; |
904 | 2809 ;;; Potential cause: self-race during window T. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2810 ;;; |
904 | 2811 ;;; RCS: in the same directory as the previous workfile, co -l will fail |
2812 ;;; with "co error: writable foo exists; checkout aborted". In any other | |
2813 ;;; directory, checkout will succeed. | |
2814 ;;; SCCS: will fail with ge17. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2815 ;;; |
904 | 2816 ;;; Either of these consequences is acceptable. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2817 ;;; |
904 | 2818 ;;; 7. File looked registered and not locked, but is actually locked by the |
2819 ;;; calling user and changed. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2820 ;;; |
904 | 2821 ;;; As case 6. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2822 ;;; |
904 | 2823 ;;; 8. File looked registered and not locked, but is actually locked by another |
2824 ;;; user. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2825 ;;; |
904 | 2826 ;;; Potential cause: someone else checks it out during window T. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2827 ;;; |
904 | 2828 ;;; RCS: co error: revision 1.3 already locked by <user> |
2829 ;;; SCCS: fails with ge4 (in directory) or ut7 (outside it). | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2830 ;;; |
904 | 2831 ;;; We can let these errors be passed up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2832 ;;; |
904 | 2833 ;;; Apparent state C --- |
2834 ;;; | |
2835 ;;; 9. File looks locked by calling user and unchanged, but is unregistered. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2836 ;;; |
904 | 2837 ;;; As case 5. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2838 ;;; |
904 | 2839 ;;; 10. File looks locked by calling user and unchanged, but is actually not |
2840 ;;; locked. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2841 ;;; |
904 | 2842 ;;; Potential cause: a self-race in window U, or by the revert's |
2843 ;;; landing during window X of some other user's steal-lock or window S | |
2844 ;;; of another user's revert. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2845 ;;; |
904 | 2846 ;;; RCS: succeeds, refreshing the file from the identical version in |
2847 ;;; the master. | |
2848 ;;; SCCS: fails with error ut4 (p file nonexistent). | |
2849 ;;; | |
2850 ;;; Either of these consequences is acceptable. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2851 ;;; |
904 | 2852 ;;; 11. File is locked by calling user. It looks unchanged, but is actually |
2853 ;;; changed. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2854 ;;; |
904 | 2855 ;;; Potential cause: the file would have to be touched by a self-race |
2856 ;;; during window Q. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2857 ;;; |
904 | 2858 ;;; The revert will succeed, removing whatever changes came with |
2859 ;;; the touch. It is theoretically possible that work could be lost. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2860 ;;; |
904 | 2861 ;;; 12. File looks like it's locked by the calling user and unchanged, but |
2862 ;;; it's actually locked by someone else. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2863 ;;; |
904 | 2864 ;;; Potential cause: a steal-lock in window V. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2865 ;;; |
904 | 2866 ;;; RCS: co error: revision <rev> locked by <user>; use co -r or rcs -u |
2867 ;;; SCCS: fails with error un2 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2868 ;;; |
904 | 2869 ;;; We can pass these errors up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2870 ;;; |
904 | 2871 ;;; Apparent state D --- |
2872 ;;; | |
2873 ;;; 13. File looks like it's locked by the calling user and changed, but it's | |
2874 ;;; actually unregistered. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2875 ;;; |
904 | 2876 ;;; Potential cause: master file got nuked during window P. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2877 ;;; |
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2878 ;;; RCS: Prior to version 5.6.4, checks in the user's version as an |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2879 ;;; 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
|
2880 ;;; option, failing with message "no such file or directory". |
904 | 2881 ;;; SCCS: will fail with error ut4. |
2882 ;;; | |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2883 ;;; 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
|
2884 ;;; VC may fail to detect the loss of previous version information. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2885 ;;; |
904 | 2886 ;;; 14. File looks like it's locked by the calling user and changed, but it's |
2887 ;;; actually unlocked. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2888 ;;; |
904 | 2889 ;;; Potential cause: self-race in window V, or the checkin happening |
2890 ;;; during the window X of someone else's steal-lock or window S of | |
2891 ;;; someone else's revert. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2892 ;;; |
904 | 2893 ;;; RCS: ci will fail with "no lock set by <user>". |
2894 ;;; SCCS: delta will fail with error ut4. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2895 ;;; |
904 | 2896 ;;; 15. File looks like it's locked by the calling user and changed, but it's |
2897 ;;; actually locked by the calling user and unchanged. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2898 ;;; |
904 | 2899 ;;; Potential cause: another self-race --- a whole checkin/checkout |
2900 ;;; sequence by the calling user would have to land in window R. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2901 ;;; |
904 | 2902 ;;; SCCS: checks in a redundant delta and leaves the file unlocked as usual. |
2903 ;;; RCS: reverts to the file state as of the second user's checkin, leaving | |
2904 ;;; the file unlocked. | |
2905 ;;; | |
2906 ;;; It is theoretically possible that work could be lost under RCS. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2907 ;;; |
904 | 2908 ;;; 16. File looks like it's locked by the calling user and changed, but it's |
2909 ;;; actually locked by a different user. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2910 ;;; |
904 | 2911 ;;; RCS: ci error: no lock set by <user> |
2912 ;;; SCCS: unget will fail with error un2 | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2913 ;;; |
904 | 2914 ;;; We can pass these errors up to the user. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2915 ;;; |
904 | 2916 ;;; Apparent state E --- |
2917 ;;; | |
2918 ;;; 17. File looks like it's locked by some other user, but it's actually | |
2919 ;;; unregistered. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2920 ;;; |
904 | 2921 ;;; As case 13. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2922 ;;; |
904 | 2923 ;;; 18. File looks like it's locked by some other user, but it's actually |
2924 ;;; unlocked. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2925 ;;; |
904 | 2926 ;;; Potential cause: someone released a lock during window W. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2927 ;;; |
904 | 2928 ;;; RCS: The calling user will get the lock on the file. |
2929 ;;; SCCS: unget -n will fail with cm4. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2930 ;;; |
904 | 2931 ;;; Either of these consequences will be OK. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2932 ;;; |
904 | 2933 ;;; 19. File looks like it's locked by some other user, but it's actually |
2934 ;;; locked by the calling user and unchanged. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2935 ;;; |
904 | 2936 ;;; Potential cause: the other user relinquishing a lock followed by |
2937 ;;; a self-race, both in window W. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2938 ;;; |
904 | 2939 ;;; Under both RCS and SCCS, both unlock and lock will succeed, making |
2940 ;;; the sequence a no-op. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2941 ;;; |
904 | 2942 ;;; 20. File looks like it's locked by some other user, but it's actually |
2943 ;;; locked by the calling user and changed. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2944 ;;; |
904 | 2945 ;;; As case 19. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2946 ;;; |
904 | 2947 ;;; PROBLEM CASES: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2948 ;;; |
904 | 2949 ;;; In order of decreasing severity: |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2950 ;;; |
12943
10d0f42db2da
(vc-directory): Kill existing vc-dired buffers for this directory.
André Spiegel <spiegel@gnu.org>
parents:
12926
diff
changeset
|
2951 ;;; Cases 11 and 15 are the only ones that potentially lose work. |
904 | 2952 ;;; They would require a self-race for this to happen. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2953 ;;; |
904 | 2954 ;;; Case 13 in RCS loses information about previous deltas, retaining |
2955 ;;; only the information in the current workfile. This can only happen | |
2956 ;;; if the master file gets nuked in window P. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2957 ;;; |
904 | 2958 ;;; Case 3 in RCS and case 15 under SCCS insert a redundant delta with |
2959 ;;; no change comment in the master. This would require a self-race in | |
2960 ;;; window P or R respectively. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2961 ;;; |
904 | 2962 ;;; Cases 2, 10, 19 and 20 do extra work, but make no changes. |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2963 ;;; |
904 | 2964 ;;; Unfortunately, it appears to me that no recovery is possible in these |
2965 ;;; cases. They don't yield error messages, so there's no way to tell that | |
2966 ;;; a race condition has occurred. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2967 ;;; |
904 | 2968 ;;; All other cases don't change either the workfile or the master, and |
2969 ;;; trigger command errors which the user will see. | |
31380
2d74ed749db8
(vc-next-action-on-file): Do not visit the file if it's
Gerd Moellmann <gerd@gnu.org>
parents:
28460
diff
changeset
|
2970 ;;; |
904 | 2971 ;;; Thus, there is no explicit recovery code. |
2972 | |
2973 ;;; vc.el ends here |