annotate lisp/vc-hooks.el @ 47127:895cc47caf77

(my-mark-marker): Fix typo.
author Juanma Barranquero <lekktu@gmail.com>
date Fri, 30 Aug 2002 11:03:28 +0000
parents fe0d9d5309e4
children 31f2c4b2c82f
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2232
4f9d60f7de9d Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2227
diff changeset
1 ;;; vc-hooks.el --- resident support for version-control
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
2
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
3 ;; Copyright (C) 1992,93,94,95,96,98,99,2000 Free Software Foundation, Inc.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
4
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
5 ;; Author: FSF (see vc.el for full credits)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
7
47003
fe0d9d5309e4 (vc-kill-buffer-hook): Add it to kill-buffer-hook again.
André Spiegel <spiegel@gnu.org>
parents: 46723
diff changeset
8 ;; $Id: vc-hooks.el,v 1.142 2002/07/29 02:40:40 rms Exp $
20989
c11150812ca0 Added version id.
André Spiegel <spiegel@gnu.org>
parents: 20844
diff changeset
9
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
11
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
14 ;; the Free Software Foundation; either version 2, or (at your option)
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
15 ;; any later version.
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
16
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
20 ;; GNU General Public License for more details.
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
21
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
14169
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14142
diff changeset
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14142
diff changeset
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
83f275dcd93a Update FSF's address.
Erik Naggum <erik@naggum.no>
parents: 14142
diff changeset
25 ;; Boston, MA 02111-1307, USA.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
26
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
27 ;;; Commentary:
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
28
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
29 ;; This is the always-loaded portion of VC. It takes care of
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
30 ;; VC-related activities that are done when you visit a file, so that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
31 ;; vc.el itself is loaded only when you use a VC command. See the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
32 ;; commentary of vc.el.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
33
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
34 ;;; Code:
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
35
33856
6f1ab7313eb7 Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents: 33634
diff changeset
36 (eval-when-compile
6f1ab7313eb7 Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents: 33634
diff changeset
37 (require 'cl))
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
38
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
39 ;; Customization Variables (the rest is in vc.el)
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
40
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
41 (defvar vc-ignore-vc-files nil "Obsolete -- use `vc-handled-backends'.")
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
42 (defvar vc-master-templates () "Obsolete -- use vc-BACKEND-master-templates.")
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
43 (defvar vc-header-alist () "Obsolete -- use vc-BACKEND-header.")
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
44
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
45 (defcustom vc-handled-backends '(RCS CVS SCCS)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
46 "*List of version control backends for which VC will be used.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
47 Entries in this list will be tried in order to determine whether a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
48 file is under that sort of version control.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
49 Removing an entry from the list prevents VC from being activated
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
50 when visiting a file managed by that backend.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
51 An empty list disables VC altogether."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
52 :type '(repeat symbol)
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
53 :version "21.1"
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
54 :group 'vc)
13378
96ff45331eb4 (vc-utc-string): Use timezone of TIMEVAL for the correction, not the
André Spiegel <spiegel@gnu.org>
parents: 13034
diff changeset
55
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
56 (defcustom vc-path
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
57 (if (file-directory-p "/usr/sccs")
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
58 '("/usr/sccs")
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
59 nil)
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
60 "*List of extra directories to search for version control commands."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
61 :type '(repeat directory)
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
62 :group 'vc)
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
63
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
64 (defcustom vc-make-backup-files nil
5164
04d6b9e7782a (vc-make-backup-files): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 4726
diff changeset
65 "*If non-nil, backups of registered files are made as with other files.
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
66 If nil (the default), files covered by version control don't get backups."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
67 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
68 :group 'vc)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
69
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
70 (defcustom vc-follow-symlinks 'ask
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
71 "*What to do if visiting a symbolic link to a file under version control.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
72 Editing such a file through the link bypasses the version control system,
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
73 which is dangerous and probably not what you want.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
74
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
75 If this variable is t, VC follows the link and visits the real file,
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
76 telling you about it in the echo area. If it is `ask', VC asks for
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
77 confirmation whether it should follow the link. If nil, the link is
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
78 visited and a warning displayed."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
79 :type '(choice (const :tag "Ask for confirmation" ask)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
80 (const :tag "Visit link and warn" nil)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
81 (const :tag "Follow link" t))
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
82 :group 'vc)
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
83
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
84 (defcustom vc-display-status t
8982
2a81d1c79162 (vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents: 7568
diff changeset
85 "*If non-nil, display revision number and lock status in modeline.
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
86 Otherwise, not displayed."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
87 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
88 :group 'vc)
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
89
3900
c6f3d2af0df7 (vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3459
diff changeset
90
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
91 (defcustom vc-consult-headers t
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
92 "*If non-nil, identify work files by searching for version headers."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
93 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
94 :group 'vc)
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
95
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
96 (defcustom vc-keep-workfiles t
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
97 "*If non-nil, don't delete working files after registering changes.
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
98 If the back-end is CVS, workfiles are always kept, regardless of the
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
99 value of this flag."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
100 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
101 :group 'vc)
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
102
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
103 (defcustom vc-mistrust-permissions nil
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
104 "*If non-nil, don't assume permissions/ownership track version-control status.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
105 If nil, do rely on the permissions.
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
106 See also variable `vc-consult-headers'."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
107 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
108 :group 'vc)
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
109
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
110 (defun vc-mistrust-permissions (file)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
111 "Internal access function to variable `vc-mistrust-permissions' for FILE."
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
112 (or (eq vc-mistrust-permissions 't)
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
113 (and vc-mistrust-permissions
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
114 (funcall vc-mistrust-permissions
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
115 (vc-backend-subdirectory-name file)))))
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
116
46723
2d147caabf88 Don't add to minor-mode-alist.
Richard M. Stallman <rms@gnu.org>
parents: 46542
diff changeset
117 ;;; This is handled specially now.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
118 ;; Tell Emacs about this new kind of minor mode
46723
2d147caabf88 Don't add to minor-mode-alist.
Richard M. Stallman <rms@gnu.org>
parents: 46542
diff changeset
119 ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
120
2491
5f3061858f47 vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
121 (make-variable-buffer-local 'vc-mode)
2620
d26f75fd9f5e (vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents: 2491
diff changeset
122 (put 'vc-mode 'permanent-local t)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
123
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
124 (defun vc-mode (&optional arg)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
125 ;; Dummy function for C-h m
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
126 "Version Control minor mode.
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
127 This minor mode is automatically activated whenever you visit a file under
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
128 control of one of the revision control systems in `vc-handled-backends'.
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
129 VC commands are globally reachable under the prefix `\\[vc-prefix-map]':
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
130 \\{vc-prefix-map}")
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
131
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
132 (defmacro vc-error-occurred (&rest body)
40851
19448ae09fc0 (vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents: 39417
diff changeset
133 `(condition-case nil (progn ,@body nil) (error t)))
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
134
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
135 ;; We need a notion of per-file properties because the version
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
136 ;; control state of a file is expensive to derive --- we compute
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
137 ;; them when the file is initially found, keep them up to date
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
138 ;; during any subsequent VC operations, and forget them when
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
139 ;; the buffer is killed.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
140
40851
19448ae09fc0 (vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents: 39417
diff changeset
141 (defvar vc-file-prop-obarray (make-vector 17 0)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
142 "Obarray for per-file properties.")
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
143
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
144 (defvar vc-touched-properties nil)
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
145
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
146 (defun vc-file-setprop (file property value)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
147 "Set per-file VC PROPERTY for FILE to VALUE."
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
148 (if (and vc-touched-properties
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
149 (not (memq property vc-touched-properties)))
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
150 (setq vc-touched-properties (append (list property)
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
151 vc-touched-properties)))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
152 (put (intern file vc-file-prop-obarray) property value))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
153
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
154 (defun vc-file-getprop (file property)
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
155 "Get per-file VC PROPERTY for FILE."
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
156 (get (intern file vc-file-prop-obarray) property))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
157
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
158 (defun vc-file-clearprops (file)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
159 "Clear all VC properties of FILE."
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
160 (setplist (intern file vc-file-prop-obarray) nil))
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
161
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
162
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
163 ;; We keep properties on each symbol naming a backend as follows:
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
164 ;; * `vc-functions': an alist mapping vc-FUNCTION to vc-BACKEND-FUNCTION.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
165
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
166 (defun vc-make-backend-sym (backend sym)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
167 "Return BACKEND-specific version of VC symbol SYM."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
168 (intern (concat "vc-" (downcase (symbol-name backend))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
169 "-" (symbol-name sym))))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
170
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
171 (defun vc-find-backend-function (backend fun)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
172 "Return BACKEND-specific implementation of FUN.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
173 If there is no such implementation, return the default implementation;
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
174 if that doesn't exist either, return nil."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
175 (let ((f (vc-make-backend-sym backend fun)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
176 (if (fboundp f) f
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
177 ;; Load vc-BACKEND.el if needed.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
178 (require (intern (concat "vc-" (downcase (symbol-name backend)))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
179 (if (fboundp f) f
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
180 (let ((def (vc-make-backend-sym 'default fun)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
181 (if (fboundp def) (cons def backend) nil))))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
182
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
183 (defun vc-call-backend (backend function-name &rest args)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
184 "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
185 Calls
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
186
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
187 (apply 'vc-BACKEND-FUN ARGS)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
188
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
189 if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
190 and else calls
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
191
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
192 (apply 'vc-default-FUN BACKEND ARGS)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
193
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
194 It is usually called via the `vc-call' macro."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
195 (let ((f (cdr (assoc function-name (get backend 'vc-functions)))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
196 (unless f
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
197 (setq f (vc-find-backend-function backend function-name))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
198 (put backend 'vc-functions (cons (cons function-name f)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
199 (get backend 'vc-functions))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
200 (if (consp f)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
201 (apply (car f) (cdr f) args)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
202 (apply f args))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
203
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
204 (defmacro vc-call (fun file &rest args)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
205 ;; BEWARE!! `file' is evaluated twice!!
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
206 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
207
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
208
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
209 (defsubst vc-parse-buffer (pattern i)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
210 "Find PATTERN in the current buffer and return its Ith submatch."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
211 (goto-char (point-min))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
212 (if (re-search-forward pattern nil t)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
213 (match-string i)))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
214
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
215 (defun vc-insert-file (file &optional limit blocksize)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
216 "Insert the contents of FILE into the current buffer.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
217
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
218 Optional argument LIMIT is a regexp. If present, the file is inserted
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
219 in chunks of size BLOCKSIZE (default 8 kByte), until the first
46542
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
220 occurrence of LIMIT is found. Anything from the start of that occurence
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
221 to the end of the buffer is then deleted. The function returns
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
222 non-nil if FILE exists and its contents were successfully inserted."
12367
f268f652055e (vc-insert-file): Erase the current buffer before inserting the file.
Richard M. Stallman <rms@gnu.org>
parents: 12359
diff changeset
223 (erase-buffer)
33206
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
224 (when (file-exists-p file)
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
225 (if (not limit)
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
226 (insert-file-contents file)
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
227 (if (not blocksize) (setq blocksize 8192))
33247
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
228 (let ((filepos 0))
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
229 (while
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
230 (and (< 0 (cadr (insert-file-contents
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
231 file nil filepos (incf filepos blocksize))))
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
232 (progn (beginning-of-line)
46542
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
233 (let ((pos (re-search-forward limit nil 'move)))
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
234 (if pos (delete-region (match-beginning 0)
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
235 (point-max)))
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
236 (not pos)))))))
33206
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
237 (set-buffer-modified-p nil)
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
238 t))
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
239
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
240 ;; Access functions to file properties
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
241 ;; (Properties should be _set_ using vc-file-setprop, but
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
242 ;; _retrieved_ only through these functions, which decide
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
243 ;; if the property is already known or not. A property should
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
244 ;; only be retrieved by vc-file-getprop if there is no
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
245 ;; access function.)
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
246
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
247 ;; properties indicating the backend being used for FILE
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
248
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
249 (defun vc-registered (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
250 "Return non-nil if FILE is registered in a version control system.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
251
32070
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
252 This function performs the check each time it is called. To rely
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
253 on the result of a previous call, use `vc-backend' instead. If the
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
254 file was previously registered under a certain backend, then that
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
255 backend is tried first."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
256 (let (handler)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
257 (if (boundp 'file-name-handler-alist)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
258 (setq handler (find-file-name-handler file 'vc-registered)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
259 (if handler
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
260 ;; handler should set vc-backend and return t if registered
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
261 (funcall handler 'vc-registered file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
262 ;; There is no file name handler.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
263 ;; Try vc-BACKEND-registered for each handled BACKEND.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
264 (catch 'found
32070
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
265 (let ((backend (vc-file-getprop file 'vc-backend)))
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
266 (mapcar
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
267 (lambda (b)
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
268 (and (vc-call-backend b 'registered file)
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
269 (vc-file-setprop file 'vc-backend b)
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
270 (throw 'found t)))
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
271 (if (or (not backend) (eq backend 'none))
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
272 vc-handled-backends
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
273 (cons backend vc-handled-backends))))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
274 ;; File is not registered.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
275 (vc-file-setprop file 'vc-backend 'none)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
276 nil))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
277
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
278 (defun vc-backend (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
279 "Return the version control type of FILE, nil if it is not registered."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
280 ;; `file' can be nil in several places (typically due to the use of
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
281 ;; code like (vc-backend (buffer-file-name))).
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
282 (when (stringp file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
283 (let ((property (vc-file-getprop file 'vc-backend)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
284 ;; Note that internally, Emacs remembers unregistered
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
285 ;; files by setting the property to `none'.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
286 (cond ((eq property 'none) nil)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
287 (property)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
288 ;; vc-registered sets the vc-backend property
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
289 (t (if (vc-registered file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
290 (vc-file-getprop file 'vc-backend)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
291 nil))))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
292
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
293 (defun vc-backend-subdirectory-name (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
294 "Return where the master and lock FILEs for the current directory are kept."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
295 (symbol-name (vc-backend file)))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
296
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
297 (defun vc-name (file)
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
298 "Return the master name of FILE.
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
299 If the file is not registered, or the master name is not known, return nil."
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
300 ;; TODO: This should ultimately become obsolete, at least up here
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
301 ;; in vc-hooks.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
302 (or (vc-file-getprop file 'vc-name)
31808
25632a490236 (vc-name): Force correct computation of the value in case it is missing.
André Spiegel <spiegel@gnu.org>
parents: 31564
diff changeset
303 ;; force computation of the property by calling
25632a490236 (vc-name): Force correct computation of the value in case it is missing.
André Spiegel <spiegel@gnu.org>
parents: 31564
diff changeset
304 ;; vc-BACKEND-registered explicitly
25632a490236 (vc-name): Force correct computation of the value in case it is missing.
André Spiegel <spiegel@gnu.org>
parents: 31564
diff changeset
305 (if (and (vc-backend file)
25632a490236 (vc-name): Force correct computation of the value in case it is missing.
André Spiegel <spiegel@gnu.org>
parents: 31564
diff changeset
306 (vc-call-backend (vc-backend file) 'registered file))
21356
c714817643a9 (vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21232
diff changeset
307 (vc-file-getprop file 'vc-name))))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
308
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
309 (defun vc-checkout-model (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
310 "Indicate how FILE is checked out.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
311
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
312 If FILE is not registered, this function always returns nil.
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
313 For registered files, the possible values are:
12884
f47248851f26 (vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents: 12874
diff changeset
314
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
315 'implicit FILE is always writeable, and checked out `implicitly'
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
316 when the user saves the first changes to the file.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
317
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
318 'locking FILE is read-only if up-to-date; user must type
46453
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
319 \\[vc-next-action] before editing. Strict locking
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
320 is assumed.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
321
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
322 'announce FILE is read-only if up-to-date; user must type
46453
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
323 \\[vc-next-action] before editing. But other users
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
324 may be editing at the same time."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
325 (or (vc-file-getprop file 'vc-checkout-model)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
326 (if (vc-backend file)
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
327 (vc-file-setprop file 'vc-checkout-model
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
328 (vc-call checkout-model file)))))
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
329
16742
25558bcdfc93 (vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents: 16446
diff changeset
330 (defun vc-user-login-name (&optional uid)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
331 "Return the name under which the user is logged in, as a string.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
332 \(With optional argument UID, return the name of that user.)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
333 This function does the same as function `user-login-name', but unlike
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
334 that, it never returns nil. If a UID cannot be resolved, that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
335 UID is returned as a string."
16742
25558bcdfc93 (vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents: 16446
diff changeset
336 (or (user-login-name uid)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
337 (number-to-string (or uid (user-uid)))))
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
338
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
339 (defun vc-state (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
340 "Return the version control state of FILE.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
341
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
342 If FILE is not registered, this function always returns nil.
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
343 For registered files, the value returned is one of:
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
344
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
345 'up-to-date The working file is unmodified with respect to the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
346 latest version on the current branch, and not locked.
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
347
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
348 'edited The working file has been edited by the user. If
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
349 locking is used for the file, this state means that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
350 the current version is locked by the calling user.
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
351
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
352 USER The current version of the working file is locked by
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
353 some other USER (a string).
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
354
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
355 'needs-patch The file has not been edited by the user, but there is
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
356 a more recent version on the current branch stored
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
357 in the master file.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
358
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
359 'needs-merge The file has been edited by the user, and there is also
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
360 a more recent version on the current branch stored in
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
361 the master file. This state can only occur if locking
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
362 is not used for the file.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
363
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
364 'unlocked-changes The current version of the working file is not locked,
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
365 but the working file has been changed with respect
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
366 to that version. This state can only occur for files
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
367 with locking; it represents an erroneous condition that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
368 should be resolved by the user (vc-next-action will
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
369 prompt the user to do it)."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
370 (or (vc-file-getprop file 'vc-state)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
371 (if (vc-backend file)
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
372 (vc-file-setprop file 'vc-state
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
373 (vc-call state-heuristic file)))))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
374
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
375 (defsubst vc-up-to-date-p (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
376 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
377 (eq (vc-state file) 'up-to-date))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
378
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
379 (defun vc-default-state-heuristic (backend file)
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
380 "Default implementation of vc-state-heuristic.
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
381 It simply calls the real state computation function `vc-BACKEND-state'
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
382 and does not employ any heuristic at all."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
383 (vc-call-backend backend 'state file))
12252
e07d55d05864 (vc-fetch-master-properties): For RCS file,
Richard M. Stallman <rms@gnu.org>
parents: 12251
diff changeset
384
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
385 (defun vc-workfile-version (file)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
386 "Return the version level of the current workfile FILE.
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
387 If FILE is not registered, this function always returns nil."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
388 (or (vc-file-getprop file 'vc-workfile-version)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
389 (if (vc-backend file)
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
390 (vc-file-setprop file 'vc-workfile-version
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
391 (vc-call workfile-version file)))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
392
33634
c97a649b1987 Undo prev change.
André Spiegel <spiegel@gnu.org>
parents: 33612
diff changeset
393 ;;; actual version-control code starts here
c97a649b1987 Undo prev change.
André Spiegel <spiegel@gnu.org>
parents: 33612
diff changeset
394
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
395 (defun vc-default-registered (backend file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
396 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
397 (let ((sym (vc-make-backend-sym backend 'master-templates)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
398 (unless (get backend 'vc-templates-grabbed)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
399 (put backend 'vc-templates-grabbed t)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
400 (set sym (append (delq nil
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
401 (mapcar
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
402 (lambda (template)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
403 (and (consp template)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
404 (eq (cdr template) backend)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
405 (car template)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
406 vc-master-templates))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
407 (symbol-value sym))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
408 (let ((result (vc-check-master-templates file (symbol-value sym))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
409 (if (stringp result)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
410 (vc-file-setprop file 'vc-name result)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
411 nil)))) ; Not registered
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
412
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
413 (defun vc-possible-master (s dirname basename)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
414 (cond
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
415 ((stringp s) (format s dirname basename))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
416 ((functionp s)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
417 ;; The template is a function to invoke. If the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
418 ;; function returns non-nil, that means it has found a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
419 ;; master. For backward compatibility, we also handle
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
420 ;; the case that the function throws a 'found atom
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
421 ;; and a pair (cons MASTER-FILE BACKEND).
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
422 (let ((result (catch 'found (funcall s dirname basename))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
423 (if (consp result) (car result) result)))))
21232
b682a769996d (vc-sccs-project-dir, vc-search-sccs-project-dir): New functions.
André Spiegel <spiegel@gnu.org>
parents: 20989
diff changeset
424
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
425 (defun vc-check-master-templates (file templates)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
426 "Return non-nil if there is a master corresponding to FILE.
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
427
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
428 TEMPLATES is a list of strings or functions. If an element is a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
429 string, it must be a control string as required by `format', with two
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
430 string placeholders, such as \"%sRCS/%s,v\". The directory part of
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
431 FILE is substituted for the first placeholder, the basename of FILE
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
432 for the second. If a file with the resulting name exists, it is taken
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
433 as the master of FILE, and returned.
9248
325cee61ab7f (vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents: 8982
diff changeset
434
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
435 If an element of TEMPLATES is a function, it is called with the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
436 directory part and the basename of FILE as arguments. It should
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
437 return non-nil if it finds a master; that value is then returned by
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
438 this function."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
439 (let ((dirname (or (file-name-directory file) ""))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
440 (basename (file-name-nondirectory file)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
441 (catch 'found
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
442 (mapcar
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
443 (lambda (s)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
444 (let ((trial (vc-possible-master s dirname basename)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
445 (if (and trial (file-exists-p trial)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
446 ;; Make sure the file we found with name
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
447 ;; TRIAL is not the source file itself.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
448 ;; That can happen with RCS-style names if
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
449 ;; the file name is truncated (e.g. to 14
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
450 ;; chars). See if either directory or
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
451 ;; attributes differ.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
452 (or (not (string= dirname
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
453 (file-name-directory trial)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
454 (not (equal (file-attributes file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
455 (file-attributes trial)))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
456 (throw 'found trial))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
457 templates))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
458
10176
332014233a2c (vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 9869
diff changeset
459 (defun vc-toggle-read-only (&optional verbose)
2620
d26f75fd9f5e (vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents: 2491
diff changeset
460 "Change read-only status of current buffer, perhaps via version control.
46453
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
461
2620
d26f75fd9f5e (vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents: 2491
diff changeset
462 If the buffer is visiting a file registered with version control,
d26f75fd9f5e (vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents: 2491
diff changeset
463 then check the file in or out. Otherwise, just change the read-only flag
23693
295cf395a392 (vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23255
diff changeset
464 of the buffer.
295cf395a392 (vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23255
diff changeset
465 With prefix argument, ask for version number to check in or check out.
295cf395a392 (vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents: 23255
diff changeset
466 Check-out of a specified version number does not lock the file;
46453
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
467 to do that, use this command a second time with no argument.
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
468
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
469 If you bind this function to \\[toggle-read-only], then Emacs checks files
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
470 in or out whenever you toggle the read-only flag."
10176
332014233a2c (vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 9869
diff changeset
471 (interactive "P")
18850
238067491696 (vc-find-cvs-master): Corrected parsing of CVS/Entries, according to CVS docs.
André Spiegel <spiegel@gnu.org>
parents: 18403
diff changeset
472 (if (or (and (boundp 'vc-dired-mode) vc-dired-mode)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
473 ;; use boundp because vc.el might not be loaded
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
474 (vc-backend (buffer-file-name)))
10176
332014233a2c (vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 9869
diff changeset
475 (vc-next-action verbose)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
476 (toggle-read-only)))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
477
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
478 (defun vc-default-make-version-backups-p (backend file)
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
479 "Return non-nil if unmodified versions should be backed up locally.
41956
48dc7989392b (vc-default-make-version-backups-p): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40851
diff changeset
480 The default is to switch off this feature."
32127
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
481 nil)
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
482
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
483 (defun vc-version-backup-file-name (file &optional rev manual regexp)
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
484 "Return a backup file name for REV or the current version of FILE.
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
485 If MANUAL is non-nil it means that a name for backups created by
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
486 the user should be returned; if REGEXP is non-nil that means to return
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
487 a regexp for matching all such backup files, regardless of the version."
32949
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
488 (if regexp
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
489 (concat (regexp-quote (file-name-nondirectory file))
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
490 "\\.~[0-9.]+" (unless manual "\\.") "~")
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
491 (expand-file-name (concat (file-name-nondirectory file)
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
492 ".~" (or rev (vc-workfile-version file))
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
493 (unless manual ".") "~")
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
494 (file-name-directory file))))
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
495
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
496 (defun vc-delete-automatic-version-backups (file)
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
497 "Delete all existing automatic version backups for FILE."
39389
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
498 (condition-case nil
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
499 (mapcar
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
500 'delete-file
39417
c13780d8dbd2 (vc-delete-automatic-version-backups): Handle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39389
diff changeset
501 (directory-files (or (file-name-directory file) default-directory) t
39389
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
502 (vc-version-backup-file-name file nil nil t)))
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
503 ;; Don't fail when the directory doesn't exist.
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
504 (file-error nil)))
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
505
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
506 (defun vc-make-version-backup (file)
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
507 "Make a backup copy of FILE, which is assumed in sync with the repository.
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
508 Before doing that, check if there are any old backups and get rid of them."
32953
3632d408929e (vc-make-version-backup): Don't do it on MS-DOS without long file
André Spiegel <spiegel@gnu.org>
parents: 32949
diff changeset
509 (unless (and (fboundp 'msdos-long-file-names)
3632d408929e (vc-make-version-backup): Don't do it on MS-DOS without long file
André Spiegel <spiegel@gnu.org>
parents: 32949
diff changeset
510 (not (msdos-long-file-names)))
3632d408929e (vc-make-version-backup): Don't do it on MS-DOS without long file
André Spiegel <spiegel@gnu.org>
parents: 32949
diff changeset
511 (vc-delete-automatic-version-backups file)
3632d408929e (vc-make-version-backup): Don't do it on MS-DOS without long file
André Spiegel <spiegel@gnu.org>
parents: 32949
diff changeset
512 (copy-file file (vc-version-backup-file-name file)
3632d408929e (vc-make-version-backup): Don't do it on MS-DOS without long file
André Spiegel <spiegel@gnu.org>
parents: 32949
diff changeset
513 nil 'keep-date)))
32127
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
514
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
515 (defun vc-before-save ()
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
516 "Function to be called by `basic-save-buffer' (in files.el)."
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
517 ;; If the file on disk is still in sync with the repository,
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
518 ;; and version backups should be made, copy the file to
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
519 ;; another name. This enables local diffs and local reverting.
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
520 (let ((file (buffer-file-name)))
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
521 (and (vc-backend file)
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
522 (vc-up-to-date-p file)
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
523 (eq (vc-checkout-model file) 'implicit)
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
524 (vc-call make-version-backups-p file)
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
525 (vc-make-version-backup file))))
32127
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
526
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
527 (defun vc-after-save ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
528 "Function to be called by `basic-save-buffer' (in files.el)."
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
529 ;; If the file in the current buffer is under version control,
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
530 ;; up-to-date, and locking is not used for the file, set
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
531 ;; the state to 'edited and redisplay the mode line.
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
532 (let ((file (buffer-file-name)))
21356
c714817643a9 (vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents: 21232
diff changeset
533 (and (vc-backend file)
12967
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
534 (or (and (equal (vc-file-getprop file 'vc-checkout-time)
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
535 (nth 5 (file-attributes file)))
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
536 ;; File has been saved in the same second in which
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
537 ;; it was checked out. Clear the checkout-time
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
538 ;; to avoid confusion.
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
539 (vc-file-setprop file 'vc-checkout-time nil))
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
540 t)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
541 (vc-up-to-date-p file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
542 (eq (vc-checkout-model file) 'implicit)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
543 (vc-file-setprop file 'vc-state 'edited)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
544 (vc-mode-line file)
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
545 (if (featurep 'vc)
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
546 ;; If VC is not loaded, then there can't be
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
547 ;; any VC Dired buffer to synchronize.
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
548 (vc-dired-resynch-file file)))))
12884
f47248851f26 (vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents: 12874
diff changeset
549
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
550 (defun vc-mode-line (file)
2491
5f3061858f47 vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
551 "Set `vc-mode' to display type of version control for FILE.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
552 The value is set in the current buffer, which should be the buffer
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
553 visiting FILE."
32188
a771b5a6fa69 (vc-mode-line): Fix interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32127
diff changeset
554 (interactive (list buffer-file-name))
43449
a6beccc5505e Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents: 42021
diff changeset
555 (if (not (vc-backend file))
a6beccc5505e Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents: 42021
diff changeset
556 (setq vc-mode nil)
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
557 (setq vc-mode (concat " " (if vc-display-status
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
558 (vc-call mode-line-string file)
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
559 (symbol-name (vc-backend file)))))
15448
593dadb4f287 (vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents: 15196
diff changeset
560 ;; If the file is locked by some other user, make
593dadb4f287 (vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents: 15196
diff changeset
561 ;; the buffer read-only. Like this, even root
15517
d9bb8f6b05a0 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 15448
diff changeset
562 ;; cannot modify a file that someone else has locked.
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
563 (and (equal file (buffer-file-name))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
564 (stringp (vc-state file))
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
565 (setq buffer-read-only t))
15517
d9bb8f6b05a0 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 15448
diff changeset
566 ;; If the user is root, and the file is not owner-writable,
d9bb8f6b05a0 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 15448
diff changeset
567 ;; then pretend that we can't write it
d9bb8f6b05a0 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 15448
diff changeset
568 ;; even though we can (because root can write anything).
d9bb8f6b05a0 Comment changes.
Richard M. Stallman <rms@gnu.org>
parents: 15448
diff changeset
569 ;; This way, even root cannot modify a file that isn't locked.
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
570 (and (equal file (buffer-file-name))
15448
593dadb4f287 (vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents: 15196
diff changeset
571 (not buffer-read-only)
593dadb4f287 (vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents: 15196
diff changeset
572 (zerop (user-real-uid))
593dadb4f287 (vc-mode-line): If user is root, verify file really has user-writable bit.
Richard M. Stallman <rms@gnu.org>
parents: 15196
diff changeset
573 (zerop (logand (file-modes (buffer-file-name)) 128))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
574 (setq buffer-read-only t)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
575 (force-mode-line-update)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
576 (vc-backend file))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
577
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
578 (defun vc-default-mode-line-string (backend file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
579 "Return string for placement in modeline by `vc-mode-line' for FILE.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
580 Format:
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
581
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
582 \"BACKEND-REV\" if the file is up-to-date
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
583 \"BACKEND:REV\" if the file is edited (or locked by the calling user)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
584 \"BACKEND:LOCKER:REV\" if the file is locked by somebody else
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
585
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
586 This function assumes that the file is registered."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
587 (setq backend (symbol-name backend))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
588 (let ((state (vc-state file))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
589 (rev (vc-workfile-version file)))
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
590 (cond ((or (eq state 'up-to-date)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
591 (eq state 'needs-patch))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
592 (concat backend "-" rev))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
593 ((stringp state)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
594 (concat backend ":" state ":" rev))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
595 (t
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
596 ;; Not just for the 'edited state, but also a fallback
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
597 ;; for all other states. Think about different symbols
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
598 ;; for 'needs-patch and 'needs-merge.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
599 (concat backend ":" rev)))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
600
14647
b1a88c3a6912 (vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents: 14622
diff changeset
601 (defun vc-follow-link ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
602 "If current buffer visits a symbolic link, visit the real file.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
603 If the real file is already visited in another buffer, make that buffer
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
604 current, and kill the buffer that visits the link."
15161
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
605 (let* ((truename (abbreviate-file-name (file-chase-links buffer-file-name)))
14673
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
606 (true-buffer (find-buffer-visiting truename))
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
607 (this-buffer (current-buffer)))
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
608 (if (eq true-buffer this-buffer)
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
609 (progn
14674
f585d3bf3a73 (vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents: 14673
diff changeset
610 (kill-buffer this-buffer)
14673
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
611 ;; In principle, we could do something like set-visited-file-name.
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
612 ;; However, it can't be exactly the same as set-visited-file-name.
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
613 ;; I'm not going to work out the details right now. -- rms.
14674
f585d3bf3a73 (vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents: 14673
diff changeset
614 (set-buffer (find-file-noselect truename)))
14673
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
615 (set-buffer true-buffer)
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
616 (kill-buffer this-buffer))))
14647
b1a88c3a6912 (vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents: 14622
diff changeset
617
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
618 (defun vc-find-file-hook ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
619 "Function for `find-file-hooks' activating VC mode if appropriate."
2218
13be90dfef0c Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents: 2213
diff changeset
620 ;; Recompute whether file is version controlled,
13be90dfef0c Merge today's change by eric with everybody else's
Paul Eggert <eggert@twinsun.com>
parents: 2213
diff changeset
621 ;; if user has killed the buffer and revisited.
43449
a6beccc5505e Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents: 42021
diff changeset
622 (if vc-mode
a6beccc5505e Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents: 42021
diff changeset
623 (setq vc-mode nil))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
624 (when buffer-file-name
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
625 (vc-file-clearprops buffer-file-name)
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
626 (cond
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
627 ((vc-backend buffer-file-name)
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
628 (vc-mode-line buffer-file-name)
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
629 (cond ((not vc-make-backup-files)
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
630 ;; Use this variable, not make-backup-files,
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
631 ;; because this is for things that depend on the file name.
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
632 (make-local-variable 'backup-inhibited)
12590
a771c59393e7 (vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents: 12561
diff changeset
633 (setq backup-inhibited t))))
a771c59393e7 (vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents: 12561
diff changeset
634 ((let* ((link (file-symlink-p buffer-file-name))
15196
414e523050d5 (vc-find-file-hook): Follow multiple links all the way.
Richard M. Stallman <rms@gnu.org>
parents: 15161
diff changeset
635 (link-type (and link (vc-backend (file-chase-links link)))))
12590
a771c59393e7 (vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents: 12561
diff changeset
636 (if link-type
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
637 (cond ((eq vc-follow-symlinks nil)
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
638 (message
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
639 "Warning: symbolic link to %s-controlled source file" link-type))
15161
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
640 ((or (not (eq vc-follow-symlinks 'ask))
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
641 ;; If we already visited this file by following
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
642 ;; the link, don't ask again if we try to visit
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
643 ;; it again. GUD does that, and repeated questions
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
644 ;; are painful.
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
645 (get-file-buffer
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
646 (abbreviate-file-name
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
647 (file-chase-links buffer-file-name))))
15161
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
648
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
649 (vc-follow-link)
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
650 (message "Followed link to %s" buffer-file-name)
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
651 (vc-find-file-hook))
ea07411f268e (vc-follow-link, vc-find-file-hook):
Richard M. Stallman <rms@gnu.org>
parents: 14734
diff changeset
652 (t
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
653 (if (yes-or-no-p (format
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
654 "Symbolic link to %s-controlled source file; follow link? " link-type))
14647
b1a88c3a6912 (vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents: 14622
diff changeset
655 (progn (vc-follow-link)
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
656 (message "Followed link to %s" buffer-file-name)
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
657 (vc-find-file-hook))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
658 (message
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
659 "Warning: editing through the link bypasses version control")
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
660 )))))))))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
661
4655
604a401e05a4 (vc-find-file-hook, vc-file-not-found-hook): Use add-hook to install.
Paul Eggert <eggert@twinsun.com>
parents: 4338
diff changeset
662 (add-hook 'find-file-hooks 'vc-find-file-hook)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
663
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
664 ;; more hooks, this time for file-not-found
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
665 (defun vc-file-not-found-hook ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
666 "When file is not found, try to check it out from version control.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
667 Returns t if checkout was successful, nil otherwise.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
668 Used in `find-file-not-found-hooks'."
22947
f20bf5cd31d9 (vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents: 22112
diff changeset
669 ;; When a file does not exist, ignore cached info about it
f20bf5cd31d9 (vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents: 22112
diff changeset
670 ;; from a previous visit.
f20bf5cd31d9 (vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents: 22112
diff changeset
671 (vc-file-clearprops buffer-file-name)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
672 (if (and (vc-backend buffer-file-name)
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
673 (yes-or-no-p
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
674 (format "File %s was lost; check out from version control? "
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
675 (file-name-nondirectory buffer-file-name))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
676 (save-excursion
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
677 (require 'vc)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
678 (setq default-directory (file-name-directory buffer-file-name))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
679 (not (vc-error-occurred (vc-checkout buffer-file-name))))))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
680
4655
604a401e05a4 (vc-find-file-hook, vc-file-not-found-hook): Use add-hook to install.
Paul Eggert <eggert@twinsun.com>
parents: 4338
diff changeset
681 (add-hook 'find-file-not-found-hooks 'vc-file-not-found-hook)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
682
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
683 (defun vc-kill-buffer-hook ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
684 "Discard VC info about a file when we kill its buffer."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
685 (if (buffer-file-name)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
686 (vc-file-clearprops (buffer-file-name))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
687
47003
fe0d9d5309e4 (vc-kill-buffer-hook): Add it to kill-buffer-hook again.
André Spiegel <spiegel@gnu.org>
parents: 46723
diff changeset
688 (add-hook 'kill-buffer-hook 'vc-kill-buffer-hook)
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
689
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
690 ;; Now arrange for (autoloaded) bindings of the main package.
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
691 ;; Bindings for this have to go in the global map, as we'll often
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
692 ;; want to call them from random buffers.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
693
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
694 ;; Autoloading works fine, but it prevents shortcuts from appearing
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
695 ;; in the menu because they don't exist yet when the menu is built.
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
696 ;; (autoload 'vc-prefix-map "vc" nil nil 'keymap)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
697 (defvar vc-prefix-map
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
698 (let ((map (make-sparse-keymap)))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
699 (define-key map "a" 'vc-update-change-log)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
700 (define-key map "b" 'vc-switch-backend)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
701 (define-key map "c" 'vc-cancel-version)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
702 (define-key map "d" 'vc-directory)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
703 (define-key map "g" 'vc-annotate)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
704 (define-key map "h" 'vc-insert-headers)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
705 (define-key map "i" 'vc-register)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
706 (define-key map "l" 'vc-print-log)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
707 (define-key map "m" 'vc-merge)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
708 (define-key map "r" 'vc-retrieve-snapshot)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
709 (define-key map "s" 'vc-create-snapshot)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
710 (define-key map "u" 'vc-revert-buffer)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
711 (define-key map "v" 'vc-next-action)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
712 (define-key map "=" 'vc-diff)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
713 (define-key map "~" 'vc-version-other-window)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
714 map))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
715 (fset 'vc-prefix-map vc-prefix-map)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
716 (define-key global-map "\C-xv" 'vc-prefix-map)
8982
2a81d1c79162 (vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents: 7568
diff changeset
717
9869
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
718 (if (not (boundp 'vc-menu-map))
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
719 ;; Don't do the menu bindings if menu-bar.el wasn't loaded to defvar
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
720 ;; vc-menu-map.
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
721 ()
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
722 ;;(define-key vc-menu-map [show-files]
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
723 ;; '("Show Files under VC" . (vc-directory t)))
18403
bb63fa860267 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents: 18148
diff changeset
724 (define-key vc-menu-map [vc-retrieve-snapshot]
bb63fa860267 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents: 18148
diff changeset
725 '("Retrieve Snapshot" . vc-retrieve-snapshot))
bb63fa860267 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents: 18148
diff changeset
726 (define-key vc-menu-map [vc-create-snapshot]
bb63fa860267 (vc-menu-map): Add bindings for vc-retrieve-snapshot and vc-create-snapshot.
Richard M. Stallman <rms@gnu.org>
parents: 18148
diff changeset
727 '("Create Snapshot" . vc-create-snapshot))
23255
6b2b3ceeb3cd (vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents: 22947
diff changeset
728 (define-key vc-menu-map [vc-directory] '("VC Directory Listing" . vc-directory))
9869
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
729 (define-key vc-menu-map [separator1] '("----"))
18148
c6e694b6de26 (vc-annotate): Entry "Annotate" added to menu and
Richard M. Stallman <rms@gnu.org>
parents: 17642
diff changeset
730 (define-key vc-menu-map [vc-annotate] '("Annotate" . vc-annotate))
9869
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
731 (define-key vc-menu-map [vc-rename-file] '("Rename File" . vc-rename-file))
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
732 (define-key vc-menu-map [vc-version-other-window]
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
733 '("Show Other Version" . vc-version-other-window))
43587
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
734 (define-key vc-menu-map [vc-diff] '("Compare with Base Version" . vc-diff))
9869
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
735 (define-key vc-menu-map [vc-update-change-log]
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
736 '("Update ChangeLog" . vc-update-change-log))
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
737 (define-key vc-menu-map [vc-print-log] '("Show History" . vc-print-log))
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
738 (define-key vc-menu-map [separator2] '("----"))
43587
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
739 (define-key vc-menu-map [vc-insert-header]
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
740 '("Insert Header" . vc-insert-headers))
9869
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
741 (define-key vc-menu-map [undo] '("Undo Last Check-In" . vc-cancel-version))
ae7a27dc719d Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents: 9826
diff changeset
742 (define-key vc-menu-map [vc-revert-buffer]
43587
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
743 '("Revert to Base Version" . vc-revert-buffer))
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
744 (define-key vc-menu-map [vc-update]
2e33fd043708 (vc-menu-map): New entry "Update to Latest Version", which calls
André Spiegel <spiegel@gnu.org>
parents: 43449
diff changeset
745 '("Update to Latest Version" . vc-update))
19103
3a841692390c (vc-menu-map): Replace entries for "Check In" and "Check Out" with
André Spiegel <spiegel@gnu.org>
parents: 19054
diff changeset
746 (define-key vc-menu-map [vc-next-action] '("Check In/Out" . vc-next-action))
14622
3d47471d947d Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents: 14566
diff changeset
747 (define-key vc-menu-map [vc-register] '("Register" . vc-register)))
3d47471d947d Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents: 14566
diff changeset
748
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
749 ;; These are not correct and it's not currently clear how doing it
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
750 ;; better (with more complicated expressions) might slow things down
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
751 ;; on older systems.
23255
6b2b3ceeb3cd (vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents: 22947
diff changeset
752
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
753 ;;(put 'vc-rename-file 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
754 ;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
755 ;;(put 'vc-version-other-window 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
756 ;;(put 'vc-diff 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
757 ;;(put 'vc-update-change-log 'menu-enable
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
758 ;; '(member (vc-buffer-backend) '(RCS CVS)))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
759 ;;(put 'vc-print-log 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
760 ;;(put 'vc-cancel-version 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
761 ;;(put 'vc-revert-buffer 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
762 ;;(put 'vc-insert-headers 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
763 ;;(put 'vc-next-action 'menu-enable 'vc-mode)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
764 ;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode)))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
765
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
766 (provide 'vc-hooks)
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
767
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
768 ;;; vc-hooks.el ends here