annotate lisp/vc/vc-hooks.el @ 109404:e93288477c43

Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 13 Jun 2010 22:57:55 +0000
parents lisp/vc-hooks.el@d418516def73 lisp/vc-hooks.el@6ff48295959a
children 1b626601d32d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2232
4f9d60f7de9d Add standard library headers.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2227
diff changeset
1 ;;; vc-hooks.el --- resident support for version-control
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
2
74442
b2e5081b9320 Update copyright years.
Glenn Morris <rgm@gnu.org>
parents: 73351
diff changeset
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 105941
diff changeset
4 ;; 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
104612
c220a29e75fd Define risky-local-variable property here rather than in files.el.
Glenn Morris <rgm@gnu.org>
parents: 104599
diff changeset
5 ;; Free Software Foundation, Inc.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
6
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
7 ;; Author: FSF (see vc.el for full credits)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
8 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
9
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
10 ;; This file is part of GNU Emacs.
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
11
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
13 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
14 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
15 ;; (at your option) any later version.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
16
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
17 ;; GNU Emacs is distributed in the hope that it will be useful,
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
94747
20c9a140eae2 Fix comment typo in previous.
Glenn Morris <rgm@gnu.org>
parents: 94730
diff changeset
20 ;; GNU General Public License for more details.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
21
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
22 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
24
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
25 ;;; Commentary:
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
26
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
27 ;; This is the always-loaded portion of VC. It takes care of
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
28 ;; VC-related activities that are done when you visit a file, so that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
29 ;; vc.el itself is loaded only when you use a VC command. See the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
30 ;; commentary of vc.el.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
31
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
32 ;;; Code:
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
33
33856
6f1ab7313eb7 Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents: 33634
diff changeset
34 (eval-when-compile
6f1ab7313eb7 Require 'cl during compilation.
André Spiegel <spiegel@gnu.org>
parents: 33634
diff changeset
35 (require 'cl))
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
36
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
37 ;; 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
38
49620
c1b2182d8ca1 (vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents: 47918
diff changeset
39 (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
40 (make-obsolete-variable 'vc-ignore-vc-files
94150
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
41 "set `vc-handled-backends' to nil to disable VC."
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
42 "21.1")
52300
2672198e6a12 (vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents: 52055
diff changeset
43
49620
c1b2182d8ca1 (vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents: 47918
diff changeset
44 (defvar vc-master-templates ())
55099
a856350e29d5 (vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents: 54912
diff changeset
45 (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
46 "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
47 vc-BACKEND-master-templates. To enable or disable VC for a given
94150
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
48 BACKEND, use `vc-handled-backends'."
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
49 "21.1")
52300
2672198e6a12 (vc-ignore-vc-files, vc-master-templates): Better explain obsolescence, and
André Spiegel <spiegel@gnu.org>
parents: 52055
diff changeset
50
49620
c1b2182d8ca1 (vc-ignore-vc-files, vc-master-templates, vc-header-alist): Add obsolescence
Juanma Barranquero <lekktu@gmail.com>
parents: 47918
diff changeset
51 (defvar vc-header-alist ())
94150
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
52 (make-obsolete-variable 'vc-header-alist 'vc-BACKEND-header "21.1")
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
53
77591
ec47afd2d1db (vc-ignore-dir-regexp): Add /.../ for the DFS filesystem.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
54 (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
55 ;; Stop SMB, automounter, AFS, and DFS host lookups.
99130
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
56 locate-dominating-stop-dir-regexp
73351
29547db9ad61 (vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
57 "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
58 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
59 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
60 interpreted as hostnames."
29547db9ad61 (vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
61 :type 'regexp
29547db9ad61 (vc-ignore-dir-regexp): Make it into a defcustom.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 68651
diff changeset
62 :group 'vc)
57079
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
63
94730
3bbff46b7130 Meta-CVS support removed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94729
diff changeset
64 (defcustom vc-handled-backends '(RCS CVS SVN SCCS Bzr Git Hg Mtn Arch)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78520
diff changeset
65 ;; RCS, CVS, SVN and SCCS come first because they are per-dir
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78520
diff changeset
66 ;; rather than per-tree. RCS comes first because of the multibackend
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78520
diff changeset
67 ;; support intended to use RCS for local commits (with a remote CVS server).
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78520
diff changeset
68 "List of version control backends for which VC will be used.
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
69 Entries in this list will be tried in order to determine whether a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
70 file is under that sort of version control.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
71 Removing an entry from the list prevents VC from being activated
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
72 when visiting a file managed by that backend.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
73 An empty list disables VC altogether."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
74 :type '(repeat symbol)
81902
184879170b16 (vc-handled-backends): Move BZR later in the list.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81835
diff changeset
75 :version "23.1"
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
76 :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
77
87523
fe5c2c0f8dcf * progmodes/grep.el (grep-find-ignored-directories): Initialize
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87477
diff changeset
78 ;; Note: we don't actually have a darcs back end yet.
94730
3bbff46b7130 Meta-CVS support removed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94729
diff changeset
79 ;; Also, Meta-CVS (corresponsding to MCVS) is unsupported.
105879
b4f29dbe3ee7 * progmodes/ld-script.el (auto-mode-alist):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105735
diff changeset
80 (defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS"
91584
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
81 ".svn" ".git" ".hg" ".bzr"
105879
b4f29dbe3ee7 * progmodes/ld-script.el (auto-mode-alist):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105735
diff changeset
82 "_MTN" "_darcs" "{arch}"))
87446
168445c0b213 * vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87445
diff changeset
83 "List of directory names to be ignored when walking directory trees."
168445c0b213 * vc-hooks.el, vc.el: Move vc-directory-exclusion-list from vc.el
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87445
diff changeset
84 :type '(repeat string)
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
85 :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
86
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
89 If nil (the default), files covered by version control don't get backups."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
93
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
96 Editing such a file through the link bypasses the version control system,
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
97 which is dangerous and probably not what you want.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
98
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
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
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
102 visited and a warning displayed."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
103 :type '(choice (const :tag "Ask for confirmation" ask)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
104 (const :tag "Visit link and warn" nil)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
105 (const :tag "Follow link" t))
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
106 :group 'vc)
14142
c9cb9dbb2d40 (vc-follow-symlinks): New variable.
André Spiegel <spiegel@gnu.org>
parents: 14040
diff changeset
107
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
110 Otherwise, not displayed."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
111 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
112 :group 'vc)
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
113
3900
c6f3d2af0df7 (vc-rcs-status): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 3459
diff changeset
114
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
117 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
118 :group 'vc)
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
119
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
123 value of this flag."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
124 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
125 :group 'vc)
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
126
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
129 If nil, do rely on the permissions.
20413
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
130 See also variable `vc-consult-headers'."
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
131 :type 'boolean
7d1e9fc47f9d Customized.
Karl Heuer <kwzh@gnu.org>
parents: 20008
diff changeset
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
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
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
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
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
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
141 (defcustom vc-stay-local 'only-file
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
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
146 If value is the symbol `only-file' `vc-dir' will connect to the
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
147 server, but heuristics will be used to determine the status for
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
148 all other VC operations.
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
149
51761
856170cb64e9 (vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51480
diff changeset
150 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
151 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
152 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
153 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
154 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
155 by these regular expressions."
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
156 :type '(choice
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
157 (const :tag "Always stay local" t)
99192
c0bf1f652024 (vc-stay-local): Fix typo in choice.
Martin Rudalics <rudalics@gmx.at>
parents: 99130
diff changeset
158 (const :tag "Only for file operations" only-file)
51761
856170cb64e9 (vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51480
diff changeset
159 (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
160 (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
161 (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
162 (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
163 (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98429
diff changeset
164 :version "23.1"
51761
856170cb64e9 (vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51480
diff changeset
165 :group 'vc)
856170cb64e9 (vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51480
diff changeset
166
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
167 (defun vc-stay-local-p (file &optional backend)
51761
856170cb64e9 (vc-stay-local, vc-stay-local-p): Move from vc.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51480
diff changeset
168 "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
169 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
170 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
171 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
172 (if (listp file)
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
173 (delq nil (mapcar (lambda (arg) (vc-stay-local-p arg backend)) file))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
174 (setq backend (or backend (vc-backend file)))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
175 (let* ((sym (vc-make-backend-sym backend 'stay-local))
101673
269a73f83025 (vc-stay-local-p): Let vc-BACKEND-stay-local take
Nick Roberts <nickrob@snap.net.nz>
parents: 100908
diff changeset
176 (stay-local (if (boundp sym) (symbol-value sym) vc-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
177 (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
178 (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
179 (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
180 (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
181 (eq 'yes
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
182 (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
183 (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
184 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
185 (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
186 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
187 (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
188 'no
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
189 (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
190 (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
191 (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
192 (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
193 (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
194 (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
195 (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
196 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
197 '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
198
46723
2d147caabf88 Don't add to minor-mode-alist.
Richard M. Stallman <rms@gnu.org>
parents: 46542
diff changeset
199 ;;; This is handled specially now.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
200 ;; 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
201 ;; (add-to-list 'minor-mode-alist '(vc-mode vc-mode))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
202
105735
5d9281801a59 Convert comment about autoload into autoload comment.
Glenn Morris <rgm@gnu.org>
parents: 105715
diff changeset
203 ;;;###autoload
104612
c220a29e75fd Define risky-local-variable property here rather than in files.el.
Glenn Morris <rgm@gnu.org>
parents: 104599
diff changeset
204 (put 'vc-mode 'risky-local-variable t)
2491
5f3061858f47 vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
205 (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
206 (put 'vc-mode 'permanent-local t)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
207
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
208 (defun vc-mode (&optional arg)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
209 ;; Dummy function for C-h m
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
210 "Version Control minor mode.
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
211 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
212 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
213 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
214 \\{vc-prefix-map}")
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
215
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
216 (defmacro vc-error-occurred (&rest body)
40851
19448ae09fc0 (vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents: 39417
diff changeset
217 `(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
218
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
219 ;; 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
220 ;; control state of a file is expensive to derive --- we compute
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
221 ;; 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
222 ;; 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
223 ;; the buffer is killed.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
224
40851
19448ae09fc0 (vc-error-occured): Backquotified.
André Spiegel <spiegel@gnu.org>
parents: 39417
diff changeset
225 (defvar vc-file-prop-obarray (make-vector 17 0)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
226 "Obarray for per-file properties.")
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
227
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31382
diff changeset
228 (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
229
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
230 (defun vc-file-setprop (file property value)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
231 "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
232 (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
233 (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
234 (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
235 vc-touched-properties)))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
236 (put (intern file vc-file-prop-obarray) property value))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
237
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
238 (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
239 "Get per-file VC PROPERTY for FILE."
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
240 (get (intern file vc-file-prop-obarray) property))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
241
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
242 (defun vc-file-clearprops (file)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
243 "Clear all VC properties of FILE."
98429
b87cc3b45aa5 * vc-hooks.el (vc-file-clearprops): Revert change from 2008-09-29.
Michael Albinus <michael.albinus@gmx.de>
parents: 98394
diff changeset
244 (setplist (intern file vc-file-prop-obarray) nil))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
245
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
246
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
247 ;; We keep properties on each symbol naming a backend as follows:
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
248 ;; * `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
249
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
250 (defun vc-make-backend-sym (backend sym)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
251 "Return BACKEND-specific version of VC symbol SYM."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
252 (intern (concat "vc-" (downcase (symbol-name backend))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
253 "-" (symbol-name sym))))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
254
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
255 (defun vc-find-backend-function (backend fun)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
256 "Return BACKEND-specific implementation of FUN.
47918
022aa2332f91 (vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47244
diff changeset
257 If there is no such implementation, return the default implementation;
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
258 if that doesn't exist either, return nil."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
259 (let ((f (vc-make-backend-sym backend fun)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
260 (if (fboundp f) f
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
261 ;; Load vc-BACKEND.el if needed.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
262 (require (intern (concat "vc-" (downcase (symbol-name backend)))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
263 (if (fboundp f) f
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
264 (let ((def (vc-make-backend-sym 'default fun)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
265 (if (fboundp def) (cons def backend) nil))))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
266
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
267 (defun vc-call-backend (backend function-name &rest args)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
268 "Call for BACKEND the implementation of FUNCTION-NAME with the given ARGS.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
269 Calls
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
270
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
271 (apply 'vc-BACKEND-FUN ARGS)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
272
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
273 if vc-BACKEND-FUN exists (after trying to find it in vc-BACKEND.el)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
274 and else calls
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
275
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
276 (apply 'vc-default-FUN BACKEND ARGS)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
277
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
278 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
279 (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
280 (if f (setq f (cdr f))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
281 (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
282 (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
283 (cond
a7a449bb9443 (vc-call-backend): Give better error message when backend function is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50895
diff changeset
284 ((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
285 (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
286 ((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
287 (t (apply f args)))))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
288
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
289 (defmacro vc-call (fun file &rest args)
82293
96cb0797d6c7 (vc-call): Add doc string.
Jason Rumney <jasonr@gnu.org>
parents: 82245
diff changeset
290 "A convenience macro for calling VC backend functions.
96cb0797d6c7 (vc-call): Add doc string.
Jason Rumney <jasonr@gnu.org>
parents: 82245
diff changeset
291 Functions called by this macro must accept FILE as the first argument.
94548
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
292 ARGS specifies any additional arguments. FUN should be unquoted.
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
293 BEWARE!! FILE is evaluated twice!!"
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
294 `(vc-call-backend (vc-backend ,file) ',fun ,file ,@args))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
295
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
296 (defsubst vc-parse-buffer (pattern i)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
297 "Find PATTERN in the current buffer and return its Ith submatch."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
298 (goto-char (point-min))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
299 (if (re-search-forward pattern nil t)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
300 (match-string i)))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
301
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
302 (defun vc-insert-file (file &optional limit blocksize)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
303 "Insert the contents of FILE into the current buffer.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
304
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
305 Optional argument LIMIT is a regexp. If present, the file is inserted
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
306 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
307 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
308 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
309 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
310 (erase-buffer)
33206
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
311 (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
312 (if (not limit)
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
313 (insert-file-contents file)
94207
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
314 (unless blocksize (setq blocksize 8192))
33247
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
315 (let ((filepos 0))
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
316 (while
23d61d30fcd0 (vc-insert-file): Don't assume byte==char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33206
diff changeset
317 (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
318 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
319 (progn (beginning-of-line)
46542
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
320 (let ((pos (re-search-forward limit nil 'move)))
94207
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
321 (when pos (delete-region (match-beginning 0)
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
322 (point-max)))
46542
f8e6993503cf (vc-insert-file): When called with a LIMIT regexp,
André Spiegel <spiegel@gnu.org>
parents: 46453
diff changeset
323 (not pos)))))))
33206
7feabfeb41cc (vc-insert-file): Rewritten. Don't bother about auto-save-mode.
André Spiegel <spiegel@gnu.org>
parents: 32953
diff changeset
324 (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
325 t))
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
326
98086
4a399b9bc4b9 * vc-svn.el (vc-svn-root):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97935
diff changeset
327 (defun vc-find-root (file witness)
57079
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
328 "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
329 The function walks up the directory tree from FILE looking for WITNESS.
98086
4a399b9bc4b9 * vc-svn.el (vc-svn-root):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 97935
diff changeset
330 If WITNESS if not found, return nil, otherwise return the root."
99130
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
331 (let ((locate-dominating-stop-dir-regexp
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
332 (or vc-ignore-dir-regexp locate-dominating-stop-dir-regexp)))
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
333 (locate-dominating-file file witness)))
99192
c0bf1f652024 (vc-stay-local): Fix typo in choice.
Martin Rudalics <rudalics@gmx.at>
parents: 99130
diff changeset
334
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
335 ;; Access functions to file properties
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
336 ;; (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
337 ;; _retrieved_ only through these functions, which decide
94548
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
338 ;; if the property is already known or not. A property should
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
339 ;; 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
340 ;; access function.)
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
341
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
342 ;; properties indicating the backend being used for FILE
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
343
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
344 (defun vc-registered (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
345 "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
346
32070
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
347 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
348 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
349 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
350 backend is tried first."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
351 (let (handler)
57079
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
352 (cond
99130
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
353 ((and (file-name-directory file)
e152a404d947 * files.el (locate-dominating-stop-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 98675
diff changeset
354 (string-match vc-ignore-dir-regexp (file-name-directory file)))
85157
93de0ca0707d Robustify a bit against filenames with no directory component.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
355 nil)
57079
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
356 ((and (boundp 'file-name-handler-alist)
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
357 (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
358 ;; 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
359 (funcall handler 'vc-registered file))
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
360 (t
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
361 ;; There is no file name handler.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
362 ;; Try vc-BACKEND-registered for each handled BACKEND.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
363 (catch 'found
32070
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
364 (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
365 (mapc
32070
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
366 (lambda (b)
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
367 (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
368 (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
369 (throw 'found t)))
47918
022aa2332f91 (vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47244
diff changeset
370 (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
371 vc-handled-backends
d1ab0499dc86 (vc-registered): If FILE used to be registered under a certain
André Spiegel <spiegel@gnu.org>
parents: 31808
diff changeset
372 (cons backend vc-handled-backends))))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
373 ;; File is not registered.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
374 (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
375 nil)))))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
376
81958
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
377 (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
378 "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
379 If the argument is a list, the files must all have the same back end."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
380 ;; `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
381 ;; 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
382 (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
383 (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
384 ;; 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
385 ;; 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
386 (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
387 (property)
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
388 ;; 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
389 (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
390 (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
391 nil)))))
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
392 ((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
393 (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
394 (t
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
395 nil)))
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
396
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
397
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
398 (defun vc-backend-subdirectory-name (file)
107815
9c5ceea9a88b Get rid of several uses of the term 'master' in favor of equivalent verbiage
Eric S. Raymond <esr@thyrsus.com>
parents: 107810
diff changeset
399 "Return where the repository for the current directory is kept."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
400 (symbol-name (vc-backend file)))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
401
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
402 (defun vc-name (file)
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
403 "Return the master name of FILE.
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
404 If the file is not registered, or the master name is not known, return nil."
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
405 ;; TODO: This should ultimately become obsolete, at least up here
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
406 ;; in vc-hooks.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
407 (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
408 ;; 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
409 ;; vc-BACKEND-registered explicitly
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
410 (let ((backend (vc-backend file)))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
411 (if (and backend
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
412 (vc-call-backend backend 'registered file))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
413 (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
414
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
415 (defun vc-checkout-model (backend files)
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
416 "Indicate how FILES are checked out.
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
417
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
418 If FILES are not registered, this function always returns nil.
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
419 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
420
100145
ea3a44b9a0ca Correctt speling.
Chong Yidong <cyd@stupidchicken.com>
parents: 99840
diff changeset
421 'implicit FILES are always writable, and checked out `implicitly'
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
422 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
423
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
424 'locking FILES are 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
425 \\[vc-next-action] before editing. Strict locking
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
426 is assumed.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
427
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
428 'announce FILES are 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
429 \\[vc-next-action] before editing. But other users
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
430 may be editing at the same time."
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
431 (vc-call-backend backend 'checkout-model files))
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
432
68383
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
433 (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
434 "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
435 (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
436 ;; tramp case: execute "whoami" via tramp
104599
9c2da353b60f * vc-hooks.el (vc-user-login-name):
Michael Albinus <michael.albinus@gmx.de>
parents: 103596
diff changeset
437 (let ((default-directory (file-name-directory file))
9c2da353b60f * vc-hooks.el (vc-user-login-name):
Michael Albinus <michael.albinus@gmx.de>
parents: 103596
diff changeset
438 process-file-side-effects)
68383
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
439 (with-temp-buffer
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
440 (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
441 ;; 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
442 nil
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
443 ;; remove trailing newline
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
444 (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
445 (buffer-string)))))
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
446 ;; normal case
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
447 (user-login-name)
4e64c3323161 (vc-user-login-name): Rewritten to handle access via Tramp.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
448 ;; 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
449 (number-to-string (user-uid))))
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
450
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
451 (defun vc-state (file &optional backend)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
452 "Return the version control state of FILE.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
453
42021
ddb97861a688 (vc-checkout-model, vc-state, vc-workfile-version): Return nil if
André Spiegel <spiegel@gnu.org>
parents: 41956
diff changeset
454 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
455 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
456
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
457 'up-to-date The working file is unmodified with respect to the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
458 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
459
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
460 'edited The working file has been edited by the user. If
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
461 locking is used for the file, this state means that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
462 the current version is locked by the calling user.
107810
03ef65bf2e25 Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents: 107795
diff changeset
463 This status should *not* be reported for files
03ef65bf2e25 Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents: 107795
diff changeset
464 which have a changed mtime but the same content
03ef65bf2e25 Improve documentation comments.
Eric S. Raymond <esr@thyrsus.com>
parents: 107795
diff changeset
465 as the repo copy.
12925
77c9a594fe55 (vc-simple-command): New function.
André Spiegel <spiegel@gnu.org>
parents: 12914
diff changeset
466
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
467 USER The current version of the working file is locked by
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
468 some other USER (a string).
47918
022aa2332f91 (vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47244
diff changeset
469
107815
9c5ceea9a88b Get rid of several uses of the term 'master' in favor of equivalent verbiage
Eric S. Raymond <esr@thyrsus.com>
parents: 107810
diff changeset
470 'needs-update The file has not been edited by the user, but there is
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
471 a more recent version on the current branch stored
107815
9c5ceea9a88b Get rid of several uses of the term 'master' in favor of equivalent verbiage
Eric S. Raymond <esr@thyrsus.com>
parents: 107810
diff changeset
472 in the repository.
12251
f2519a110e5f The RCS status is now found by reading the
Richard M. Stallman <rms@gnu.org>
parents: 12102
diff changeset
473
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
474 'needs-merge The file has been edited by the user, and there is also
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
475 a more recent version on the current branch stored in
107815
9c5ceea9a88b Get rid of several uses of the term 'master' in favor of equivalent verbiage
Eric S. Raymond <esr@thyrsus.com>
parents: 107810
diff changeset
476 the repository. This state can only occur if locking
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
477 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
478
87444
e0b3bfbba910 Typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
479 'unlocked-changes The working version of the file is not locked,
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
480 but the working file has been changed with respect
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
481 to that version. This state can only occur for files
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
482 with locking; it represents an erroneous condition that
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
483 should be resolved by the user (vc-next-action will
87444
e0b3bfbba910 Typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
484 prompt the user to do it).
e0b3bfbba910 Typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
485
e0b3bfbba910 Typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
486 'added Scheduled to go into the repository on the next commit.
87445
214f565ec827 And another typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87444
diff changeset
487 Often represented by vc-working-revision = \"0\" in VCSes
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
488 with monotonic IDs like Subversion and Mercurial.
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
489
87477
b5060e79eb98 * vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87450
diff changeset
490 'removed Scheduled to be deleted from the repository on next commit.
91584
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
491
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93940
diff changeset
492 'conflict The file contains conflicts as the result of a merge.
94150
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
493 For now the conflicts are text conflicts. In the
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
494 future this might be extended to deal with metadata
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93940
diff changeset
495 conflicts too.
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93940
diff changeset
496
94150
d03fe9cb1cf4 (vc-ignore-vc-files, vc-master-templates, vc-header-alist):
Juanma Barranquero <lekktu@gmail.com>
parents: 94106
diff changeset
497 'missing The file is not present in the file system, but the VC
93196
6344844cc575 (vc-state): Add documentation for 'missing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
498 system still tracks it.
6344844cc575 (vc-state): Add documentation for 'missing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
499
94729
bf91c987049c Remove VC-Dired and backend dir-state methods.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94699
diff changeset
500 'ignored The file showed up in a dir-status listing with a flag
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
501 indicating the version-control system is ignoring it,
91584
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
502 Note: This property is not set reliably (some VCSes
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
503 don't have useful directory-status commands) so assume
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
504 that any file with vc-state nil might be ignorable
91584
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
505 without VC knowing it.
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
506
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
507 'unregistered The file is not under version control.
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87446
diff changeset
508
91584
c72722ab4a01 (vc-prefix-map): Bind `vc-status' to "?".
Sam Steingold <sds@gnu.org>
parents: 87649
diff changeset
509 A return of nil from this function means we have no information on the
94548
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
510 status of this file."
94860
8c21639e34cc Remove dead code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94834
diff changeset
511 ;; Note: in Emacs 22 and older, return of nil meant the file was
8c21639e34cc Remove dead code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94834
diff changeset
512 ;; unregistered. This is potentially a source of
8c21639e34cc Remove dead code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94834
diff changeset
513 ;; backward-compatibility bugs.
87444
e0b3bfbba910 Typo fix.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 86234
diff changeset
514
50895
8b4ee8a18c21 (vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50880
diff changeset
515 ;; FIXME: New (sub)states needed (?):
8b4ee8a18c21 (vc-default-workfile-unchanged-p): Pass nil
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50880
diff changeset
516 ;; - `copied' and `moved' (might be handled by `removed' and `added')
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
517 (or (vc-file-getprop file 'vc-state)
105293
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
518 (when (> (length file) 0) ;Why?? --Stef
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
519 (setq backend (or backend (vc-backend file)))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
520 (when backend
105293
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
521 (vc-state-refresh file backend)))))
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
522
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
523 (defun vc-state-refresh (file backend)
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
524 "Quickly recompute the `state' of FILE."
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
525 (vc-file-setprop
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
526 file 'vc-state
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
527 (vc-call-backend backend 'state-heuristic file)))
11604
401afae906eb (vc-default-backend, vc-path, vc-consult-headers):
Karl Heuer <kwzh@gnu.org>
parents: 11598
diff changeset
528
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
529 (defsubst vc-up-to-date-p (file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
530 "Convenience function that checks whether `vc-state' of FILE is `up-to-date'."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
531 (eq (vc-state file) 'up-to-date))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
532
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
533 (defun vc-default-state-heuristic (backend file)
94548
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
534 "Default implementation of vc-BACKEND-state-heuristic.
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
535 It simply calls the real state computation function `vc-BACKEND-state'
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
536 and does not employ any heuristic at all."
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
537 (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
538
47226
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
539 (defun vc-workfile-unchanged-p (file)
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
540 "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
541 (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
542 (lastmod (nth 5 (file-attributes file))))
97788
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
543 ;; This is a shortcut for determining when the workfile is
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
544 ;; unchanged. It can fail under some circumstances; see the
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
545 ;; discussion in bug#694.
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
546 (if (and checkout-time
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
547 ;; Tramp and Ange-FTP return this when they don't know the time.
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
548 (not (equal lastmod '(0 0))))
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
549 (equal checkout-time lastmod)
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
550 (let ((unchanged (vc-call workfile-unchanged-p file)))
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
551 (vc-file-setprop file 'vc-checkout-time (if unchanged lastmod 0))
14bced35f912 (vc-workfile-unchanged-p): Revert last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97777
diff changeset
552 unchanged))))
47226
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
553
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
554 (defun vc-default-workfile-unchanged-p (backend file)
107815
9c5ceea9a88b Get rid of several uses of the term 'master' in favor of equivalent verbiage
Eric S. Raymond <esr@thyrsus.com>
parents: 107810
diff changeset
555 "Check if FILE is unchanged by diffing against the repository version.
47226
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
556 Return non-nil if FILE is unchanged."
54783
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
557 (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
558 ;; 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
559 ;; go to *vc*, not *vc-diff*, since this is an internal call.
94805
89d37b54b964 * vc.el (vc-mark-resolved): Add `backend' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94747
diff changeset
560 (vc-call-backend backend 'diff (list file) nil nil "*vc*")
54783
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
561 (wrong-number-of-arguments
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
562 ;; 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
563 ;; try again without the optional buffer argument (for
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
564 ;; backward compatibility). Otherwise, resignal.
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
565 (if (or (not (eq (cadr err)
507f2c946725 (vc-arg-list): Function removed.
André Spiegel <spiegel@gnu.org>
parents: 54613
diff changeset
566 (indirect-function
94805
89d37b54b964 * vc.el (vc-mark-resolved): Add `backend' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94747
diff changeset
567 (vc-find-backend-function backend 'diff))))
55099
a856350e29d5 (vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents: 54912
diff changeset
568 (not (eq (caddr err) 4)))
a856350e29d5 (vc-default-workfile-unchanged-p): Fix code that handles
Juanma Barranquero <lekktu@gmail.com>
parents: 54912
diff changeset
569 (signal (car err) (cdr err))
94805
89d37b54b964 * vc.el (vc-mark-resolved): Add `backend' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94747
diff changeset
570 (vc-call-backend backend 'diff (list file)))))))
47226
31f2c4b2c82f Require vc.el at compile-time.
André Spiegel <spiegel@gnu.org>
parents: 47003
diff changeset
571
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
572 (defun vc-working-revision (file &optional backend)
81958
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
573 "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
574 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
575 (or (vc-file-getprop file 'vc-working-revision)
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
576 (progn
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
577 (setq backend (or backend (vc-backend file)))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
578 (when backend
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
579 (vc-file-setprop file 'vc-working-revision
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
580 (vc-call-backend backend 'working-revision file))))))
94207
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
581
85319
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
582 ;; Backward compatibility.
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
583 (define-obsolete-function-alias
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
584 'vc-workfile-version 'vc-working-revision "23.1")
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
585 (defun vc-default-working-revision (backend file)
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
586 (message
14749907af36 (vc-workfile-version): Compatibility alias.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85169
diff changeset
587 "`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
588 (vc-call-backend backend 'workfile-version file))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
589
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
590 (defun vc-default-registered (backend file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
591 "Check if FILE is registered in BACKEND using vc-BACKEND-master-templates."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
592 (let ((sym (vc-make-backend-sym backend 'master-templates)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
593 (unless (get backend 'vc-templates-grabbed)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
594 (put backend 'vc-templates-grabbed t)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
595 (set sym (append (delq nil
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
596 (mapcar
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
597 (lambda (template)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
598 (and (consp template)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
599 (eq (cdr template) backend)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
600 (car template)))
52051
3507a2fac9b5 (vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents: 51761
diff changeset
601 (with-no-warnings
3507a2fac9b5 (vc-default-registered, vc-make-version-backup): Use with-no-warnings.
André Spiegel <spiegel@gnu.org>
parents: 51761
diff changeset
602 vc-master-templates)))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
603 (symbol-value sym))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
604 (let ((result (vc-check-master-templates file (symbol-value sym))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
605 (if (stringp result)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
606 (vc-file-setprop file 'vc-name result)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
607 nil)))) ; Not registered
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
608
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
609 (defun vc-possible-master (s dirname basename)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
610 (cond
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
611 ((stringp s) (format s dirname basename))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
612 ((functionp s)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
613 ;; The template is a function to invoke. If the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
614 ;; function returns non-nil, that means it has found a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
615 ;; master. For backward compatibility, we also handle
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
616 ;; the case that the function throws a 'found atom
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
617 ;; and a pair (cons MASTER-FILE BACKEND).
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
618 (let ((result (catch 'found (funcall s dirname basename))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
619 (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
620
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
621 (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
622 "Return non-nil if there is a master corresponding to FILE.
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
623
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
624 TEMPLATES is a list of strings or functions. If an element is a
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
625 string, it must be a control string as required by `format', with two
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
626 string placeholders, such as \"%sRCS/%s,v\". The directory part of
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
627 FILE is substituted for the first placeholder, the basename of FILE
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
628 for the second. If a file with the resulting name exists, it is taken
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
629 as the master of FILE, and returned.
9248
325cee61ab7f (vc-status): Handle CVS.
Richard M. Stallman <rms@gnu.org>
parents: 8982
diff changeset
630
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
631 If an element of TEMPLATES is a function, it is called with the
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
632 directory part and the basename of FILE as arguments. It should
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
633 return non-nil if it finds a master; that value is then returned by
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
634 this function."
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
635 (let ((dirname (or (file-name-directory file) ""))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
636 (basename (file-name-nondirectory file)))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
637 (catch 'found
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
638 (mapcar
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
639 (lambda (s)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
640 (let ((trial (vc-possible-master s dirname basename)))
94207
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
641 (when (and trial (file-exists-p trial)
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
642 ;; Make sure the file we found with name
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
643 ;; TRIAL is not the source file itself.
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
644 ;; That can happen with RCS-style names if
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
645 ;; the file name is truncated (e.g. to 14
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
646 ;; chars). See if either directory or
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
647 ;; attributes differ.
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
648 (or (not (string= dirname
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
649 (file-name-directory trial)))
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
650 (not (equal (file-attributes file)
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
651 (file-attributes trial)))))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
652 (throw 'found trial))))
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
653 templates))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
654
10176
332014233a2c (vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 9869
diff changeset
655 (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
656 "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
657
2620
d26f75fd9f5e (vc-mode-line): Don't alter key bindings.
Richard M. Stallman <rms@gnu.org>
parents: 2491
diff changeset
658 If the buffer is visiting a file registered with version control,
94548
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
659 throw an error, because this is not a safe or really meaningful operation
089a9212abc0 (vc-call, vc-state): Fix typos in docstrings.
Juanma Barranquero <lekktu@gmail.com>
parents: 94543
diff changeset
660 on any version-control system newer than RCS.
94540
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
661
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
662 Otherwise, just change the read-only flag of the buffer.
46453
8a775aba60aa Don't bind vc-toggle-read-only to C-x C-q.
André Spiegel <spiegel@gnu.org>
parents: 43587
diff changeset
663
94540
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
664 If you bind this function to \\[toggle-read-only], then Emacs
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
665 will properly intercept all attempts to toggle the read-only flag
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
666 on version-controlled buffer."
10176
332014233a2c (vc-toggle-read-only): Accept prefix arg
Richard M. Stallman <rms@gnu.org>
parents: 9869
diff changeset
667 (interactive "P")
94540
55cb4c49dc98 The day wehen vc-toggle-ready-only was a good idea is long gone.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
668 (if (vc-backend buffer-file-name)
105170
f8ba8d6fd250 Fix typos.
Juanma Barranquero <lekktu@gmail.com>
parents: 105010
diff changeset
669 (error "Toggling the readability of a version controlled file is likely to wreak havoc")
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
670 (toggle-read-only)))
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
671
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
672 (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
673 "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
674 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
675 nil)
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
676
32746
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
677 (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
678 "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
679 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
680 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
681 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
682 (if regexp
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
683 (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
684 "\\.~.+" (unless manual "\\.") "~")
47918
022aa2332f91 (vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47244
diff changeset
685 (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
686 ".~" (subst-char-in-string
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85114
diff changeset
687 ?/ ?_ (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
688 (unless manual ".") "~")
78fabc2762c4 (vc-version-backup-file-name): Use file.~<rev>~ for manual backups and
André Spiegel <spiegel@gnu.org>
parents: 32746
diff changeset
689 (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
690
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
691 (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
692 "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
693 (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
694 (mapc
39389
6629bc0d69e5 (vc-delete-automatic-version-backups):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 38373
diff changeset
695 'delete-file
39417
c13780d8dbd2 (vc-delete-automatic-version-backups): Handle the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39389
diff changeset
696 (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
697 (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
698 ;; 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
699 (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
700
033bb57afe0c (vc-version-backup-file-name): New optional args MANUAL and REGEXP.
André Spiegel <spiegel@gnu.org>
parents: 32188
diff changeset
701 (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
702 "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
703 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
704 (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
705 (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
706 (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
707 (condition-case nil
c3afd6e6c992 (vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents: 58641
diff changeset
708 (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
709 nil 'keep-date)
c3afd6e6c992 (vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents: 58641
diff changeset
710 ;; 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
711 ;; 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
712 (file-error
59978
c3afd6e6c992 (vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents: 58641
diff changeset
713 (message
c3afd6e6c992 (vc-make-version-backup): Ignore file-errors, e.g. directory not
André Spiegel <spiegel@gnu.org>
parents: 58641
diff changeset
714 (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
715 "diff/revert therefore not local"))))))
32127
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
716
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
717 (defun vc-before-save ()
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
718 "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
719 ;; 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
720 ;; 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
721 ;; another name. This enables local diffs and local reverting.
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
722 (let ((file buffer-file-name)
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
723 backend)
93316
709d31efe571 (vc-before-save): Be careful not to prevent saving the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93239
diff changeset
724 (ignore-errors ;Be careful not to prevent saving the file.
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
725 (and (setq backend (vc-backend file))
93316
709d31efe571 (vc-before-save): Be careful not to prevent saving the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93239
diff changeset
726 (vc-up-to-date-p file)
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94548
diff changeset
727 (eq (vc-checkout-model backend (list file)) 'implicit)
94805
89d37b54b964 * vc.el (vc-mark-resolved): Add `backend' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94747
diff changeset
728 (vc-call-backend backend 'make-version-backups-p file)
93316
709d31efe571 (vc-before-save): Be careful not to prevent saving the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93239
diff changeset
729 (vc-make-version-backup file)))))
32127
1543b0fc904b (vc-before-save, vc-default-make-version-backups,
André Spiegel <spiegel@gnu.org>
parents: 32070
diff changeset
730
96203
30bbe1648bcf * vc.el:
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95338
diff changeset
731 (declare-function vc-dir-resynch-file "vc-dir" (&optional fname))
86234
860a7a8e779e * progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85319
diff changeset
732
105293
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
733 (defvar vc-dir-buffers nil "List of vc-dir buffers.")
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
734
12914
22f47b2375c1 (vc-fetch-master-properties): RCS case: get locking mode.
André Spiegel <spiegel@gnu.org>
parents: 12884
diff changeset
735 (defun vc-after-save ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
736 "Function to be called by `basic-save-buffer' (in files.el)."
31564
00efca34e7d0 Doc fixes.
Dave Love <fx@gnu.org>
parents: 31405
diff changeset
737 ;; If the file in the current buffer is under version control,
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
738 ;; up-to-date, and locking is not used for the file, set
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
739 ;; the state to 'edited and redisplay the mode line.
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
740 (let* ((file buffer-file-name)
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
741 (backend (vc-backend file)))
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94207
diff changeset
742 (and backend
12967
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
743 (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
744 (nth 5 (file-attributes file)))
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
745 ;; 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
746 ;; it was checked out. Clear the checkout-time
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
747 ;; to avoid confusion.
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
748 (vc-file-setprop file 'vc-checkout-time nil))
ee545522ef2a (vc-utc-string): New function.
André Spiegel <spiegel@gnu.org>
parents: 12944
diff changeset
749 t)
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94548
diff changeset
750 (eq (vc-checkout-model backend (list file)) 'implicit)
105293
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
751 (vc-state-refresh file backend)
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
752 (vc-mode-line file backend))
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
753 ;; Try to avoid unnecessary work, a *vc-dir* buffer is
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
754 ;; present if this is true.
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
755 (when vc-dir-buffers
8bfe20e0336c * vc-hooks.el (vc-dir-buffers): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 105170
diff changeset
756 (vc-dir-resynch-file file))))
12884
f47248851f26 (vc-fetch-master-properties): Recognize cvs status "Unresolved Conflict".
André Spiegel <spiegel@gnu.org>
parents: 12874
diff changeset
757
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
758 (defvar vc-menu-entry
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
759 `(menu-item ,(purecopy "Version Control") vc-menu-map
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
760 :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
761
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
762 (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
763 ;; 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
764 ;; 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
765 ;; 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
766 (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
767
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
768 (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
769 (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
770 (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
771 map))
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
772
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
773 (defun vc-mode-line (file &optional backend)
2491
5f3061858f47 vc-mode: name change.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 2232
diff changeset
774 "Set `vc-mode' to display type of version control for FILE.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
775 The value is set in the current buffer, which should be the buffer
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
776 visiting FILE.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
777 If BACKEND is passed use it as the VC backend when computing the result."
32188
a771b5a6fa69 (vc-mode-line): Fix interactive spec.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 32127
diff changeset
778 (interactive (list buffer-file-name))
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
779 (setq backend (or backend (vc-backend file)))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
780 (if (not backend)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
781 (setq vc-mode nil)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
782 (let* ((ml-string (vc-call-backend backend 'mode-line-string file))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
783 (ml-echo (get-text-property 0 'help-echo ml-string)))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
784 (setq vc-mode
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
785 (concat
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
786 " "
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
787 (if (null vc-display-status)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
788 (symbol-name backend)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
789 (propertize
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
790 ml-string
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
791 'mouse-face 'mode-line-highlight
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
792 'help-echo
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
793 (concat (or ml-echo
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
794 (format "File under the %s version control system"
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
795 backend))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
796 "\nmouse-1: Version Control menu")
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
797 'local-map vc-mode-line-map)))))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
798 ;; If the user is root, and the file is not owner-writable,
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
799 ;; then pretend that we can't write it
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
800 ;; even though we can (because root can write anything).
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
801 ;; This way, even root cannot modify a file that isn't locked.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
802 (and (equal file buffer-file-name)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
803 (not buffer-read-only)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
804 (zerop (user-real-uid))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
805 (zerop (logand (file-modes buffer-file-name) 128))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
806 (setq buffer-read-only t)))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
807 (force-mode-line-update)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
808 backend)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
809
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
810 (defun vc-default-mode-line-string (backend file)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
811 "Return string for placement in modeline by `vc-mode-line' for FILE.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
812 Format:
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
813
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
814 \"BACKEND-REV\" if the file is up-to-date
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
815 \"BACKEND:REV\" if the file is edited (or locked by the calling user)
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
816 \"BACKEND:LOCKER:REV\" if the file is locked by somebody else
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
817
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
818 This function assumes that the file is registered."
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
819 (let* ((backend-name (symbol-name backend))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
820 (state (vc-state file backend))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
821 (state-echo nil)
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
822 (rev (vc-working-revision file backend)))
81815
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
823 (propertize
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
824 (cond ((or (eq state 'up-to-date)
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
825 (eq state 'needs-update))
81815
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
826 (setq state-echo "Up to date file")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
827 (concat backend-name "-" rev))
81815
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
828 ((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
829 (setq state-echo (concat "File locked by" state))
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
830 (concat backend-name ":" state ":" rev))
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92345
diff changeset
831 ((eq state 'added)
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92345
diff changeset
832 (setq state-echo "Locally added file")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
833 (concat backend-name "@" rev))
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93940
diff changeset
834 ((eq state 'conflict)
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93940
diff changeset
835 (setq state-echo "File contains conflicts after the last merge")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
836 (concat backend-name "!" rev))
93239
3d37b67e5a01 (vc-default-mode-line-string): Deal with 'removed
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93196
diff changeset
837 ((eq state 'removed)
3d37b67e5a01 (vc-default-mode-line-string): Deal with 'removed
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93196
diff changeset
838 (setq state-echo "File removed from the VC system")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
839 (concat backend-name "!" rev))
93239
3d37b67e5a01 (vc-default-mode-line-string): Deal with 'removed
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93196
diff changeset
840 ((eq state 'missing)
3d37b67e5a01 (vc-default-mode-line-string): Deal with 'removed
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93196
diff changeset
841 (setq state-echo "File tracked by the VC system, but missing from the file system")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
842 (concat backend-name "?" rev))
81815
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
843 (t
7ac8c70c6834 * vc-hooks.el (vc-default-mode-line-string): Add a mouse face,
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81709
diff changeset
844 ;; 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
845 ;; for all other states. Think about different symbols
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
846 ;; for 'needs-update 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
847 (setq state-echo "Locally modified file")
103553
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
848 (concat backend-name ":" rev)))
af4ee0cb7fb7 * vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102811
diff changeset
849 'help-echo (concat state-echo " under the " backend-name
82027
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81987
diff changeset
850 " version control system"))))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
851
14647
b1a88c3a6912 (vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents: 14622
diff changeset
852 (defun vc-follow-link ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
853 "If current buffer visits a symbolic link, visit the real file.
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
854 If the real file is already visited in another buffer, make that buffer
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
855 current, and kill the buffer that visits the link."
99788
2de5937e4473 (vc-follow-link, vc-find-file-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99199
diff changeset
856 (let* ((true-buffer (find-buffer-visiting buffer-file-truename))
14673
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
857 (this-buffer (current-buffer)))
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
858 (if (eq true-buffer this-buffer)
99840
4681f328596c (vc-follow-link): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 99788
diff changeset
859 (let ((truename buffer-file-truename))
14674
f585d3bf3a73 (vc-follow-link): Kill buffer before creating new one.
Richard M. Stallman <rms@gnu.org>
parents: 14673
diff changeset
860 (kill-buffer this-buffer)
14673
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
861 ;; 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
862 ;; 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
863 ;; 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
864 (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
865 (set-buffer true-buffer)
8f8a4224147b (vc-follow-link): Simplify by taking advantage
Richard M. Stallman <rms@gnu.org>
parents: 14647
diff changeset
866 (kill-buffer this-buffer))))
14647
b1a88c3a6912 (vc-follow-link): New function.
André Spiegel <spiegel@gnu.org>
parents: 14622
diff changeset
867
54397
fcc26abed3ba (vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
868 (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
869 nil)
fcc26abed3ba (vc-handled-backends): Add Arch. Move MCVS down.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52401
diff changeset
870
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
871 (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
872 "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
873 ;; 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
874 ;; if user has killed the buffer and revisited.
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
875 (when vc-mode
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
876 (setq vc-mode nil))
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
877 (when buffer-file-name
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
878 (vc-file-clearprops buffer-file-name)
108943
04a1a4b18129 * lisp/vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107075
diff changeset
879 ;; FIXME: Why use a hook? Why pass it buffer-file-name?
04a1a4b18129 * lisp/vc-dispatcher.el: Rename mode-line-hook to vc-mode-line-hook;
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 107075
diff changeset
880 (add-hook 'vc-mode-line-hook 'vc-mode-line nil t)
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
881 (let (backend)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
882 (cond
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
883 ((setq backend (with-demoted-errors (vc-backend buffer-file-name)))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
884 ;; Compute the state and put it in the modeline.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
885 (vc-mode-line buffer-file-name backend)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
886 (unless vc-make-backup-files
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
887 ;; Use this variable, not make-backup-files,
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
888 ;; because this is for things that depend on the file name.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
889 (set (make-local-variable 'backup-inhibited) t))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
890 ;; Let the backend setup any buffer-local things he needs.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
891 (vc-call-backend backend 'find-file-hook))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
892 ((let ((link-type (and (not (equal buffer-file-name buffer-file-truename))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
893 (vc-backend buffer-file-truename))))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
894 (cond ((not link-type) nil) ;Nothing to do.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
895 ((eq vc-follow-symlinks nil)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
896 (message
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
897 "Warning: symbolic link to %s-controlled source file" link-type))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
898 ((or (not (eq vc-follow-symlinks 'ask))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
899 ;; If we already visited this file by following
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
900 ;; the link, don't ask again if we try to visit
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
901 ;; it again. GUD does that, and repeated questions
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
902 ;; are painful.
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
903 (get-file-buffer
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
904 (abbreviate-file-name
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
905 (file-chase-links buffer-file-name))))
47918
022aa2332f91 (vc-insert-file): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47244
diff changeset
906
102811
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
907 (vc-follow-link)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
908 (message "Followed link to %s" buffer-file-name)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
909 (vc-find-file-hook))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
910 (t
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
911 (if (yes-or-no-p (format
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
912 "Symbolic link to %s-controlled source file; follow link? " link-type))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
913 (progn (vc-follow-link)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
914 (message "Followed link to %s" buffer-file-name)
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
915 (vc-find-file-hook))
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
916 (message
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
917 "Warning: editing through the link bypasses version control")
00247bf9b438 (vc-name): Avoid calling vc-backend twice.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 101673
diff changeset
918 )))))))))
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
919
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
920 (add-hook 'find-file-hook 'vc-find-file-hook)
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
921
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
922 (defun vc-kill-buffer-hook ()
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
923 "Discard VC info about a file when we kill its buffer."
94207
2aa6d908ffad * vc-hooks.el (vc-insert-file, vc-state, vc-working-revision)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94190
diff changeset
924 (when buffer-file-name (vc-file-clearprops buffer-file-name)))
11598
540868154dc9 (vc-buffer-backend): New function.
Richard M. Stallman <rms@gnu.org>
parents: 10176
diff changeset
925
47003
fe0d9d5309e4 (vc-kill-buffer-hook): Add it to kill-buffer-hook again.
André Spiegel <spiegel@gnu.org>
parents: 46723
diff changeset
926 (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
927
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
928 ;; 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
929 ;; 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
930 ;; want to call them from random buffers.
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
931
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
932 ;; 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
933 ;; 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
934 ;; (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
935 (defvar vc-prefix-map
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
936 (let ((map (make-sparse-keymap)))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
937 (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
938 (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
939 (define-key map "c" 'vc-rollback)
94106
9294e3bd7d46 Rename vc-status to vc-dir and the vc-status var to vc-ewoc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93956
diff changeset
940 (define-key map "d" 'vc-dir)
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
941 (define-key map "g" 'vc-annotate)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
942 (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
943 (define-key map "i" 'vc-register)
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
944 (define-key map "l" 'vc-print-log)
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104612
diff changeset
945 (define-key map "L" 'vc-print-root-log)
108884
ac4bf6e2c535 Add bindings for vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107815
diff changeset
946 (define-key map "I" 'vc-log-incoming)
ac4bf6e2c535 Add bindings for vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107815
diff changeset
947 (define-key map "O" 'vc-log-outgoing)
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
948 (define-key map "m" 'vc-merge)
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95000
diff changeset
949 (define-key map "r" 'vc-retrieve-tag)
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95000
diff changeset
950 (define-key map "s" 'vc-create-tag)
81958
55e9cc4986ff Generalize stay-local-p to operatre on lists of files.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81902
diff changeset
951 (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
952 (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
953 (define-key map "+" 'vc-update)
38373
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
954 (define-key map "=" 'vc-diff)
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104612
diff changeset
955 (define-key map "D" 'vc-root-diff)
85169
708abc311fa6 Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85157
diff changeset
956 (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
957 map))
10cf63a2727d (vc-mode): Dummy function for doc purposes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 33856
diff changeset
958 (fset 'vc-prefix-map vc-prefix-map)
31382
cde9770b21e0 Minor doc fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 27262
diff changeset
959 (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
960
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
961 (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
962 (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
963 ;;(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
964 ;; '("Show Files under VC" . (vc-directory t)))
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95000
diff changeset
965 (define-key map [vc-retrieve-tag]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
966 `(menu-item ,(purecopy "Retrieve Tag") vc-retrieve-tag
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
967 :help ,(purecopy "Retrieve tagged version or branch")))
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95000
diff changeset
968 (define-key map [vc-create-tag]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
969 `(menu-item ,(purecopy "Create Tag") vc-create-tag
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
970 :help ,(purecopy "Create version tag")))
105941
d1bb0f3aad35 * net/eudc.el (eudc-tools-menu):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105879
diff changeset
971 (define-key map [separator1] menu-bar-separator)
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
972 (define-key map [vc-annotate]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
973 `(menu-item ,(purecopy "Annotate") vc-annotate
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
974 :help ,(purecopy "Display the edit history of the current file using colors")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
975 (define-key map [vc-rename-file]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
976 `(menu-item ,(purecopy "Rename File") vc-rename-file
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
977 :help ,(purecopy "Rename file")))
85169
708abc311fa6 Follow through on the VC terminology change (version -> revision).
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85157
diff changeset
978 (define-key map [vc-revision-other-window]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
979 `(menu-item ,(purecopy "Show Other Version") vc-revision-other-window
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
980 :help ,(purecopy "Visit another version of the current file in another window")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
981 (define-key map [vc-diff]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
982 `(menu-item ,(purecopy "Compare with Base Version") vc-diff
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
983 :help ,(purecopy "Compare file set with the base version")))
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104612
diff changeset
984 (define-key map [vc-root-diff]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
985 `(menu-item ,(purecopy "Compare Tree with Base Version") vc-root-diff
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
986 :help ,(purecopy "Compare current tree with the base version")))
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
987 (define-key map [vc-update-change-log]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
988 `(menu-item ,(purecopy "Update ChangeLog") vc-update-change-log
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
989 :help ,(purecopy "Find change log file and add entries from recent version control logs")))
107795
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
990 (define-key map [vc-log-out]
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
991 `(menu-item ,(purecopy "Show Outgoing Log") vc-log-outgoing
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
992 :help ,(purecopy "Show a log of changes that will be sent with a push operation")))
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
993 (define-key map [vc-log-in]
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
994 `(menu-item ,(purecopy "Show Incoming Log") vc-log-incoming
d47e1fb98df3 Add new VC methods: vc-log-incoming and vc-log-outgoing.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107431
diff changeset
995 :help ,(purecopy "Show a log of changes that will be received with a pull operation")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
996 (define-key map [vc-print-log]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
997 `(menu-item ,(purecopy "Show History") vc-print-log
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
998 :help ,(purecopy "List the change log of the current file set in a window")))
105010
b3c2589ed19e * vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104612
diff changeset
999 (define-key map [vc-print-root-log]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1000 `(menu-item ,(purecopy "Show Top of the Tree History ") vc-print-root-log
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1001 :help ,(purecopy "List the change log for the current tree in a window")))
105941
d1bb0f3aad35 * net/eudc.el (eudc-tools-menu):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105879
diff changeset
1002 (define-key map [separator2] menu-bar-separator)
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1003 (define-key map [vc-insert-header]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1004 `(menu-item ,(purecopy "Insert Header") vc-insert-headers
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1005 :help ,(purecopy "Insert headers into a file for use with a version control system.
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1006 ")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
1007 (define-key map [undo]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1008 `(menu-item ,(purecopy "Undo Last Check-In") vc-rollback
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1009 :help ,(purecopy "Remove the most recent changeset committed to the repository")))
82499
3ecf9562ce0b (vc-menu-entry): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82365
diff changeset
1010 (define-key map [vc-revert]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1011 `(menu-item ,(purecopy "Revert to Base Version") vc-revert
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1012 :help ,(purecopy "Revert working copies of the selected file set to their repository contents")))
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1013 (define-key map [vc-update]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1014 `(menu-item ,(purecopy "Update to Latest Version") vc-update
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1015 :help ,(purecopy "Update the current fileset's files to their tip revisions")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
1016 (define-key map [vc-next-action]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1017 `(menu-item ,(purecopy "Check In/Out") vc-next-action
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1018 :help ,(purecopy "Do the next logical version control operation on the current fileset")))
91954
97acdba31c63 Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 91855
diff changeset
1019 (define-key map [vc-register]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1020 `(menu-item ,(purecopy "Register") vc-register
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1021 :help ,(purecopy "Register file set into a version control system")))
94106
9294e3bd7d46 Rename vc-status to vc-dir and the vc-status var to vc-ewoc.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93956
diff changeset
1022 (define-key map [vc-dir]
105715
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1023 `(menu-item ,(purecopy "VC Dir") vc-dir
6b8dce5c4461 * puresize.h (BASE_PURESIZE): Increase to 1430000.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105293
diff changeset
1024 :help ,(purecopy "Show the VC status of files in a directory")))
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1025 map))
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1026
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1027 (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
1028
105735
5d9281801a59 Convert comment about autoload into autoload comment.
Glenn Morris <rgm@gnu.org>
parents: 105715
diff changeset
1029 (declare-function vc-responsible-backend "vc" (file))
93501
f6fe1c1d8ba6 (vc-responsible-backend): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 93381
diff changeset
1030
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1031 (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
1032 (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
1033 (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
1034 (let ((ext-binding
93381
e6a15031fc81 (vc-menu-map-filter): Be more careful when finding
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93316
diff changeset
1035 (when vc-mode
93501
f6fe1c1d8ba6 (vc-responsible-backend): Declare as function.
Glenn Morris <rgm@gnu.org>
parents: 93381
diff changeset
1036 (vc-call-backend
93381
e6a15031fc81 (vc-menu-map-filter): Be more careful when finding
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93316
diff changeset
1037 (if buffer-file-name
e6a15031fc81 (vc-menu-map-filter): Be more careful when finding
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93316
diff changeset
1038 (vc-backend buffer-file-name)
e6a15031fc81 (vc-menu-map-filter): Be more careful when finding
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93316
diff changeset
1039 (vc-responsible-backend default-directory))
e6a15031fc81 (vc-menu-map-filter): Be more careful when finding
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93316
diff changeset
1040 'extra-menu))))
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1041 ;; 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
1042 ;; 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
1043 (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
1044 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
1045 (append orig-binding
105941
d1bb0f3aad35 * net/eudc.el (eudc-tools-menu):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105879
diff changeset
1046 '((ext-menu-separator "--"))
78822
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1047 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
1048
1926a08e8926 * vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78792
diff changeset
1049 (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
1050 nil)
14622
3d47471d947d Move all the put's for menu-enable props to top level.
Karl Heuer <kwzh@gnu.org>
parents: 14566
diff changeset
1051
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
1052 (provide 'vc-hooks)
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
1053
57079
6f014cde9d81 (vc-ignore-dir-regexp): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 55099
diff changeset
1054 ;; arch-tag: 2e5a6fa7-1d30-48e2-8bd0-e3d335f04f32
904
4a1ac370d57a Initial revision
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
diff changeset
1055 ;;; vc-hooks.el ends here