Mercurial > emacs
annotate lisp/vc-hooks.el @ 85490:5f331ce2c3b0
Condition out a misleading message.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Sat, 20 Oct 2007 16:32:50 +0000 |
parents | 14749907af36 |
children | 860a7a8e779e 1251cabc40b7 |
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 |
74442 | 3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
75347 | 4 ;; 2002, 2003, 2004, 2005, 2006, 2007 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 |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
9 ;; $Id$ |
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 | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78196
diff
changeset
|
15 ;; the Free Software Foundation; either version 3, or (at your option) |
904 | 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 |
64091 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, 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 ()) |
55099
a856350e29d5
(vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents:
54912
diff
changeset
|
47 (make-obsolete-variable 'vc-master-templates |
a856350e29d5
(vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents:
54912
diff
changeset
|
48 "to define master templates for a given BACKEND, use |
52300
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 |
77591
ec47afd2d1db
(vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
55 (defcustom vc-ignore-dir-regexp |
ec47afd2d1db
(vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
56 ;; Stop SMB, automounter, AFS, and DFS host lookups. |
ec47afd2d1db
(vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
57 "\\`\\(?:[\\/][\\/]\\|/\\(?:net\\|afs\\|\\.\\\.\\.\\)/\\)\\'" |
73351
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
58 "Regexp matching directory names that are not under VC's control. |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
59 The default regexp prevents fruitless and time-consuming attempts |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
60 to determine the VC status in directories in which filenames are |
73351
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
61 interpreted as hostnames." |
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
62 :type 'regexp |
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
63 :group 'vc) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
64 |
78792
76d9105e1528
(vc-handled-backends): Add Mtn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78791
diff
changeset
|
65 (defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Mtn Arch MCVS) |
78791 | 66 ;; RCS, CVS, SVN and SCCS come first because they are per-dir |
67 ;; rather than per-tree. RCS comes first because of the multibackend | |
68 ;; support intended to use RCS for local commits (with a remote CVS server). | |
69 "List of version control backends for which VC will be used. | |
31382 | 70 Entries in this list will be tried in order to determine whether a |
71 file is under that sort of version control. | |
72 Removing an entry from the list prevents VC from being activated | |
73 when visiting a file managed by that backend. | |
74 An empty list disables VC altogether." | |
75 :type '(repeat symbol) | |
81902
184879170b16
(vc-handled-backends): Move BZR later in the list.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81835
diff
changeset
|
76 :version "23.1" |
20413 | 77 :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
|
78 |
20413 | 79 (defcustom vc-path |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
80 (if (file-directory-p "/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
81 '("/usr/sccs") |
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
82 nil) |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
83 "List of extra directories to search for version control commands." |
20413 | 84 :type '(repeat directory) |
85 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
86 |
20413 | 87 (defcustom vc-make-backup-files nil |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
88 "If non-nil, backups of registered files are made as with other files. |
20413 | 89 If nil (the default), files covered by version control don't get backups." |
90 :type 'boolean | |
51480
3da903950521
(vc-make-backup-files): Add :group backup.
Dave Love <fx@gnu.org>
parents:
51370
diff
changeset
|
91 :group 'vc |
3da903950521
(vc-make-backup-files): Add :group backup.
Dave Love <fx@gnu.org>
parents:
51370
diff
changeset
|
92 :group 'backup) |
904 | 93 |
20413 | 94 (defcustom vc-follow-symlinks 'ask |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
95 "What to do if visiting a symbolic link to a file under version control. |
31382 | 96 Editing such a file through the link bypasses the version control system, |
97 which is dangerous and probably not what you want. | |
98 | |
99 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
|
100 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
|
101 confirmation whether it should follow the link. If nil, the link is |
20413 | 102 visited and a warning displayed." |
31382 | 103 :type '(choice (const :tag "Ask for confirmation" ask) |
104 (const :tag "Visit link and warn" nil) | |
105 (const :tag "Follow link" t)) | |
20413 | 106 :group 'vc) |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
107 |
20413 | 108 (defcustom vc-display-status t |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
109 "If non-nil, display revision number and lock status in modeline. |
20413 | 110 Otherwise, not displayed." |
111 :type 'boolean | |
112 :group 'vc) | |
113 | |
3900
c6f3d2af0df7
(vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents:
3459
diff
changeset
|
114 |
20413 | 115 (defcustom vc-consult-headers t |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
116 "If non-nil, identify work files by searching for version headers." |
20413 | 117 :type 'boolean |
118 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
119 |
20413 | 120 (defcustom vc-keep-workfiles t |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
121 "If non-nil, don't delete working files after registering changes. |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
122 If the back-end is CVS, workfiles are always kept, regardless of the |
20413 | 123 value of this flag." |
124 :type 'boolean | |
125 :group 'vc) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
126 |
20413 | 127 (defcustom vc-mistrust-permissions nil |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
128 "If non-nil, don't assume permissions/ownership track version-control status. |
31382 | 129 If nil, do rely on the permissions. |
20413 | 130 See also variable `vc-consult-headers'." |
131 :type 'boolean | |
132 :group 'vc) | |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
133 |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
134 (defun vc-mistrust-permissions (file) |
31382 | 135 "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
|
136 (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
|
137 (and vc-mistrust-permissions |
31382 | 138 (funcall vc-mistrust-permissions |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
139 (vc-backend-subdirectory-name file))))) |
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
140 |
51761
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
141 (defcustom vc-stay-local t |
81835
a4222c1c9c2d
Remove spurious * in docstrings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81834
diff
changeset
|
142 "Non-nil means use local operations when possible for remote repositories. |
51761
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
143 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
|
144 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
|
145 |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
146 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
|
147 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
|
148 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
|
149 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
|
150 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
|
151 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
|
152 :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
|
153 (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
|
154 (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
|
155 (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
|
156 (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
|
157 (repeat :format "%v%i\n" :inline t (regexp :tag "or")))) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59978
diff
changeset
|
158 :version "22.1" |
51761
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
159 :group 'vc) |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
160 |
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
161 (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
|
162 "Return non-nil if VC should stay local when handling FILE. |
82058
b9e06163e85b
(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82027
diff
changeset
|
163 This uses the `repository-hostname' backend operation. |
b9e06163e85b
(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82027
diff
changeset
|
164 If FILE is a list of files, return non-nil if any of them |
b9e06163e85b
(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82027
diff
changeset
|
165 individually should stay local." |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
166 (if (listp file) |
82058
b9e06163e85b
(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82027
diff
changeset
|
167 (delq nil (mapcar 'vc-stay-local-p file)) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
168 (let* ((backend (vc-backend file)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
169 (sym (vc-make-backend-sym backend 'stay-local)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
170 (stay-local (if (boundp sym) (symbol-value sym) t))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
171 (if (eq stay-local t) (setq stay-local vc-stay-local)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
172 (if (symbolp stay-local) stay-local |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
173 (let ((dirname (if (file-directory-p file) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
174 (directory-file-name file) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
175 (file-name-directory file)))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
176 (eq 'yes |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
177 (or (vc-file-getprop dirname 'vc-stay-local-p) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
178 (vc-file-setprop |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
179 dirname 'vc-stay-local-p |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
180 (let ((hostname (vc-call-backend |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
181 backend 'repository-hostname dirname))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
182 (if (not hostname) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
183 'no |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
184 (let ((default t)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
185 (if (eq (car-safe stay-local) 'except) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
186 (setq default nil stay-local (cdr stay-local))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
187 (when (consp stay-local) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
188 (setq stay-local |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
189 (mapconcat 'identity stay-local "\\|"))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
190 (if (if (string-match stay-local hostname) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
191 default (not default)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
192 'yes 'no)))))))))))) |
51761
856170cb64e9
(vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51480
diff
changeset
|
193 |
46723
2d147caabf88
Don't add to minor-mode-alist.
Richard M. Stallman <rms@gnu.org>
parents:
46542
diff
changeset
|
194 ;;; This is handled specially now. |
904 | 195 ;; 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
|
196 ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode)) |
904 | 197 |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
198 (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
|
199 (put 'vc-mode 'permanent-local t) |
904 | 200 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
201 (defun vc-mode (&optional arg) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
202 ;; Dummy function for C-h m |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
203 "Version Control minor mode. |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
204 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
|
205 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
|
206 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
|
207 \\{vc-prefix-map}") |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
208 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
209 (defmacro vc-error-occurred (&rest body) |
40851
19448ae09fc0
(vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents:
39417
diff
changeset
|
210 `(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
|
211 |
904 | 212 ;; 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
|
213 ;; control state of a file is expensive to derive --- we compute |
31382 | 214 ;; 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
|
215 ;; 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
|
216 ;; the buffer is killed. |
904 | 217 |
40851
19448ae09fc0
(vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents:
39417
diff
changeset
|
218 (defvar vc-file-prop-obarray (make-vector 17 0) |
904 | 219 "Obarray for per-file properties.") |
220 | |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
221 (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
|
222 |
904 | 223 (defun vc-file-setprop (file property value) |
31382 | 224 "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
|
225 (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
|
226 (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
|
227 (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
|
228 vc-touched-properties))) |
904 | 229 (put (intern file vc-file-prop-obarray) property value)) |
230 | |
231 (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
|
232 "Get per-file VC PROPERTY for FILE." |
904 | 233 (get (intern file vc-file-prop-obarray) property)) |
234 | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
235 (defun vc-file-clearprops (file) |
31382 | 236 "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
|
237 (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
|
238 |
31382 | 239 |
240 ;; We keep properties on each symbol naming a backend as follows: | |
241 ;; * `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
|
242 |
31382 | 243 (defun vc-make-backend-sym (backend sym) |
244 "Return BACKEND-specific version of VC symbol SYM." | |
245 (intern (concat "vc-" (downcase (symbol-name backend)) | |
246 "-" (symbol-name sym)))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
247 |
31382 | 248 (defun vc-find-backend-function (backend fun) |
249 "Return BACKEND-specific implementation of FUN. | |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
250 If there is no such implementation, return the default implementation; |
31382 | 251 if that doesn't exist either, return nil." |
252 (let ((f (vc-make-backend-sym backend fun))) | |
253 (if (fboundp f) f | |
254 ;; Load vc-BACKEND.el if needed. | |
255 (require (intern (concat "vc-" (downcase (symbol-name backend))))) | |
256 (if (fboundp f) f | |
257 (let ((def (vc-make-backend-sym 'default fun))) | |
258 (if (fboundp def) (cons def backend) nil)))))) | |
259 | |
260 (defun vc-call-backend (backend function-name &rest args) | |
261 "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS. | |
262 Calls | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
263 |
31382 | 264 (apply 'vc-BACKEND-FUN ARGS) |
265 | |
266 if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el) | |
267 and else calls | |
268 | |
269 (apply 'vc-default-FUN BACKEND ARGS) | |
270 | |
271 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
|
272 (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
|
273 (if f (setq f (cdr f)) |
31382 | 274 (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
|
275 (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
|
276 (cond |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
277 ((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
|
278 (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
|
279 ((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
|
280 (t (apply f args))))) |
31382 | 281 |
282 (defmacro vc-call (fun file &rest args) | |
82293 | 283 "A convenience macro for calling VC backend functions. |
284 Functions called by this macro must accept FILE as the first argument. | |
285 ARGS specifies any additional arguments. FUN should be unquoted. | |
286 BEWARE!! `file' is evaluated twice!!" | |
31382 | 287 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args)) |
288 | |
289 (defsubst vc-parse-buffer (pattern i) | |
290 "Find PATTERN in the current buffer and return its Ith submatch." | |
291 (goto-char (point-min)) | |
292 (if (re-search-forward pattern nil t) | |
293 (match-string i))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
294 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
295 (defun vc-insert-file (file &optional limit blocksize) |
31382 | 296 "Insert the contents of FILE into the current buffer. |
297 | |
298 Optional argument LIMIT is a regexp. If present, the file is inserted | |
299 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
|
300 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
|
301 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
|
302 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
|
303 (erase-buffer) |
33206
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
304 (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
|
305 (if (not limit) |
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
306 (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
|
307 (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
|
308 (let ((filepos 0)) |
23d61d30fcd0
(vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33206
diff
changeset
|
309 (while |
23d61d30fcd0
(vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33206
diff
changeset
|
310 (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
|
311 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
|
312 (progn (beginning-of-line) |
46542
f8e6993503cf
(vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents:
46453
diff
changeset
|
313 (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
|
314 (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
|
315 (point-max))) |
f8e6993503cf
(vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents:
46453
diff
changeset
|
316 (not pos))))))) |
33206
7feabfeb41cc
(vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents:
32953
diff
changeset
|
317 (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
|
318 t)) |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
319 |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
320 (defun vc-find-root (file witness) |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
321 "Find the root of a checked out project. |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
322 The function walks up the directory tree from FILE looking for WITNESS. |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
323 If WITNESS if not found, return nil, otherwise return the root." |
73351
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
324 ;; Represent /home/luser/foo as ~/foo so that we don't try to look for |
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
325 ;; witnesses in /home or in /. |
78196
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
326 (while (not (file-directory-p file)) |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
327 (setq file (file-name-directory (directory-file-name file)))) |
73351
29547db9ad61
(vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
328 (setq file (abbreviate-file-name file)) |
77729
a2d726c7e2d1
Sync change from trunk at request of rms in FOR-RELEASE:
Glenn Morris <rgm@gnu.org>
parents:
77591
diff
changeset
|
329 (let ((root nil) |
a2d726c7e2d1
Sync change from trunk at request of rms in FOR-RELEASE:
Glenn Morris <rgm@gnu.org>
parents:
77591
diff
changeset
|
330 (user (nth 2 (file-attributes file)))) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
331 (while (not (or root |
78196
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
332 (null file) |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
333 ;; As a heuristic, we stop looking up the hierarchy of |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
334 ;; directories as soon as we find a directory belonging |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
335 ;; to another user. This should save us from looking in |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
336 ;; things like /net and /afs. This assumes that all the |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
337 ;; files inside a project belong to the same user. |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
338 (not (equal user (nth 2 (file-attributes file)))) |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
339 (string-match vc-ignore-dir-regexp file))) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
340 (if (file-exists-p (expand-file-name witness file)) |
78196
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
341 (setq root file) |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
342 (if (equal file |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
343 (setq file (file-name-directory (directory-file-name file)))) |
2e0600da7d6a
(vc-find-root): Walk up the tree to find an existing
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
77805
diff
changeset
|
344 (setq file nil)))) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
345 root)) |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
346 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
347 ;; Access functions to file properties |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
348 ;; (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
|
349 ;; _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
|
350 ;; 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
|
351 ;; 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
|
352 ;; access function.) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
353 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
354 ;; properties indicating the backend being used for FILE |
31382 | 355 |
356 (defun vc-registered (file) | |
357 "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
|
358 |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
359 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
|
360 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
|
361 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
|
362 backend is tried first." |
31382 | 363 (let (handler) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
364 (cond |
85157
93de0ca0707d
Robustify a bit against filenames with no directory component.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
365 ((and (file-name-directory file) (string-match vc-ignore-dir-regexp (file-name-directory file))) |
93de0ca0707d
Robustify a bit against filenames with no directory component.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
366 nil) |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
367 ((and (boundp 'file-name-handler-alist) |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
368 (setq handler (find-file-name-handler file 'vc-registered))) |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
369 ;; handler should set vc-backend and return t if registered |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
370 (funcall handler 'vc-registered file)) |
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
371 (t |
31382 | 372 ;; There is no file name handler. |
373 ;; Try vc-BACKEND-registered for each handled BACKEND. | |
374 (catch 'found | |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
375 (let ((backend (vc-file-getprop file 'vc-backend))) |
82849
ea5864b698fd
* vc-hooks.el (vc-registered): Use mapc instead of mapcar.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82771
diff
changeset
|
376 (mapc |
32070
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
377 (lambda (b) |
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
378 (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
|
379 (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
|
380 (throw 'found t))) |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
381 (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
|
382 vc-handled-backends |
d1ab0499dc86
(vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents:
31808
diff
changeset
|
383 (cons backend vc-handled-backends)))) |
31382 | 384 ;; File is not registered. |
385 (vc-file-setprop file 'vc-backend 'none) | |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
386 nil))))) |
31382 | 387 |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
388 (defun vc-backend (file-or-list) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
389 "Return the version control type of FILE-OR-LIST, nil if it's not registered. |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
390 If the argument is a list, the files must all have the same back end." |
31382 | 391 ;; `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
|
392 ;; code like (vc-backend buffer-file-name)). |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
393 (cond ((stringp file-or-list) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
394 (let ((property (vc-file-getprop file-or-list 'vc-backend))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
395 ;; Note that internally, Emacs remembers unregistered |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
396 ;; files by setting the property to `none'. |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
397 (cond ((eq property 'none) nil) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
398 (property) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
399 ;; vc-registered sets the vc-backend property |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
400 (t (if (vc-registered file-or-list) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
401 (vc-file-getprop file-or-list 'vc-backend) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
402 nil))))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
403 ((and file-or-list (listp file-or-list)) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
404 (vc-backend (car file-or-list))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
405 (t |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
406 nil))) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
407 |
31382 | 408 |
409 (defun vc-backend-subdirectory-name (file) | |
410 "Return where the master and lock FILEs for the current directory are kept." | |
411 (symbol-name (vc-backend file))) | |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
412 |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
413 (defun vc-name (file) |
31564 | 414 "Return the master name of FILE. |
415 If the file is not registered, or the master name is not known, return nil." | |
416 ;; TODO: This should ultimately become obsolete, at least up here | |
31382 | 417 ;; in vc-hooks. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
418 (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
|
419 ;; 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
|
420 ;; 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
|
421 (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
|
422 (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
|
423 (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
|
424 |
31382 | 425 (defun vc-checkout-model (file) |
426 "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
|
427 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
428 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
|
429 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
|
430 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
431 'implicit FILE is always writeable, and checked out `implicitly' |
31382 | 432 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
|
433 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
434 '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
|
435 \\[vc-next-action] before editing. Strict locking |
31382 | 436 is assumed. |
12251
f2519a110e5f
The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents:
12102
diff
changeset
|
437 |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
438 '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
|
439 \\[vc-next-action] before editing. But other users |
31382 | 440 may be editing at the same time." |
441 (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
|
442 (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
|
443 (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
|
444 (vc-call checkout-model file))))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
445 |
68383
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
446 (defun vc-user-login-name (file) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
447 "Return the name under which the user accesses the given FILE." |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
448 (or (and (eq (string-match tramp-file-name-regexp file) 0) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
449 ;; tramp case: execute "whoami" via tramp |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
450 (let ((default-directory (file-name-directory file))) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
451 (with-temp-buffer |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
452 (if (not (zerop (process-file "whoami" nil t))) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
453 ;; fall through if "whoami" didn't work |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
454 nil |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
455 ;; remove trailing newline |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
456 (delete-region (1- (point-max)) (point-max)) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
457 (buffer-string))))) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
458 ;; normal case |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
459 (user-login-name) |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
460 ;; if user-login-name is nil, return the UID as a string |
4e64c3323161
(vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
461 (number-to-string (user-uid)))) |
12925
77c9a594fe55
(vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents:
12914
diff
changeset
|
462 |
31382 | 463 (defun vc-state (file) |
464 "Return the version control state of FILE. | |
465 | |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
466 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
|
467 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
|
468 |
31382 | 469 'up-to-date The working file is unmodified with respect to the |
470 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
|
471 |
31382 | 472 'edited The working file has been edited by the user. If |
473 locking is used for the file, this state means that | |
474 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
|
475 |
31382 | 476 USER The current version of the working file is locked by |
477 some other USER (a string). | |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
478 |
31382 | 479 'needs-patch The file has not been edited by the user, but there is |
480 a more recent version on the current branch stored | |
481 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
|
482 |
31382 | 483 'needs-merge The file has been edited by the user, and there is also |
484 a more recent version on the current branch stored in | |
485 the master file. This state can only occur if locking | |
486 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
|
487 |
31382 | 488 'unlocked-changes The current version of the working file is not locked, |
489 but the working file has been changed with respect | |
490 to that version. This state can only occur for files | |
491 with locking; it represents an erroneous condition that | |
492 should be resolved by the user (vc-next-action will | |
493 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
|
494 ;; FIXME: New (sub)states needed (?): |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
495 ;; - `added' (i.e. `edited' but with no base version yet, |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
496 ;; typically represented by vc-working-revision = "0") |
50895
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
497 ;; - `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
|
498 ;; - `removed' |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
499 ;; - `copied' and `moved' (might be handled by `removed' and `added') |
31382 | 500 (or (vc-file-getprop file 'vc-state) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
501 (if (and (> (length file) 0) (vc-backend file)) |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
502 (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
|
503 (vc-call state-heuristic file))))) |
11604
401afae906eb
(vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents:
11598
diff
changeset
|
504 |
58641
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
505 (defun vc-recompute-state (file) |
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
506 "Recompute the version control state of FILE, and return it. |
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
507 This calls the possibly expensive function vc-BACKEND-state, |
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
508 rather than the heuristic." |
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
509 (vc-file-setprop file 'vc-state (vc-call state file))) |
6eccfc449b0e
(vc-recompute-state): Moved here from vc.el.
André Spiegel <spiegel@gnu.org>
parents:
57532
diff
changeset
|
510 |
31382 | 511 (defsubst vc-up-to-date-p (file) |
512 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'." | |
513 (eq (vc-state file) 'up-to-date)) | |
514 | |
515 (defun vc-default-state-heuristic (backend file) | |
31564 | 516 "Default implementation of vc-state-heuristic. |
517 It simply calls the real state computation function `vc-BACKEND-state' | |
518 and does not employ any heuristic at all." | |
31382 | 519 (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
|
520 |
47226
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
521 (defun vc-workfile-unchanged-p (file) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
522 "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
|
523 (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
|
524 (lastmod (nth 5 (file-attributes file)))) |
61203
92bee19cd688
(vc-workfile-unchanged-p): Disable mtime check when we go via Tramp or
André Spiegel <spiegel@gnu.org>
parents:
59996
diff
changeset
|
525 (if (and checkout-time |
92bee19cd688
(vc-workfile-unchanged-p): Disable mtime check when we go via Tramp or
André Spiegel <spiegel@gnu.org>
parents:
59996
diff
changeset
|
526 ;; Tramp and Ange-FTP return this when they don't know the time. |
92bee19cd688
(vc-workfile-unchanged-p): Disable mtime check when we go via Tramp or
André Spiegel <spiegel@gnu.org>
parents:
59996
diff
changeset
|
527 (not (equal lastmod '(0 0)))) |
47226
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
528 (equal checkout-time lastmod) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
529 (let ((unchanged (vc-call workfile-unchanged-p file))) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
530 (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
|
531 unchanged)))) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
532 |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
533 (defun vc-default-workfile-unchanged-p (backend file) |
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
534 "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
|
535 Return non-nil if FILE is unchanged." |
54783
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
536 (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
|
537 ;; 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
|
538 ;; go to *vc*, not *vc-diff*, since this is an internal call. |
81984
5fe5698ac0fb
* vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81979
diff
changeset
|
539 (vc-call diff (list file) nil nil "*vc*") |
54783
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
540 (wrong-number-of-arguments |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
541 ;; 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
|
542 ;; try again without the optional buffer argument (for |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
543 ;; backward compatibility). Otherwise, resignal. |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
544 (if (or (not (eq (cadr err) |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
545 (indirect-function |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
546 (vc-find-backend-function (vc-backend file) |
507f2c946725
(vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents:
54613
diff
changeset
|
547 'diff)))) |
55099
a856350e29d5
(vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents:
54912
diff
changeset
|
548 (not (eq (caddr err) 4))) |
a856350e29d5
(vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents:
54912
diff
changeset
|
549 (signal (car err) (cdr err)) |
81984
5fe5698ac0fb
* vc-hooks.el (vc-default-workfile-unchanged-p): Pass a list
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81979
diff
changeset
|
550 (vc-call diff (list file))))))) |
47226
31f2c4b2c82f
Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents:
47003
diff
changeset
|
551 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
552 (defun vc-working-revision (file) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
553 "Return the repository version from which FILE was checked out. |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
554 If FILE is not registered, this function always returns nil." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
555 (or (vc-file-getprop file 'vc-working-revision) |
42021
ddb97861a688
(vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents:
41956
diff
changeset
|
556 (if (vc-backend file) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
557 (vc-file-setprop file 'vc-working-revision |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
558 (vc-call working-revision file))))) |
85319
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
559 ;; Backward compatibility. |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
560 (define-obsolete-function-alias |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
561 'vc-workfile-version 'vc-working-revision "23.1") |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
562 (defun vc-default-working-revision (backend file) |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
563 (message |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
564 "`working-revision' not found: using the old `workfile-version' instead") |
14749907af36
(vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85169
diff
changeset
|
565 (vc-call-backend backend 'workfile-version file)) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
566 |
31382 | 567 (defun vc-default-registered (backend file) |
568 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates." | |
569 (let ((sym (vc-make-backend-sym backend 'master-templates))) | |
570 (unless (get backend 'vc-templates-grabbed) | |
571 (put backend 'vc-templates-grabbed t) | |
572 (set sym (append (delq nil | |
573 (mapcar | |
574 (lambda (template) | |
575 (and (consp template) | |
576 (eq (cdr template) backend) | |
577 (car template))) | |
52051
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
578 (with-no-warnings |
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
579 vc-master-templates))) |
31382 | 580 (symbol-value sym)))) |
581 (let ((result (vc-check-master-templates file (symbol-value sym)))) | |
582 (if (stringp result) | |
583 (vc-file-setprop file 'vc-name result) | |
584 nil)))) ; Not registered | |
904 | 585 |
31382 | 586 (defun vc-possible-master (s dirname basename) |
587 (cond | |
588 ((stringp s) (format s dirname basename)) | |
589 ((functionp s) | |
590 ;; The template is a function to invoke. If the | |
591 ;; function returns non-nil, that means it has found a | |
592 ;; master. For backward compatibility, we also handle | |
593 ;; the case that the function throws a 'found atom | |
594 ;; and a pair (cons MASTER-FILE BACKEND). | |
595 (let ((result (catch 'found (funcall s dirname basename)))) | |
596 (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
|
597 |
31382 | 598 (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
|
599 "Return non-nil if there is a master corresponding to FILE. |
31382 | 600 |
601 TEMPLATES is a list of strings or functions. If an element is a | |
602 string, it must be a control string as required by `format', with two | |
603 string placeholders, such as \"%sRCS/%s,v\". The directory part of | |
604 FILE is substituted for the first placeholder, the basename of FILE | |
605 for the second. If a file with the resulting name exists, it is taken | |
606 as the master of FILE, and returned. | |
9248
325cee61ab7f
(vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents:
8982
diff
changeset
|
607 |
31382 | 608 If an element of TEMPLATES is a function, it is called with the |
609 directory part and the basename of FILE as arguments. It should | |
610 return non-nil if it finds a master; that value is then returned by | |
611 this function." | |
612 (let ((dirname (or (file-name-directory file) "")) | |
613 (basename (file-name-nondirectory file))) | |
614 (catch 'found | |
31564 | 615 (mapcar |
31382 | 616 (lambda (s) |
617 (let ((trial (vc-possible-master s dirname basename))) | |
618 (if (and trial (file-exists-p trial) | |
619 ;; Make sure the file we found with name | |
620 ;; TRIAL is not the source file itself. | |
621 ;; That can happen with RCS-style names if | |
622 ;; the file name is truncated (e.g. to 14 | |
623 ;; chars). See if either directory or | |
624 ;; attributes differ. | |
625 (or (not (string= dirname | |
626 (file-name-directory trial))) | |
627 (not (equal (file-attributes file) | |
628 (file-attributes trial))))) | |
629 (throw 'found trial)))) | |
630 templates)))) | |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
631 |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
632 (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
|
633 "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
|
634 |
2620
d26f75fd9f5e
(vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents:
2491
diff
changeset
|
635 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
|
636 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
|
637 of the buffer. |
295cf395a392
(vc-toggle-read-only): Doc fix.
Karl Heuer <kwzh@gnu.org>
parents:
23255
diff
changeset
|
638 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
|
639 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
|
640 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
|
641 |
8a775aba60aa
Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents:
43587
diff
changeset
|
642 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
|
643 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
|
644 (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
|
645 (if (or (and (boundp 'vc-dired-mode) vc-dired-mode) |
31382 | 646 ;; 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
|
647 (vc-backend buffer-file-name)) |
10176
332014233a2c
(vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents:
9869
diff
changeset
|
648 (vc-next-action verbose) |
904 | 649 (toggle-read-only))) |
650 | |
32746
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
651 (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
|
652 "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
|
653 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
|
654 nil) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
655 |
32746
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
656 (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
|
657 "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
|
658 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
|
659 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
|
660 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
|
661 (if regexp |
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
662 (concat (regexp-quote (file-name-nondirectory file)) |
74939
e58390f88130
(vc-version-backup-file-name): Revision names may be
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74442
diff
changeset
|
663 "\\.~.+" (unless manual "\\.") "~") |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
664 (expand-file-name (concat (file-name-nondirectory file) |
74939
e58390f88130
(vc-version-backup-file-name): Revision names may be
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
74442
diff
changeset
|
665 ".~" (subst-char-in-string |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
666 ?/ ?_ (or rev (vc-working-revision file))) |
32949
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
667 (unless manual ".") "~") |
78fabc2762c4
(vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents:
32746
diff
changeset
|
668 (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
|
669 |
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
670 (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
|
671 "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
|
672 (condition-case nil |
82849
ea5864b698fd
* vc-hooks.el (vc-registered): Use mapc instead of mapcar.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82771
diff
changeset
|
673 (mapc |
39389
6629bc0d69e5
(vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38373
diff
changeset
|
674 'delete-file |
39417
c13780d8dbd2
(vc-delete-automatic-version-backups): Handle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39389
diff
changeset
|
675 (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
|
676 (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
|
677 ;; 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
|
678 (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
|
679 |
033bb57afe0c
(vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents:
32188
diff
changeset
|
680 (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
|
681 "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
|
682 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
|
683 (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
|
684 (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
|
685 (vc-delete-automatic-version-backups file) |
59978
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
686 (condition-case nil |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
687 (copy-file file (vc-version-backup-file-name file) |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
688 nil 'keep-date) |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
689 ;; It's ok if it doesn't work (e.g. directory not writable), |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
690 ;; since this is just for efficiency. |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59978
diff
changeset
|
691 (file-error |
59978
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
692 (message |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
693 (concat "Warning: Cannot make version backup; " |
c3afd6e6c992
(vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents:
58641
diff
changeset
|
694 "diff/revert therefore not local")))))) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
695 |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
696 (defun vc-before-save () |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
697 "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
|
698 ;; 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
|
699 ;; 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
|
700 ;; 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
|
701 (let ((file buffer-file-name)) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
702 (and (vc-backend file) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
703 (vc-up-to-date-p file) |
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
704 (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
|
705 (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
|
706 (vc-make-version-backup file)))) |
32127
1543b0fc904b
(vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents:
32070
diff
changeset
|
707 |
12914
22f47b2375c1
(vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents:
12884
diff
changeset
|
708 (defun vc-after-save () |
31382 | 709 "Function to be called by `basic-save-buffer' (in files.el)." |
31564 | 710 ;; If the file in the current buffer is under version control, |
31382 | 711 ;; up-to-date, and locking is not used for the file, set |
712 ;; 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
|
713 (let ((file buffer-file-name)) |
21356
c714817643a9
(vc-parse-cvs-status): New function.
Richard M. Stallman <rms@gnu.org>
parents:
21232
diff
changeset
|
714 (and (vc-backend file) |
12967
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
715 (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
|
716 (nth 5 (file-attributes file))) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
717 ;; 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
|
718 ;; it was checked out. Clear the checkout-time |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
719 ;; to avoid confusion. |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
720 (vc-file-setprop file 'vc-checkout-time nil)) |
ee545522ef2a
(vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents:
12944
diff
changeset
|
721 t) |
31382 | 722 (vc-up-to-date-p file) |
723 (eq (vc-checkout-model file) 'implicit) | |
724 (vc-file-setprop file 'vc-state 'edited) | |
725 (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
|
726 (if (featurep 'vc) |
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31382
diff
changeset
|
727 ;; 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
|
728 ;; 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
|
729 (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
|
730 |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
731 (defvar vc-menu-entry |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
732 '(menu-item "Version Control" vc-menu-map |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
733 :filter vc-menu-map-filter)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
734 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
735 (when (boundp 'menu-bar-tools-menu) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
736 ;; We do not need to worry here about the placement of this entry |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
737 ;; because menu-bar.el has already created the proper spot for us |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
738 ;; and this will simply use it. |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
739 (define-key menu-bar-tools-menu [vc] vc-menu-entry)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
740 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
741 (defconst vc-mode-line-map |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
742 (let ((map (make-sparse-keymap))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
743 (define-key map [mode-line down-mouse-1] vc-menu-entry) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
744 map)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
745 |
31382 | 746 (defun vc-mode-line (file) |
2491
5f3061858f47
vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
2232
diff
changeset
|
747 "Set `vc-mode' to display type of version control for FILE. |
904 | 748 The value is set in the current buffer, which should be the buffer |
31382 | 749 visiting FILE." |
32188
a771b5a6fa69
(vc-mode-line): Fix interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32127
diff
changeset
|
750 (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
|
751 (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
|
752 (if (not backend) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
753 (setq vc-mode nil) |
82070
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
754 (let* ((ml-string (vc-call mode-line-string file)) |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
755 (ml-echo (get-text-property 0 'help-echo ml-string))) |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
756 (setq vc-mode |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
757 (concat |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
758 " " |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
759 (if (null vc-display-status) |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
760 (symbol-name backend) |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
761 (propertize |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
762 ml-string |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
763 'mouse-face 'mode-line-highlight |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
764 'help-echo |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
765 (concat (or ml-echo |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
766 (format "File under the %s version control system" |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
767 backend)) |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
768 "\nmouse-1: Version Control menu") |
62454e8b7dd5
(vc-mode-line-map): New const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82058
diff
changeset
|
769 'local-map vc-mode-line-map))))) |
50879
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
770 ;; 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
|
771 ;; 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
|
772 ;; 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
|
773 (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
|
774 (stringp (vc-state file)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
775 (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
|
776 ;; 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
|
777 ;; 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
|
778 ;; 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
|
779 ;; 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
|
780 (and (equal file buffer-file-name) |
8b4ee8a18c21
(vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50880
diff
changeset
|
781 (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
|
782 (zerop (user-real-uid)) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
783 (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
|
784 (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
|
785 (force-mode-line-update) |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
786 backend)) |
31382 | 787 |
788 (defun vc-default-mode-line-string (backend file) | |
789 "Return string for placement in modeline by `vc-mode-line' for FILE. | |
790 Format: | |
791 | |
792 \"BACKEND-REV\" if the file is up-to-date | |
793 \"BACKEND:REV\" if the file is edited (or locked by the calling user) | |
794 \"BACKEND:LOCKER:REV\" if the file is locked by somebody else | |
904 | 795 |
31382 | 796 This function assumes that the file is registered." |
797 (setq backend (symbol-name backend)) | |
798 (let ((state (vc-state file)) | |
81815
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
799 (state-echo nil) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
800 (rev (vc-working-revision file))) |
81815
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
801 (propertize |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
802 (cond ((or (eq state 'up-to-date) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
803 (eq state 'needs-patch)) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
804 (setq state-echo "Up to date file") |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
805 (concat backend "-" rev)) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
806 ((stringp state) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
807 (setq state-echo (concat "File locked by" state)) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
808 (concat backend ":" state ":" rev)) |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
809 (t |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
810 ;; Not just for the 'edited state, but also a fallback |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
811 ;; for all other states. Think about different symbols |
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
812 ;; for 'needs-patch and 'needs-merge. |
82027
1350ba0c0448
* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81987
diff
changeset
|
813 (setq state-echo "Locally modified file") |
81815
7ac8c70c6834
* vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81709
diff
changeset
|
814 (concat backend ":" rev))) |
82058
b9e06163e85b
(vc-stay-local-p): Fix bug: Avoid remove-if-not.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
82027
diff
changeset
|
815 'help-echo (concat state-echo " under the " backend |
82027
1350ba0c0448
* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81987
diff
changeset
|
816 " version control system")))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
817 |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
818 (defun vc-follow-link () |
31382 | 819 "If current buffer visits a symbolic link, visit the real file. |
820 If the real file is already visited in another buffer, make that buffer | |
821 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
|
822 (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
|
823 (true-buffer (find-buffer-visiting truename)) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
824 (this-buffer (current-buffer))) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
825 (if (eq true-buffer this-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
826 (progn |
14674
f585d3bf3a73
(vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents:
14673
diff
changeset
|
827 (kill-buffer this-buffer) |
14673
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
828 ;; 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
|
829 ;; 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
|
830 ;; 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
|
831 (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
|
832 (set-buffer true-buffer) |
8f8a4224147b
(vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents:
14647
diff
changeset
|
833 (kill-buffer this-buffer)))) |
14647
b1a88c3a6912
(vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents:
14622
diff
changeset
|
834 |
54397
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
835 (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
|
836 nil) |
fcc26abed3ba
(vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
52401
diff
changeset
|
837 |
904 | 838 (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
|
839 "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
|
840 ;; 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
|
841 ;; 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
|
842 (if vc-mode |
a6beccc5505e
Patch by Jonathan Kamens <jik@kamens.brookline.ma.us>.
André Spiegel <spiegel@gnu.org>
parents:
42021
diff
changeset
|
843 (setq vc-mode nil)) |
31382 | 844 (when buffer-file-name |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
845 (vc-file-clearprops buffer-file-name) |
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
846 (cond |
81834
1ec5a70aa56f
(vc-find-file-hook): Use with-demoted-errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81815
diff
changeset
|
847 ((with-demoted-errors (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
|
848 ;; 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
|
849 (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
|
850 (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
|
851 ;; 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
|
852 ;; 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
|
853 (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
|
854 ;; 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
|
855 (vc-call-backend (vc-backend buffer-file-name) 'find-file-hook)) |
57532
53338d8522cb
(vc-find-file-hook): Call vc-backend with absolute name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57079
diff
changeset
|
856 ((let ((link-type (and (file-symlink-p buffer-file-name) |
53338d8522cb
(vc-find-file-hook): Call vc-backend with absolute name.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57079
diff
changeset
|
857 (vc-backend (file-chase-links 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
|
858 (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
|
859 ((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
|
860 (message |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
861 "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
|
862 ((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
|
863 ;; 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
|
864 ;; 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
|
865 ;; 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
|
866 ;; 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
|
867 (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
|
868 (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
|
869 (file-chase-links buffer-file-name)))) |
47918
022aa2332f91
(vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
47244
diff
changeset
|
870 |
51370
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
871 (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
|
872 (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
|
873 (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
|
874 (t |
a7a449bb9443
(vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50895
diff
changeset
|
875 (if (yes-or-no-p (format |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
876 "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
|
877 (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
|
878 (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
|
879 (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
|
880 (message |
14142
c9cb9dbb2d40
(vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents:
14040
diff
changeset
|
881 "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
|
882 )))))))) |
904 | 883 |
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
|
884 (add-hook 'find-file-hook 'vc-find-file-hook) |
904 | 885 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
886 ;; more hooks, this time for file-not-found |
904 | 887 (defun vc-file-not-found-hook () |
31382 | 888 "When file is not found, try to check it out from version control. |
889 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
|
890 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
|
891 ;; 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
|
892 ;; from a previous visit. |
f20bf5cd31d9
(vc-file-not-found-hook): Call vc-file-clearprops.
Richard M. Stallman <rms@gnu.org>
parents:
22112
diff
changeset
|
893 (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
|
894 (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
|
895 (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
|
896 |
a7faa61c45b5
(vc-default-find-file-not-found-hook): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54464
diff
changeset
|
897 (defun vc-default-find-file-not-found-hook (backend) |
78520
318e4215e076
(vc-default-find-file-not-found-hook): Do nothing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78404
diff
changeset
|
898 ;; This used to do what vc-rcs-find-file-not-found-hook does, but it only |
318e4215e076
(vc-default-find-file-not-found-hook): Do nothing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78404
diff
changeset
|
899 ;; really makes sense for RCS. For other backends, better not do anything. |
318e4215e076
(vc-default-find-file-not-found-hook): Do nothing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78404
diff
changeset
|
900 nil) |
904 | 901 |
52051
3507a2fac9b5
(vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents:
51761
diff
changeset
|
902 (add-hook 'find-file-not-found-functions 'vc-file-not-found-hook) |
904 | 903 |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
904 (defun vc-kill-buffer-hook () |
31382 | 905 "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
|
906 (if buffer-file-name |
9cd7a1a60ba0
Consistently use buffer-file-name variable rather than function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49620
diff
changeset
|
907 (vc-file-clearprops buffer-file-name))) |
11598
540868154dc9
(vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents:
10176
diff
changeset
|
908 |
47003
fe0d9d5309e4
(vc-kill-buffer-hook): Add it to kill-buffer-hook again.
André Spiegel <spiegel@gnu.org>
parents:
46723
diff
changeset
|
909 (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
|
910 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
911 ;; 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
|
912 ;; 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
|
913 ;; want to call them from random buffers. |
904 | 914 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
915 ;; 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
|
916 ;; 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
|
917 ;; (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
|
918 (defvar vc-prefix-map |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
919 (let ((map (make-sparse-keymap))) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
920 (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
|
921 (define-key map "b" 'vc-switch-backend) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
922 (define-key map "c" 'vc-rollback) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
923 (define-key map "d" 'vc-directory) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
924 (define-key map "g" 'vc-annotate) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
925 (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
|
926 (define-key map "i" 'vc-register) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
927 (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
|
928 (define-key map "m" 'vc-merge) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
929 (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
|
930 (define-key map "s" 'vc-create-snapshot) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
931 (define-key map "u" 'vc-revert) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
932 (define-key map "v" 'vc-next-action) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
933 (define-key map "+" 'vc-update) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
934 (define-key map "=" 'vc-diff) |
85169
708abc311fa6
Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85157
diff
changeset
|
935 (define-key map "~" 'vc-revision-other-window) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
936 map)) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
937 (fset 'vc-prefix-map vc-prefix-map) |
31382 | 938 (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
|
939 |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
940 (defvar vc-menu-map |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
941 (let ((map (make-sparse-keymap "Version Control"))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
942 ;;(define-key map [show-files] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
943 ;; '("Show Files under VC" . (vc-directory t))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
944 (define-key map [vc-retrieve-snapshot] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
945 '("Retrieve Snapshot" . vc-retrieve-snapshot)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
946 (define-key map [vc-create-snapshot] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
947 '("Create Snapshot" . vc-create-snapshot)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
948 (define-key map [vc-directory] '("VC Directory Listing" . vc-directory)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
949 (define-key map [separator1] '("----")) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
950 (define-key map [vc-annotate] '("Annotate" . vc-annotate)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
951 (define-key map [vc-rename-file] '("Rename File" . vc-rename-file)) |
85169
708abc311fa6
Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85157
diff
changeset
|
952 (define-key map [vc-revision-other-window] |
708abc311fa6
Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85157
diff
changeset
|
953 '("Show Other Version" . vc-revision-other-window)) |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
954 (define-key map [vc-diff] '("Compare with Base Version" . vc-diff)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
955 (define-key map [vc-update-change-log] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
956 '("Update ChangeLog" . vc-update-change-log)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
957 (define-key map [vc-print-log] '("Show History" . vc-print-log)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
958 (define-key map [separator2] '("----")) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
959 (define-key map [vc-insert-header] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
960 '("Insert Header" . vc-insert-headers)) |
82499
3ecf9562ce0b
(vc-menu-entry): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82365
diff
changeset
|
961 (define-key map [undo] '("Undo Last Check-In" . vc-rollback)) |
3ecf9562ce0b
(vc-menu-entry): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82365
diff
changeset
|
962 (define-key map [vc-revert] |
3ecf9562ce0b
(vc-menu-entry): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82365
diff
changeset
|
963 '("Revert to Base Version" . vc-revert)) |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
964 (define-key map [vc-update] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
965 '("Update to Latest Version" . vc-update)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
966 (define-key map [vc-next-action] '("Check In/Out" . vc-next-action)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
967 (define-key map [vc-register] '("Register" . vc-register)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
968 map)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
969 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
970 (defalias 'vc-menu-map vc-menu-map) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
971 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
972 (defun vc-menu-map-filter (orig-binding) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
973 (if (and (symbolp orig-binding) (fboundp orig-binding)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
974 (setq orig-binding (indirect-function orig-binding))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
975 (let ((ext-binding |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
976 (if vc-mode (vc-call-backend (vc-backend buffer-file-name) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
977 'extra-menu)))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
978 ;; Give the VC backend a chance to add menu entries |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
979 ;; specific for that backend. |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
980 (if (null ext-binding) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
981 orig-binding |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
982 (append orig-binding |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
983 '((ext-menu-separator "---")) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
984 ext-binding)))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
985 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
986 (defun vc-default-extra-menu (backend) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78792
diff
changeset
|
987 nil) |
14622
3d47471d947d
Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents:
14566
diff
changeset
|
988 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
989 ;; 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
|
990 ;; 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
|
991 ;; on older systems. |
23255
6b2b3ceeb3cd
(vc-menu-map): Change the vc-directory label. Don't
Dave Love <fx@gnu.org>
parents:
22947
diff
changeset
|
992 |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
993 ;;(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
|
994 ;;(put 'vc-annotate 'menu-enable '(eq (vc-buffer-backend) 'CVS)) |
85169
708abc311fa6
Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85157
diff
changeset
|
995 ;;(put 'vc-revision-other-window 'menu-enable 'vc-mode) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
996 ;;(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
|
997 ;;(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
|
998 ;; '(member (vc-buffer-backend) '(RCS CVS))) |
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
999 ;;(put 'vc-print-log 'menu-enable 'vc-mode) |
81958
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
1000 ;;(put 'vc-rollback 'menu-enable 'vc-mode) |
55e9cc4986ff
Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81902
diff
changeset
|
1001 ;;(put 'vc-revert 'menu-enable 'vc-mode) |
38373
10cf63a2727d
(vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33856
diff
changeset
|
1002 ;;(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
|
1003 ;;(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
|
1004 ;;(put 'vc-register 'menu-enable '(and buffer-file-name (not vc-mode))) |
904 | 1005 |
1006 (provide 'vc-hooks) | |
1007 | |
57079
6f014cde9d81
(vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55099
diff
changeset
|
1008 ;; arch-tag: 2e5a6fa7-1d30-48e2-8bd0-e3d335f04f32 |
904 | 1009 ;;; vc-hooks.el ends here |