Mercurial > emacs
annotate lisp/vc-hooks.el @ 55093:f849da3c5bb4
*** empty log message ***
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Fri, 23 Apr 2004 00:25:28 +0000 |
parents | 08fcaad03634 |
children | a856350e29d5 9cb7ecf775c9 |
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 | 2 |
54397
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
3 ;; Copyright (C) 1992,93,94,95,96,98,99,2000,03,2004 |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
904 | 5 |
31382 | 6 ;; Author: FSF (see vc.el for full credits) |
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> | |
904 | 8 |
54912
08fcaad03634
(vc-default-workfile-unchanged-p): Quote signal.
André Spiegel <spiegel@gnu.org>
parents:
54783
diff
changeset
|
9 ;; $Id: vc-hooks.el,v 1.166 2004/04/11 15:03:21 spiegel Exp $ |
20989 | 10 |
904 | 11 ;; This file is part of GNU Emacs. |
12 | |
13 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
14 ;; it under the terms of the GNU General Public License as published by | |
15 ;; the Free Software Foundation; either version 2, or (at your option) | |
16 ;; any later version. | |
17 | |
18 ;; GNU Emacs is distributed in the hope that it will be useful, | |
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
21 ;; GNU General Public License for more details. | |
22 | |
23 ;; You should have received a copy of the GNU General Public License | |
14169 | 24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
26 ;; Boston, MA 02111-1307, USA. | |
904 | 27 |
28 ;;; Commentary: | |
29 | |
31382 | 30 ;; This is the always-loaded portion of VC. It takes care of |
31 ;; VC-related activities that are done when you visit a file, so that | |
32 ;; vc.el itself is loaded only when you use a VC command. See the | |
33 ;; commentary of vc.el. | |
904 | 34 |
35 ;;; Code: | |
36 | |
33856
6f1ab7313eb7
Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents:
33634
diff
changeset
|
37 (eval-when-compile |
6f1ab7313eb7
Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents:
33634
diff
changeset
|
38 (require 'cl)) |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
39 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
40 ;; 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
|
41 |
49620
c1b2182d8ca1
(vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents:
47918
diff
changeset
|
42 (defvar vc-ignore-vc-files nil) |
52300
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
43 (make-obsolete-variable 'vc-ignore-vc-files |
52302
15340592804c
(vc-ignore-vc-files, vc-master-templates): Doc fix - quote lisp symbols.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
52300
diff
changeset
|
44 "set `vc-handled-backends' to nil to disable VC.") |
52300
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
45 |
49620
c1b2182d8ca1
(vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents:
47918
diff
changeset
|
46 (defvar vc-master-templates ()) |
52300
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
47 (make-obsolete-variable 'vc-master-templates |
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
48 "to define master templates for a given BACKEND, use |
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
49 vc-BACKEND-master-templates. To enable or disable VC for a given |
52302
15340592804c
(vc-ignore-vc-files, vc-master-templates): Doc fix - quote lisp symbols.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
52300
diff
changeset
|
50 BACKEND, use `vc-handled-backends'.") |
52300
2672198e6a12
(vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents:
52055
diff
changeset
|
51 |
49620
c1b2182d8ca1
(vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents:
47918
diff
changeset
|
52 (defvar vc-header-alist ()) |
c1b2182d8ca1
(vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents:
47918
diff
changeset
|
53 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
54 |
54397
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
55 (defcustom vc-handled-backends '(RCS CVS SVN SCCS Arch MCVS) |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
56 ;; Arch and MCVS come last because they are per-tree rather than per-dir. |
31382 | 57 "*List of version control backends for which VC will be used. |
58 Entries in this list will be tried in order to determine whether a | |
59 file is under that sort of version control. | |
60 Removing an entry from the list prevents VC from being activated | |
61 when visiting a file managed by that backend. | |
62 An empty list disables VC altogether." | |
63 :type '(repeat symbol) | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
64 :version "21.1" |
20413 | 65 :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
|
66 |
20413 | 67 (defcustom vc-path |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
68 (if (file-directory-p "/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
69 '("/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
70 nil) |
20413 | 71 "*List of extra directories to search for version control commands." |
72 :type '(repeat directory) | |
73 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
74 |
20413 | 75 (defcustom vc-make-backup-files nil |
5164
04d6b9e7782a
(vc-make-backup-files): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
4726
diff
changeset
|
76 "*If non-nil, backups of registered files are made as with other files. |
20413 | 77 If nil (the default), files covered by version control don't get backups." |
78 :type 'boolean | |
51480
3da903950521
(vc-make-backup-files): Add :group backup.
Dave Love <fx@gnu.org>
parents:
51370
diff
changeset
|
79 :group 'vc |
3da903950521
(vc-make-backup-files): Add :group backup.
Dave Love <fx@gnu.org>
parents:
51370
diff
changeset
|
80 :group 'backup) |
904 | 81 |
20413 | 82 (defcustom vc-follow-symlinks 'ask |
31382 | 83 "*What to do if visiting a symbolic link to a file under version control. |
84 Editing such a file through the link bypasses the version control system, | |
85 which is dangerous and probably not what you want. | |
86 | |
87 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
|
88 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
|
89 confirmation whether it should follow the link. If nil, the link is |
20413 | 90 visited and a warning displayed." |
31382 | 91 :type '(choice (const :tag "Ask for confirmation" ask) |
92 (const :tag "Visit link and warn" nil) | |
93 (const :tag "Follow link" t)) | |
20413 | 94 :group 'vc) |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
95 |
20413 | 96 (defcustom vc-display-status t |
8982
2a81d1c79162
(vc-menu-map): Set up menu items.
Richard M. Stallman <rms@gnu.org>
parents:
7568
diff
changeset
|
97 "*If non-nil, display revision number and lock status in modeline. |
20413 | 98 Otherwise, not displayed." |
99 :type 'boolean | |
100 :group 'vc) | |
101 | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
102 |
20413 | 103 (defcustom vc-consult-headers t |
104 "*If non-nil, identify work files by searching for version headers." | |
105 :type 'boolean | |
106 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
107 |
20413 | 108 (defcustom vc-keep-workfiles t |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
109 "*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
|
110 If the back-end is CVS, workfiles are always kept, regardless of the |
20413 | 111 value of this flag." |
112 :type 'boolean | |
113 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
114 |
20413 | 115 (defcustom vc-mistrust-permissions nil |
31382 | 116 "*If non-nil, don't assume permissions/ownership track version-control status. |
117 If nil, do rely on the permissions. | |
20413 | 118 See also variable `vc-consult-headers'." |
119 :type 'boolean | |
120 :group 'vc) | |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
121 |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
122 (defun vc-mistrust-permissions (file) |
31382 | 123 "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
|
124 (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
|
125 (and vc-mistrust-permissions |
31382 | 126 (funcall vc-mistrust-permissions |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
127 (vc-backend-subdirectory-name file))))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
128 |
51761
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
129 (defcustom vc-stay-local t |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
130 "*Non-nil means use local operations when possible for remote repositories. |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
131 This avoids slow queries over the network and instead uses heuristics |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
132 and past information to determine the current status of a file. |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
133 |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
134 The value can also be a regular expression or list of regular |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
135 expressions to match against the host name of a repository; then VC |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
136 only stays local for hosts that match it. Alternatively, the value |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
137 can be a list of regular expressions where the first element is the |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
138 symbol `except'; then VC always stays local except for hosts matched |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
139 by these regular expressions." |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
140 :type '(choice (const :tag "Always stay local" t) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
141 (const :tag "Don't stay local" nil) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
142 (list :format "\nExamine hostname and %v" :tag "Examine hostname ..." |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
143 (set :format "%v" :inline t (const :format "%t" :tag "don't" except)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
144 (regexp :format " stay local,\n%t: %v" :tag "if it matches") |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
145 (repeat :format "%v%i\n" :inline t (regexp :tag "or")))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
146 :version "21.4" |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
147 :group 'vc) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
148 |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
149 (defun vc-stay-local-p (file) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
150 "Return non-nil if VC should stay local when handling FILE. |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
151 This uses the `repository-hostname' backend operation." |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
152 (let* ((backend (vc-backend file)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
153 (sym (vc-make-backend-sym backend 'stay-local)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
154 (stay-local (if (boundp sym) (symbol-value sym) t))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
155 (if (eq stay-local t) (setq stay-local vc-stay-local)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
156 (if (symbolp stay-local) stay-local |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
157 (let ((dirname (if (file-directory-p file) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
158 (directory-file-name file) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
159 (file-name-directory file)))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
160 (eq 'yes |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
161 (or (vc-file-getprop dirname 'vc-stay-local-p) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
162 (vc-file-setprop |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
163 dirname 'vc-stay-local-p |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
164 (let ((hostname (vc-call-backend |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
165 backend 'repository-hostname dirname))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
166 (if (not hostname) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
167 'no |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
168 (let ((default t)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
169 (if (eq (car-safe stay-local) 'except) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
170 (setq default nil stay-local (cdr stay-local))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
171 (when (consp stay-local) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
172 (setq stay-local |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
173 (mapconcat 'identity stay-local "\\|"))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
174 (if (if (string-match stay-local hostname) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
175 default (not default)) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
176 'yes 'no))))))))))) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
177 |
46723
2d147caabf88
Don't add to minor-mode-alist.
Richard M. Stallman <rms@gnu.org>
parents:
46542
diff
changeset
|
178 ;;; This is handled specially now. |
904 | 179 ;; 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
|
180 ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode)) |
904 | 181 |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
182 (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
|
183 (put 'vc-mode 'permanent-local t) |
904 | 184 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
185 (defun vc-mode (&optional arg) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
186 ;; Dummy function for C-h m |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
187 "Version Control minor mode. |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
188 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
|
189 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
|
190 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
|
191 \\{vc-prefix-map}") |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
192 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
193 (defmacro vc-error-occurred (&rest body) |
40851
19448ae09fc0
(vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents:
39417
diff
changeset
|
194 `(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
|
195 |
904 | 196 ;; 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
|
197 ;; control state of a file is expensive to derive --- we compute |
31382 | 198 ;; 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
|
199 ;; 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
|
200 ;; the buffer is killed. |
904 | 201 |
40851
19448ae09fc0
(vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents:
39417
diff
changeset
|
202 (defvar vc-file-prop-obarray (make-vector 17 0) |
904 | 203 "Obarray for per-file properties.") |
204 | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
205 (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
|
206 |
904 | 207 (defun vc-file-setprop (file property value) |
31382 | 208 "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
|
209 (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
|
210 (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
|
211 (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
|
212 vc-touched-properties))) |
904 | 213 (put (intern file vc-file-prop-obarray) property value)) |
214 | |
215 (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
|
216 "Get per-file VC PROPERTY for FILE." |
904 | 217 (get (intern file vc-file-prop-obarray) property)) |
218 | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
219 (defun vc-file-clearprops (file) |
31382 | 220 "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
|
221 (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
|
222 |
31382 | 223 |
224 ;; We keep properties on each symbol naming a backend as follows: | |
225 ;; * `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
|
226 |
31382 | 227 (defun vc-make-backend-sym (backend sym) |
228 "Return BACKEND-specific version of VC symbol SYM." | |
229 (intern (concat "vc-" (downcase (symbol-name backend)) | |
230 "-" (symbol-name sym)))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
231 |
31382 | 232 (defun vc-find-backend-function (backend fun) |
233 "Return BACKEND-specific implementation of FUN. | |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
234 If there is no such implementation, return the default implementation; |
31382 | 235 if that doesn't exist either, return nil." |
236 (let ((f (vc-make-backend-sym backend fun))) | |
237 (if (fboundp f) f | |
238 ;; Load vc-BACKEND.el if needed. | |
239 (require (intern (concat "vc-" (downcase (symbol-name backend))))) | |
240 (if (fboundp f) f | |
241 (let ((def (vc-make-backend-sym 'default fun))) | |
242 (if (fboundp def) (cons def backend) nil)))))) | |
243 | |
244 (defun vc-call-backend (backend function-name &rest args) | |
245 "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS. | |
246 Calls | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
247 |
31382 | 248 (apply 'vc-BACKEND-FUN ARGS) |
249 | |
250 if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el) | |
251 and else calls | |
252 | |
253 (apply 'vc-default-FUN BACKEND ARGS) | |
254 | |
255 It is usually called via the `vc-call' macro." | |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
256 (let ((f (assoc function-name (get backend 'vc-functions)))) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
257 (if f (setq f (cdr f)) |
31382 | 258 (setq f (vc-find-backend-function backend function-name)) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
259 (push (cons function-name f) (get backend 'vc-functions))) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
260 (cond |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
261 ((null f) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
262 (error "Sorry, %s is not implemented for %s" function-name backend)) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
263 ((consp f) (apply (car f) (cdr f) args)) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
264 (t (apply f args))))) |
31382 | 265 |
266 (defmacro vc-call (fun file &rest args) | |
267 ;; BEWARE!! `file' is evaluated twice!! | |
268 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args)) | |
269 | |
270 (defsubst vc-parse-buffer (pattern i) | |
271 "Find PATTERN in the current buffer and return its Ith submatch." | |
272 (goto-char (point-min)) | |
273 (if (re-search-forward pattern nil t) | |
274 (match-string i))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
275 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
276 (defun vc-insert-file (file &optional limit blocksize) |
31382 | 277 "Insert the contents of FILE into the current buffer. |
278 | |
279 Optional argument LIMIT is a regexp. If present, the file is inserted | |
280 in chunks of size BLOCKSIZE (default 8 kByte), until the first | |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
281 occurrence of LIMIT is found. Anything from the start of that occurrence |
46542
f8e6993503cf
(vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents:
46453
diff
changeset
|
282 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
|
283 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
|
284 (erase-buffer) |
33206
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
285 (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
|
286 (if (not limit) |
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
287 (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
|
288 (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
|
289 (let ((filepos 0)) |
23d61d30fcd0
(vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33206
diff
changeset
|
290 (while |
23d61d30fcd0
(vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33206
diff
changeset
|
291 (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
|
292 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
|
293 (progn (beginning-of-line) |
46542
f8e6993503cf
(vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents:
46453
diff
changeset
|
294 (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
|
295 (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
|
296 (point-max))) |
f8e6993503cf
(vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents:
46453
diff
changeset
|
297 (not pos))))))) |
33206
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
298 (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
|
299 t)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
300 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
301 ;; Access functions to file properties |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
302 ;; (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
|
303 ;; _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
|
304 ;; 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
|
305 ;; 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
|
306 ;; access function.) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
307 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
308 ;; properties indicating the backend being used for FILE |
31382 | 309 |
310 (defun vc-registered (file) | |
311 "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
|
312 |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 backend is tried first." |
31382 | 317 (let (handler) |
318 (if (boundp 'file-name-handler-alist) | |
319 (setq handler (find-file-name-handler file 'vc-registered))) | |
320 (if handler | |
321 ;; handler should set vc-backend and return t if registered | |
322 (funcall handler 'vc-registered file) | |
323 ;; There is no file name handler. | |
324 ;; Try vc-BACKEND-registered for each handled BACKEND. | |
325 (catch 'found | |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
326 (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
|
327 (mapcar |
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
328 (lambda (b) |
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
329 (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
|
330 (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
|
331 (throw 'found t))) |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
332 (if (or (not backend) (eq backend 'none)) |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
333 vc-handled-backends |
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
334 (cons backend vc-handled-backends)))) |
31382 | 335 ;; File is not registered. |
336 (vc-file-setprop file 'vc-backend 'none) | |
337 nil)))) | |
338 | |
339 (defun vc-backend (file) | |
340 "Return the version control type of FILE, nil if it is not registered." | |
341 ;; `file' can be nil in several places (typically due to the use of | |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
342 ;; code like (vc-backend buffer-file-name)). |
31382 | 343 (when (stringp file) |
344 (let ((property (vc-file-getprop file 'vc-backend))) | |
345 ;; Note that internally, Emacs remembers unregistered | |
346 ;; files by setting the property to `none'. | |
347 (cond ((eq property 'none) nil) | |
348 (property) | |
349 ;; vc-registered sets the vc-backend property | |
350 (t (if (vc-registered file) | |
351 (vc-file-getprop file 'vc-backend) | |
352 nil)))))) | |
353 | |
354 (defun vc-backend-subdirectory-name (file) | |
355 "Return where the master and lock FILEs for the current directory are kept." | |
356 (symbol-name (vc-backend file))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
357 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
358 (defun vc-name (file) |
31564 | 359 "Return the master name of FILE. |
360 If the file is not registered, or the master name is not known, return nil." | |
361 ;; TODO: This should ultimately become obsolete, at least up here | |
31382 | 362 ;; in vc-hooks. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
363 (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
|
364 ;; 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
|
365 ;; 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
|
366 (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
|
367 (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
|
368 (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
|
369 |
31382 | 370 (defun vc-checkout-model (file) |
371 "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
|
372 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
373 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
|
374 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
|
375 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
376 'implicit FILE is always writeable, and checked out `implicitly' |
31382 | 377 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
|
378 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
379 '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
|
380 \\[vc-next-action] before editing. Strict locking |
31382 | 381 is assumed. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
382 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
383 '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
|
384 \\[vc-next-action] before editing. But other users |
31382 | 385 may be editing at the same time." |
386 (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
|
387 (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
|
388 (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
|
389 (vc-call checkout-model file))))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
390 |
16742
25558bcdfc93
(vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents:
16446
diff
changeset
|
391 (defun vc-user-login-name (&optional uid) |
31382 | 392 "Return the name under which the user is logged in, as a string. |
393 \(With optional argument UID, return the name of that user.) | |
394 This function does the same as function `user-login-name', but unlike | |
395 that, it never returns nil. If a UID cannot be resolved, that | |
396 UID is returned as a string." | |
16742
25558bcdfc93
(vc-user-login-name): New function.
André Spiegel <spiegel@gnu.org>
parents:
16446
diff
changeset
|
397 (or (user-login-name uid) |
31382 | 398 (number-to-string (or uid (user-uid))))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
399 |
31382 | 400 (defun vc-state (file) |
401 "Return the version control state of FILE. | |
402 | |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
403 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
|
404 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
|
405 |
31382 | 406 'up-to-date The working file is unmodified with respect to the |
407 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
|
408 |
31382 | 409 'edited The working file has been edited by the user. If |
410 locking is used for the file, this state means that | |
411 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
|
412 |
31382 | 413 USER The current version of the working file is locked by |
414 some other USER (a string). | |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
415 |
31382 | 416 'needs-patch The file has not been edited by the user, but there is |
417 a more recent version on the current branch stored | |
418 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
|
419 |
31382 | 420 'needs-merge The file has been edited by the user, and there is also |
421 a more recent version on the current branch stored in | |
422 the master file. This state can only occur if locking | |
423 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
|
424 |
31382 | 425 'unlocked-changes The current version of the working file is not locked, |
426 but the working file has been changed with respect | |
427 to that version. This state can only occur for files | |
428 with locking; it represents an erroneous condition that | |
429 should be resolved by the user (vc-next-action will | |
430 prompt the user to do it)." | |
50895
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
431 ;; FIXME: New (sub)states needed (?): |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
432 ;; - `added' (i.e. `edited' but with no base version yet, |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
433 ;; typically represented by vc-workfile-version = "0") |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
434 ;; - `conflict' (i.e. `edited' with conflict markers) |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
435 ;; - `removed' |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
436 ;; - `copied' and `moved' (might be handled by `removed' and `added') |
31382 | 437 (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
|
438 (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
|
439 (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
|
440 (vc-call state-heuristic file))))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
441 |
31382 | 442 (defsubst vc-up-to-date-p (file) |
443 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'." | |
444 (eq (vc-state file) 'up-to-date)) | |
445 | |
446 (defun vc-default-state-heuristic (backend file) | |
31564 | 447 "Default implementation of vc-state-heuristic. |
448 It simply calls the real state computation function `vc-BACKEND-state' | |
449 and does not employ any heuristic at all." | |
31382 | 450 (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
|
451 |
47226
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
452 (defun vc-workfile-unchanged-p (file) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
453 "Return non-nil if FILE has not changed since the last checkout." |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
454 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time)) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
455 (lastmod (nth 5 (file-attributes file)))) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
456 (if checkout-time |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
457 (equal checkout-time lastmod) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
458 (let ((unchanged (vc-call workfile-unchanged-p file))) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
459 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0)) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
460 unchanged)))) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
461 |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
462 (defun vc-default-workfile-unchanged-p (backend file) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
463 "Check if FILE is unchanged by diffing against the master version. |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
464 Return non-nil if FILE is unchanged." |
54783
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
465 (zerop (condition-case err |
54561
225341adbb0d
(vc-arg-list): New function, which handles both compiled and
André Spiegel <spiegel@gnu.org>
parents:
54529
diff
changeset
|
466 ;; If the implementation supports it, let the output |
225341adbb0d
(vc-arg-list): New function, which handles both compiled and
André Spiegel <spiegel@gnu.org>
parents:
54529
diff
changeset
|
467 ;; go to *vc*, not *vc-diff*, since this is an internal call. |
225341adbb0d
(vc-arg-list): New function, which handles both compiled and
André Spiegel <spiegel@gnu.org>
parents:
54529
diff
changeset
|
468 (vc-call diff file nil nil "*vc*") |
54783
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
469 (wrong-number-of-arguments |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
470 ;; If this error came from the above call to vc-BACKEND-diff, |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
471 ;; try again without the optional buffer argument (for |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
472 ;; backward compatibility). Otherwise, resignal. |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
473 (if (or (not (eq (cadr err) |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
474 (indirect-function |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
475 (vc-find-backend-function (vc-backend file) |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
476 'diff)))) |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
477 (not (eq (caddr err) 5))) |
54912
08fcaad03634
(vc-default-workfile-unchanged-p): Quote signal.
André Spiegel <spiegel@gnu.org>
parents:
54783
diff
changeset
|
478 (signal 'wrong-number-of-arguments err) |
54783
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
479 (vc-call diff file)))))) |
47226
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
480 |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
481 (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
|
482 "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
|
483 If FILE is not registered, this function always returns nil." |
31382 | 484 (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
|
485 (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
|
486 (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
|
487 (vc-call workfile-version file))))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
488 |
31382 | 489 (defun vc-default-registered (backend file) |
490 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates." | |
491 (let ((sym (vc-make-backend-sym backend 'master-templates))) | |
492 (unless (get backend 'vc-templates-grabbed) | |
493 (put backend 'vc-templates-grabbed t) | |
494 (set sym (append (delq nil | |
495 (mapcar | |
496 (lambda (template) | |
497 (and (consp template) | |
498 (eq (cdr template) backend) | |
499 (car template))) | |
52051
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
500 (with-no-warnings |
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
501 vc-master-templates))) |
31382 | 502 (symbol-value sym)))) |
503 (let ((result (vc-check-master-templates file (symbol-value sym)))) | |
504 (if (stringp result) | |
505 (vc-file-setprop file 'vc-name result) | |
506 nil)))) ; Not registered | |
904 | 507 |
31382 | 508 (defun vc-possible-master (s dirname basename) |
509 (cond | |
510 ((stringp s) (format s dirname basename)) | |
511 ((functionp s) | |
512 ;; The template is a function to invoke. If the | |
513 ;; function returns non-nil, that means it has found a | |
514 ;; master. For backward compatibility, we also handle | |
515 ;; the case that the function throws a 'found atom | |
516 ;; and a pair (cons MASTER-FILE BACKEND). | |
517 (let ((result (catch 'found (funcall s dirname basename)))) | |
518 (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
|
519 |
31382 | 520 (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
|
521 "Return non-nil if there is a master corresponding to FILE. |
31382 | 522 |
523 TEMPLATES is a list of strings or functions. If an element is a | |
524 string, it must be a control string as required by `format', with two | |
525 string placeholders, such as \"%sRCS/%s,v\". The directory part of | |
526 FILE is substituted for the first placeholder, the basename of FILE | |
527 for the second. If a file with the resulting name exists, it is taken | |
528 as the master of FILE, and returned. | |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
529 |
31382 | 530 If an element of TEMPLATES is a function, it is called with the |
531 directory part and the basename of FILE as arguments. It should | |
532 return non-nil if it finds a master; that value is then returned by | |
533 this function." | |
534 (let ((dirname (or (file-name-directory file) "")) | |
535 (basename (file-name-nondirectory file))) | |
536 (catch 'found | |
31564 | 537 (mapcar |
31382 | 538 (lambda (s) |
539 (let ((trial (vc-possible-master s dirname basename))) | |
540 (if (and trial (file-exists-p trial) | |
541 ;; Make sure the file we found with name | |
542 ;; TRIAL is not the source file itself. | |
543 ;; That can happen with RCS-style names if | |
544 ;; the file name is truncated (e.g. to 14 | |
545 ;; chars). See if either directory or | |
546 ;; attributes differ. | |
547 (or (not (string= dirname | |
548 (file-name-directory trial))) | |
549 (not (equal (file-attributes file) | |
550 (file-attributes trial))))) | |
551 (throw 'found trial)))) | |
552 templates)))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
553 |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
554 (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
|
555 "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
|
556 |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
557 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
|
558 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
|
559 of the buffer. |
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
560 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
|
561 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
|
562 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
|
563 |
8a775aba60aa
Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
43587
diff
changeset
|
564 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
|
565 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
|
566 (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
|
567 (if (or (and (boundp 'vc-dired-mode) vc-dired-mode) |
31382 | 568 ;; use boundp because vc.el might not be loaded |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
569 (vc-backend buffer-file-name)) |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
570 (vc-next-action verbose) |
904 | 571 (toggle-read-only))) |
572 | |
32746
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
573 (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
|
574 "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
|
575 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
|
576 nil) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
577 |
32746
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
578 (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
|
579 "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
|
580 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
|
581 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
|
582 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
|
583 (if regexp |
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
584 (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
|
585 "\\.~[0-9.]+" (unless manual "\\.") "~") |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
586 (expand-file-name (concat (file-name-nondirectory file) |
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
587 ".~" (or rev (vc-workfile-version file)) |
32949
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
588 (unless manual ".") "~") |
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
589 (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
|
590 |
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
591 (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
|
592 "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
|
593 (condition-case nil |
6629bc0d69e5
(vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38373
diff
changeset
|
594 (mapcar |
6629bc0d69e5
(vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38373
diff
changeset
|
595 'delete-file |
39417
c13780d8dbd2
(vc-delete-automatic-version-backups): Handle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39389
diff
changeset
|
596 (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
|
597 (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
|
598 ;; 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
|
599 (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
|
600 |
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
601 (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
|
602 "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
|
603 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
|
604 (unless (and (fboundp 'msdos-long-file-names) |
52385
c114a41b1a70
(vc-make-version-backup): Fix the change made on
Eli Zaretskii <eliz@gnu.org>
parents:
52302
diff
changeset
|
605 (not (with-no-warnings (msdos-long-file-names)))) |
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
|
606 (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
|
607 (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
|
608 nil 'keep-date))) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
609 |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
610 (defun vc-before-save () |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
611 "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
|
612 ;; 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
|
613 ;; 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
|
614 ;; another name. This enables local diffs and local reverting. |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
615 (let ((file buffer-file-name)) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
616 (and (vc-backend file) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
617 (vc-up-to-date-p file) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
618 (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
|
619 (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
|
620 (vc-make-version-backup file)))) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
621 |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
622 (defun vc-after-save () |
31382 | 623 "Function to be called by `basic-save-buffer' (in files.el)." |
31564 | 624 ;; If the file in the current buffer is under version control, |
31382 | 625 ;; up-to-date, and locking is not used for the file, set |
626 ;; the state to 'edited and redisplay the mode line. | |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
627 (let ((file buffer-file-name)) |
21356
c714817643a9
(vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21232
diff
changeset
|
628 (and (vc-backend file) |
12967
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
629 (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
|
630 (nth 5 (file-attributes file))) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
631 ;; 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
|
632 ;; it was checked out. Clear the checkout-time |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
633 ;; to avoid confusion. |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
634 (vc-file-setprop file 'vc-checkout-time nil)) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
635 t) |
31382 | 636 (vc-up-to-date-p file) |
637 (eq (vc-checkout-model file) 'implicit) | |
638 (vc-file-setprop file 'vc-state 'edited) | |
639 (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
|
640 (if (featurep 'vc) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
641 ;; 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
|
642 ;; 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
|
643 (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
|
644 |
31382 | 645 (defun vc-mode-line (file) |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
646 "Set `vc-mode' to display type of version control for FILE. |
904 | 647 The value is set in the current buffer, which should be the buffer |
31382 | 648 visiting FILE." |
32188
a771b5a6fa69
(vc-mode-line): Fix interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32127
diff
changeset
|
649 (interactive (list buffer-file-name)) |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
650 (let ((backend (vc-backend file))) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
651 (if (not backend) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
652 (setq vc-mode nil) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
653 (setq vc-mode (concat " " (if vc-display-status |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
654 (vc-call mode-line-string file) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
655 (symbol-name backend)))) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
656 ;; If the file is locked by some other user, make |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
657 ;; the buffer read-only. Like this, even root |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
658 ;; cannot modify a file that someone else has locked. |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
659 (and (equal file buffer-file-name) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
660 (stringp (vc-state file)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
661 (setq buffer-read-only t)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
662 ;; If the user is root, and the file is not owner-writable, |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
663 ;; then pretend that we can't write it |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
664 ;; even though we can (because root can write anything). |
50895
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
665 ;; This way, even root cannot modify a file that isn't locked. |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
666 (and (equal file buffer-file-name) |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
667 (not buffer-read-only) |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
668 (zerop (user-real-uid)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
669 (zerop (logand (file-modes buffer-file-name) 128)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
670 (setq buffer-read-only t))) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
671 (force-mode-line-update) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
672 backend)) |
31382 | 673 |
674 (defun vc-default-mode-line-string (backend file) | |
675 "Return string for placement in modeline by `vc-mode-line' for FILE. | |
676 Format: | |
677 | |
678 \"BACKEND-REV\" if the file is up-to-date | |
679 \"BACKEND:REV\" if the file is edited (or locked by the calling user) | |
680 \"BACKEND:LOCKER:REV\" if the file is locked by somebody else | |
904 | 681 |
31382 | 682 This function assumes that the file is registered." |
683 (setq backend (symbol-name backend)) | |
684 (let ((state (vc-state file)) | |
685 (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
|
686 (cond ((or (eq state 'up-to-date) |
31382 | 687 (eq state 'needs-patch)) |
688 (concat backend "-" rev)) | |
689 ((stringp state) | |
690 (concat backend ":" state ":" rev)) | |
691 (t | |
692 ;; Not just for the 'edited state, but also a fallback | |
693 ;; for all other states. Think about different symbols | |
694 ;; for 'needs-patch and 'needs-merge. | |
695 (concat backend ":" rev))))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
696 |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
697 (defun vc-follow-link () |
31382 | 698 "If current buffer visits a symbolic link, visit the real file. |
699 If the real file is already visited in another buffer, make that buffer | |
700 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
|
701 (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
|
702 (true-buffer (find-buffer-visiting truename)) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
703 (this-buffer (current-buffer))) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
704 (if (eq true-buffer this-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
705 (progn |
14674
f585d3bf3a73
(vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents:
14673
diff
changeset
|
706 (kill-buffer this-buffer) |
14673
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
707 ;; 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
|
708 ;; 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
|
709 ;; 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
|
710 (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
|
711 (set-buffer true-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
712 (kill-buffer this-buffer)))) |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
713 |
54397
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
714 (defun vc-default-find-file-hook (backend) |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
715 nil) |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
716 |
904 | 717 (defun vc-find-file-hook () |
50880
c4ef9b4c327f
(find-file-hook, find-file-not-found-hook): Don't use the old ...-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50879
diff
changeset
|
718 "Function for `find-file-hook' 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
|
719 ;; 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
|
720 ;; 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
|
721 (if vc-mode |
a6beccc5505e
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42021
diff
changeset
|
722 (setq vc-mode nil)) |
31382 | 723 (when buffer-file-name |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
724 (vc-file-clearprops buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
725 (cond |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
726 ((vc-backend buffer-file-name) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
727 ;; Compute the state and put it in the modeline. |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
728 (vc-mode-line buffer-file-name) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
729 (unless vc-make-backup-files |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
730 ;; Use this variable, not make-backup-files, |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
731 ;; because this is for things that depend on the file name. |
54397
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
732 (set (make-local-variable 'backup-inhibited) t)) |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
733 ;; Let the backend setup any buffer-local things he needs. |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
734 (vc-call-backend (vc-backend buffer-file-name) 'find-file-hook)) |
12590
a771c59393e7
(vc-mode-line, vc-find-file-hook): Moved the test for
Richard M. Stallman <rms@gnu.org>
parents:
12561
diff
changeset
|
735 ((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
|
736 (link-type (and link (vc-backend (file-chase-links link))))) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
737 (cond ((not link-type) nil) ;Nothing to do. |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
738 ((eq vc-follow-symlinks nil) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
739 (message |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
740 "Warning: symbolic link to %s-controlled source file" link-type)) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
741 ((or (not (eq vc-follow-symlinks 'ask)) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
742 ;; If we already visited this file by following |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
743 ;; the link, don't ask again if we try to visit |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
744 ;; it again. GUD does that, and repeated questions |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
745 ;; are painful. |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
746 (get-file-buffer |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
747 (abbreviate-file-name |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
748 (file-chase-links buffer-file-name)))) |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
749 |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
750 (vc-follow-link) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
751 (message "Followed link to %s" buffer-file-name) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
752 (vc-find-file-hook)) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
753 (t |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
754 (if (yes-or-no-p (format |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
755 "Symbolic link to %s-controlled source file; follow link? " link-type)) |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
756 (progn (vc-follow-link) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
757 (message "Followed link to %s" buffer-file-name) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
758 (vc-find-file-hook)) |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
759 (message |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
760 "Warning: editing through the link bypasses version control") |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
761 )))))))) |
904 | 762 |
50880
c4ef9b4c327f
(find-file-hook, find-file-not-found-hook): Don't use the old ...-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50879
diff
changeset
|
763 (add-hook 'find-file-hook 'vc-find-file-hook) |
904 | 764 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
765 ;; more hooks, this time for file-not-found |
904 | 766 (defun vc-file-not-found-hook () |
31382 | 767 "When file is not found, try to check it out from version control. |
768 Returns t if checkout was successful, nil otherwise. | |
52055
8322fd2e3685
(vc-file-not-found-hook): Brr. Improve last doc fix.
Markus Rost <rost@math.uni-bielefeld.de>
parents:
52053
diff
changeset
|
769 Used in `find-file-not-found-functions'." |
22947
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
770 ;; 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
|
771 ;; from a previous visit. |
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
772 (vc-file-clearprops buffer-file-name) |
54529
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
773 (let ((backend (vc-backend buffer-file-name))) |
54613
51811f399af0
(vc-file-not-found-hook): Fix typo. From lorentey@elte.hu (L?rentey K?ly).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54561
diff
changeset
|
774 (if backend (vc-call-backend backend 'find-file-not-found-hook)))) |
54529
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
775 |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
776 (defun vc-default-find-file-not-found-hook (backend) |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
777 (if (yes-or-no-p |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
778 (format "File %s was lost; check out from version control? " |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
779 (file-name-nondirectory buffer-file-name))) |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
780 (save-excursion |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
781 (require 'vc) |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
782 (setq default-directory (file-name-directory buffer-file-name)) |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
783 (not (vc-error-occurred (vc-checkout buffer-file-name)))))) |
904 | 784 |
52051
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
785 (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook) |
904 | 786 |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
787 (defun vc-kill-buffer-hook () |
31382 | 788 "Discard VC info about a file when we kill its buffer." |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
789 (if buffer-file-name |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
790 (vc-file-clearprops buffer-file-name))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
791 |
47003
fe0d9d5309e4
(vc-kill-buffer-hook): Add it to kill-buffer-hook again.
André Spiegel <spiegel@gnu.org>
parents:
46723
diff
changeset
|
792 (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
|
793 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
794 ;; 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
|
795 ;; 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
|
796 ;; want to call them from random buffers. |
904 | 797 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
798 ;; 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
|
799 ;; 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
|
800 ;; (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
|
801 (defvar vc-prefix-map |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
802 (let ((map (make-sparse-keymap))) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
803 (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
|
804 (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
|
805 (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
|
806 (define-key map "d" 'vc-directory) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
807 (define-key map "g" 'vc-annotate) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
808 (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
|
809 (define-key map "i" 'vc-register) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
810 (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
|
811 (define-key map "m" 'vc-merge) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
812 (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
|
813 (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
|
814 (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
|
815 (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
|
816 (define-key map "=" 'vc-diff) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
817 (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
|
818 map)) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
819 (fset 'vc-prefix-map vc-prefix-map) |
31382 | 820 (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
|
821 |
9869
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
822 (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
|
823 ;; 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
|
824 ;; vc-menu-map. |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
825 () |
ae7a27dc719d
Only define items in vc-menu-map if it is boundp.
Roland McGrath <roland@gnu.org>
parents:
9826
diff
changeset
|
826 ;;(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
|
827 ;; '("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
|
828 (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
|
829 '("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
|
830 (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
|
831 '("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
|
832 (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
|
833 (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
|
834 (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
|
835 (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
|
836 (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
|
837 '("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
|
838 (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
|
839 (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
|
840 '("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
|
841 (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
|
842 (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
|
843 (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
|
844 '("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
|
845 (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
|
846 (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
|
847 '("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
|
848 (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
|
849 '("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
|
850 (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
|
851 (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
|
852 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
853 ;; 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
|
854 ;; 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
|
855 ;; on older systems. |
23255
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
856 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
857 ;;(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
|
858 ;;(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
|
859 ;;(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
|
860 ;;(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
|
861 ;;(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
|
862 ;; '(member (vc-buffer-backend) '(RCS CVS))) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
863 ;;(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
|
864 ;;(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
|
865 ;;(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
|
866 ;;(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
|
867 ;;(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
|
868 ;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode))) |
904 | 869 |
870 (provide 'vc-hooks) | |
871 | |
52401 | 872 ;;; arch-tag: 2e5a6fa7-1d30-48e2-8bd0-e3d335f04f32 |
904 | 873 ;;; vc-hooks.el ends here |