50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2
|
57095
|
3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
|
|
4 ;; Free Software Foundation, Inc.
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
6 ;; Author: FSF (see vc.el for full credits)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; GNU Emacs is free software; you can redistribute it and/or modify
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
13 ;; the Free Software Foundation; either version 2, or (at your option)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 ;; any later version.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful,
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 ;; Boston, MA 02111-1307, USA.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;;; Commentary:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27
|
50779
|
28 ;; The home page of the Meta-CVS version control system is at
|
57914
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
29 ;;
|
50779
|
30 ;; http://users.footprints.net/~kaz/mcvs.html
|
57914
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
31 ;;
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 ;; This is derived from vc-cvs.el as follows:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
33 ;; - cp vc-cvs.el vc-mcvs.el
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 ;; - Replace CVS/ with MCVS/CVS/
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 ;; - Replace 'CVS with 'MCVS
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 ;; - Replace -cvs- with -mcvs-
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 ;; - Replace most of the rest of CVS to Meta-CVS
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
38 ;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 ;; Then of course started the hacking. Only a small part of the code
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 ;; has been touched and not much more than that was tested, so if
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
41 ;; you bump into a bug, don't be surprised: just report it to me.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
42 ;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
43 ;; What has been partly tested:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
44 ;; - C-x v v to start editing a file that was checked out with CVSREAD on.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
45 ;; - C-x v v to commit a file
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
46 ;; - C-x v =
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
47 ;; - C-x v l
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
48 ;; - C-x v i
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 ;; - C-x v g
|
50808
|
50 ;; - M-x vc-rename-file RET
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
51
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
52 ;;; Bugs:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
53
|
50952
|
54 ;; - Retrieving snapshots doesn't filter `cvs update' output and thus
|
|
55 ;; parses bogus filenames. Don't know if it harms.
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
56
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 ;;; Code:
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
58
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
59 (eval-when-compile (require 'vc))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
60 (require 'vc-cvs)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
62 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
63 ;;; Customization options
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
65
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
66 (defcustom vc-mcvs-global-switches nil
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
67 "*Global switches to pass to any Meta-CVS command."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
68 :type '(choice (const :tag "None" nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
69 (string :tag "Argument String")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
70 (repeat :tag "Argument List"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
71 :value ("")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
72 string))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
73 :version "21.4"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
74 :group 'vc)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 (defcustom vc-mcvs-register-switches nil
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 "*Extra switches for registering a file into Meta-CVS.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
78 A string or list of strings passed to the checkin program by
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
79 \\[vc-register]."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
80 :type '(choice (const :tag "None" nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 (string :tag "Argument String")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
82 (repeat :tag "Argument List"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
83 :value ("")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
84 string))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
85 :version "21.4"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
86 :group 'vc)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
88 (defcustom vc-mcvs-diff-switches nil
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
89 "*A string or list of strings specifying extra switches for cvs diff under VC."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
90 :type '(choice (const :tag "None" nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
91 (string :tag "Argument String")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
92 (repeat :tag "Argument List"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
93 :value ("")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
94 string))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
95 :version "21.4"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
96 :group 'vc)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
97
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
98 (defcustom vc-mcvs-header (or (cdr (assoc 'MCVS vc-header-alist))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
99 vc-cvs-header)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
100 "*Header keywords to be inserted by `vc-insert-headers'."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
101 :version "21.4"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
102 :type '(repeat string)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 :group 'vc)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
104
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 (defcustom vc-mcvs-use-edit vc-cvs-use-edit
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 "*Non-nil means to use `cvs edit' to \"check out\" a file.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
107 This is only meaningful if you don't use the implicit checkout model
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
108 \(i.e. if you have $CVSREAD set)."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
109 :type 'boolean
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
110 :version "21.4"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
111 :group 'vc)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
112
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
113 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
114 ;;; State-querying functions
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
115 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
116
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
117 ;;;###autoload (defun vc-mcvs-registered (file)
|
57095
|
118 ;;;###autoload (if (vc-find-root file "MCVS/CVS")
|
|
119 ;;;###autoload (progn
|
|
120 ;;;###autoload (load "vc-mcvs")
|
|
121 ;;;###autoload (vc-mcvs-registered file))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
122
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
123 (defun vc-mcvs-root (file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
124 "Return the root directory of a Meta-CVS project, if any."
|
50667
|
125 (or (vc-file-getprop file 'mcvs-root)
|
57095
|
126 (vc-file-setprop file 'mcvs-root (vc-find-root file "MCVS/CVS"))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 (defun vc-mcvs-read (file)
|
50899
|
129 (if (file-readable-p file)
|
|
130 (with-temp-buffer
|
|
131 (insert-file-contents file)
|
|
132 (goto-char (point-min))
|
|
133 (read (current-buffer)))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
135 (defun vc-mcvs-map-file (dir file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
136 (let ((map (vc-mcvs-read (expand-file-name "MCVS/MAP" dir)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
137 inode)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
138 (dolist (x map inode)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
139 (if (equal (nth 2 x) file) (setq inode (nth 1 x))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
140
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 (defun vc-mcvs-registered (file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
142 (let (root inode cvsfile)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 (when (and (setq root (vc-mcvs-root file))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 (setq inode (vc-mcvs-map-file
|
50667
|
145 root (file-relative-name file root))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
146 (vc-file-setprop file 'mcvs-inode inode)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
147 ;; Avoid calling `mcvs diff' in vc-workfile-unchanged-p.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 (vc-file-setprop file 'vc-checkout-time
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
149 (if (vc-cvs-registered
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
150 (setq cvsfile (expand-file-name inode root)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
151 (vc-file-getprop cvsfile 'vc-checkout-time)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 ;; The file might not be registered yet because
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 ;; of lazy-adding.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
154 0))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
155 t)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
157 (defun vc-mcvs-state (file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
158 ;; This would assume the Meta-CVS sandbox is synchronized.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
159 ;; (vc-mcvs-cvs state file))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
160 "Meta-CVS-specific version of `vc-state'."
|
50928
|
161 (if (vc-stay-local-p file)
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
162 (let ((state (vc-file-getprop file 'vc-state)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
163 ;; If we should stay local, use the heuristic but only if
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
164 ;; we don't have a more precise state already available.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
165 (if (memq state '(up-to-date edited))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
166 (vc-mcvs-state-heuristic file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 state))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 (with-temp-buffer
|
50952
|
169 (setq default-directory (vc-mcvs-root file))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
170 (vc-mcvs-command t 0 file "status")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
171 (vc-cvs-parse-status t))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
172
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
174 (defalias 'vc-mcvs-state-heuristic 'vc-cvs-state-heuristic)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
176 (defun vc-mcvs-dir-state (dir)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
177 "Find the Meta-CVS state of all files in DIR."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
178 ;; if DIR is not under Meta-CVS control, don't do anything.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
179 (when (file-readable-p (expand-file-name "MCVS/CVS/Entries" dir))
|
50928
|
180 (if (vc-stay-local-p dir)
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
181 (vc-mcvs-dir-state-heuristic dir)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
182 (let ((default-directory dir))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
183 ;; Don't specify DIR in this command, the default-directory is
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
184 ;; enough. Otherwise it might fail with remote repositories.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
185 (with-temp-buffer
|
50952
|
186 (setq default-directory (vc-mcvs-root dir))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
187 (vc-mcvs-command t 0 nil "status" "-l")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
188 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
189 (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
190 (narrow-to-region (match-beginning 0) (match-end 0))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
191 (vc-cvs-parse-status)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
192 (goto-char (point-max))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
193 (widen)))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
194
|
53639
|
195 (defun vc-mcvs-workfile-version (file)
|
|
196 (vc-cvs-workfile-version
|
|
197 (expand-file-name (vc-file-getprop file 'mcvs-inode)
|
|
198 (vc-file-getprop file 'mcvs-root))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
199
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
200 (defalias 'vc-mcvs-checkout-model 'vc-cvs-checkout-model)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
201
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
202 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 ;;; State-changing functions
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
204 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
205
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
206 (defun vc-mcvs-register (file &optional rev comment)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
207 "Register FILE into the Meta-CVS version-control system.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
208 COMMENT can be used to provide an initial description of FILE.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
209
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
210 `vc-register-switches' and `vc-mcvs-register-switches' are passed to
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
211 the Meta-CVS command (in that order)."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
212 (let* ((filename (file-name-nondirectory file))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
213 (extpos (string-match "\\." filename))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
214 (ext (if extpos (substring filename (1+ extpos))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
215 (root (vc-mcvs-root file))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
216 (types-file (expand-file-name "MCVS/TYPES" root))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
217 (map-file (expand-file-name "MCVS/MAP" root))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
218 (types (vc-mcvs-read types-file)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
219 ;; Make sure meta files like MCVS/MAP are not read-only (happens with
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
220 ;; CVSREAD) since Meta-CVS doesn't pay attention to it at all and goes
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
221 ;; belly-up.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
222 (unless (file-writable-p map-file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
223 (vc-checkout map-file t))
|
50667
|
224 (unless (or (file-writable-p types-file) (not (file-exists-p types-file)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
225 (vc-checkout types-file t))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
226 ;; Make sure the `mcvs add' will not fire up the CVSEDITOR
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 ;; to add a rule for the given file's extension.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (when (and ext (not (assoc ext types)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 (let ((type (completing-read "Type to use [default]: "
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
230 '("default" "name-only" "keep-old"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 "binary" "value-only")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 nil t nil nil "default")))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 (push (list ext (make-symbol (upcase (concat ":" type)))) types)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 (setq types (sort types (lambda (x y) (string< (car x) (car y)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 (with-current-buffer (find-file-noselect types-file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 (erase-buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 (pp types (current-buffer))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 (save-buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 (unless (get-buffer-window (current-buffer) t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
240 (kill-buffer (current-buffer)))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
241 ;; Now do the ADD.
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
242 (prog1 (apply 'vc-mcvs-command nil 0 file
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
243 "add"
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
244 (and comment (string-match "[^\t\n ]" comment)
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
245 (concat "-m" comment))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
246 (vc-switches 'MCVS 'register))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
247 ;; I'm not sure exactly why, but if we don't setup the inode and root
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
248 ;; prop of the file, things break later on in vc-mode-line that
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
249 ;; ends up calling vc-mcvs-workfile-version.
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
250 ;; We also need to set vc-checkout-time so that vc-workfile-unchanged-p
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
251 ;; doesn't try to call `mcvs diff' on the file.
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
252 (vc-mcvs-registered file)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 (defalias 'vc-mcvs-responsible-p 'vc-mcvs-root
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 "Return non-nil if CVS thinks it is responsible for FILE.")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
257 (defalias 'vc-cvs-could-register 'vc-cvs-responsible-p
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
258 "Return non-nil if FILE could be registered in Meta-CVS.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
259 This is only possible if Meta-CVS is responsible for FILE's directory.")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
260
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
261 (defun vc-mcvs-checkin (file rev comment)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 "Meta-CVS-specific version of `vc-backend-checkin'."
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
263 (unless (or (not rev) (vc-mcvs-valid-version-number-p rev))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
264 (if (not (vc-mcvs-valid-symbolic-tag-name-p rev))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
265 (error "%s is not a valid symbolic tag name" rev)
|
50928
|
266 ;; If the input revision is a valid symbolic tag name, we create it
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
267 ;; as a branch, commit and switch to it.
|
50952
|
268 ;; This file-specific form of branching is deprecated.
|
|
269 ;; We can't use `mcvs branch' and `mcvs switch' because they cannot
|
|
270 ;; be applied just to this one file.
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
271 (apply 'vc-mcvs-command nil 0 file "tag" "-b" (list rev))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
272 (apply 'vc-mcvs-command nil 0 file "update" "-r" (list rev))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
273 (vc-file-setprop file 'vc-mcvs-sticky-tag rev)
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
274 (setq rev nil)))
|
50928
|
275 ;; This commit might cvs-commit several files (e.g. MAP and TYPES)
|
|
276 ;; so using numbered revs here is dangerous and somewhat meaningless.
|
|
277 (when rev (error "Cannot commit to a specific revision number"))
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
278 (let ((status (apply 'vc-mcvs-command nil 1 file
|
50928
|
279 "ci" "-m" comment
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
280 (vc-switches 'MCVS 'checkin))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
281 (set-buffer "*vc*")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
282 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
283 (when (not (zerop status))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
284 ;; Check checkin problem.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
285 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
286 ((re-search-forward "Up-to-date check failed" nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
287 (vc-file-setprop file 'vc-state 'needs-merge)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
288 (error (substitute-command-keys
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
289 (concat "Up-to-date check failed: "
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 "type \\[vc-next-action] to merge in changes"))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
291 (t
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
292 (pop-to-buffer (current-buffer))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
293 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
294 (shrink-window-if-larger-than-buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
295 (error "Check-in failed"))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
296 ;; Update file properties
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
297 (vc-file-setprop
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
298 file 'vc-workfile-version
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
299 (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
300 ;; Forget the checkout model of the file, because we might have
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
301 ;; guessed wrong when we found the file. After commit, we can
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
302 ;; tell it from the permissions of the file (see
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
303 ;; vc-mcvs-checkout-model).
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
304 (vc-file-setprop file 'vc-checkout-model nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
305
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
306 ;; if this was an explicit check-in (does not include creation of
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
307 ;; a branch), remove the sticky tag.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
308 (if (and rev (not (vc-mcvs-valid-symbolic-tag-name-p rev)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
309 (vc-mcvs-command nil 0 file "update" "-A"))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
310
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
311 (defun vc-mcvs-find-version (file rev buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
312 (apply 'vc-mcvs-command
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
313 buffer 0 file
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
314 "-Q" ; suppress diagnostic output
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
315 "update"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
316 (and rev (not (string= rev ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
317 (concat "-r" rev))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
318 "-p"
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
319 (vc-switches 'MCVS 'checkout)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
320
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
321 (defun vc-mcvs-checkout (file &optional editable rev)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
322 (message "Checking out %s..." file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
323 (with-current-buffer (or (get-file-buffer file) (current-buffer))
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
324 (vc-call update file editable rev (vc-switches 'MCVS 'checkout)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
325 (vc-mode-line file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
326 (message "Checking out %s...done" file))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
327
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
328 (defun vc-mcvs-update (file editable rev switches)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
329 (if (and (file-exists-p file) (not rev))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
330 ;; If no revision was specified, just make the file writable
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
331 ;; if necessary (using `cvs-edit' if requested).
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
332 (and editable (not (eq (vc-mcvs-checkout-model file) 'implicit))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
333 (if vc-mcvs-use-edit
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
334 (vc-mcvs-command nil 0 file "edit")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
335 (set-file-modes file (logior (file-modes file) 128))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
336 (if (equal file buffer-file-name) (toggle-read-only -1))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
337 ;; Check out a particular version (or recreate the file).
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
338 (vc-file-setprop file 'vc-workfile-version nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
339 (apply 'vc-mcvs-command nil 0 file
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
340 (if editable "-w")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
341 "update"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
342 ;; default for verbose checkout: clear the sticky tag so
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
343 ;; that the actual update will get the head of the trunk
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
344 (if (or (not rev) (string= rev ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
345 "-A"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
346 (concat "-r" rev))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
347 switches)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
348
|
50808
|
349 (defun vc-mcvs-rename-file (old new)
|
|
350 (vc-mcvs-command nil 0 new "move" (file-relative-name old)))
|
|
351
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
352 (defun vc-mcvs-revert (file &optional contents-done)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
353 "Revert FILE to the version it was based on."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
354 (vc-default-revert file contents-done)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
355 (unless (eq (vc-checkout-model file) 'implicit)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
356 (if vc-mcvs-use-edit
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
357 (vc-mcvs-command nil 0 file "unedit")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
358 ;; Make the file read-only by switching off all w-bits
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (set-file-modes file (logand (file-modes file) 3950)))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
361 (defun vc-mcvs-merge (file first-version &optional second-version)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
362 "Merge changes into current working copy of FILE.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
363 The changes are between FIRST-VERSION and SECOND-VERSION."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364 (vc-mcvs-command nil 0 file
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 "update" "-kk"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 (concat "-j" first-version)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 (concat "-j" second-version))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
368 (vc-file-setprop file 'vc-state 'edited)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
369 (with-current-buffer (get-buffer "*vc*")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
371 (if (re-search-forward "conflicts during merge" nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
372 1 ; signal error
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
373 0))) ; signal success
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
374
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (defun vc-mcvs-merge-news (file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
376 "Merge in any new changes made to FILE."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
377 (message "Merging changes into %s..." file)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
378 ;; (vc-file-setprop file 'vc-workfile-version nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
379 (vc-file-setprop file 'vc-checkout-time 0)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
380 (vc-mcvs-command nil 0 file "update")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
381 ;; Analyze the merge result reported by Meta-CVS, and set
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
382 ;; file properties accordingly.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
383 (with-current-buffer (get-buffer "*vc*")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
384 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
385 ;; get new workfile version
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
386 (if (re-search-forward
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
387 "^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
388 (vc-file-setprop file 'vc-workfile-version (match-string 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
389 (vc-file-setprop file 'vc-workfile-version nil))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
390 ;; get file status
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
391 (prog1
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
392 (if (eq (buffer-size) 0)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
393 0 ;; there were no news; indicate success
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 (if (re-search-forward
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
395 (concat "^\\([CMUP] \\)?"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
396 ".*"
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
397 "\\( already contains the differences between \\)?")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
398 nil t)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
399 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
400 ;; Merge successful, we are in sync with repository now
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
401 ((or (match-string 2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
402 (string= (match-string 1) "U ")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
403 (string= (match-string 1) "P "))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
404 (vc-file-setprop file 'vc-state 'up-to-date)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
405 (vc-file-setprop file 'vc-checkout-time
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
406 (nth 5 (file-attributes file)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
407 0);; indicate success to the caller
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
408 ;; Merge successful, but our own changes are still in the file
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
409 ((string= (match-string 1) "M ")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
410 (vc-file-setprop file 'vc-state 'edited)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
411 0);; indicate success to the caller
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
412 ;; Conflicts detected!
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
413 (t
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
414 (vc-file-setprop file 'vc-state 'edited)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
415 1);; signal the error to the caller
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
416 )
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
417 (pop-to-buffer "*vc*")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
418 (error "Couldn't analyze mcvs update result")))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
419 (message "Merging changes into %s...done" file))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
420
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
421 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
422 ;;; History functions
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
423 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
424
|
55815
a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
425 (defun vc-mcvs-print-log (file &optional buffer)
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
426 "Get change log associated with FILE."
|
50952
|
427 (let ((default-directory (vc-mcvs-root file)))
|
|
428 ;; Run the command from the root dir so that `mcvs filt' returns
|
|
429 ;; valid relative names.
|
|
430 (vc-mcvs-command
|
55815
a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
431 buffer
|
50952
|
432 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
|
|
433 file "log")))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
434
|
55815
a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
435 (defun vc-mcvs-diff (file &optional oldvers newvers buffer)
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
436 "Get a difference report using Meta-CVS between two versions of FILE."
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
437 (if (string= (vc-workfile-version file) "0")
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
438 ;; This file is added but not yet committed; there is no master file.
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
439 (if (or oldvers newvers)
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
440 (error "No revisions of %s exist" file)
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
441 ;; We regard this as "changed".
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
442 ;; Diff it against /dev/null.
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
443 ;; Note: this is NOT a "mcvs diff".
|
55815
a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
444 (apply 'vc-do-command (or buffer "*vc-diff*")
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
445 1 "diff" file
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
446 (append (vc-switches nil 'diff) '("/dev/null")))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
447 ;; Even if it's empty, it's locally modified.
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
448 1)
|
50928
|
449 (let* ((async (and (vc-stay-local-p file) (fboundp 'start-process)))
|
50952
|
450 ;; Run the command from the root dir so that `mcvs filt' returns
|
|
451 ;; valid relative names.
|
|
452 (default-directory (vc-mcvs-root file))
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
453 (status
|
55815
a6b86fce5676
(vc-mcvs-print-log, vc-mcvs-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
454 (apply 'vc-mcvs-command (or buffer "*vc-diff*")
|
50901
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
455 (if async 'async 1)
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
456 file "diff"
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
457 (and oldvers (concat "-r" oldvers))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
458 (and newvers (concat "-r" newvers))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
459 (vc-switches 'MCVS 'diff))))
|
d3bb1d77a4b1
(vc-mcvs-register, vc-mcvs-checkin, vc-mcvs-find-version)
Stefan Monnier <monnier@iro.umontreal.ca>
diff
changeset
|
460 (if async 1 status)))) ; async diff, pessimistic assumption.
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
461
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 (defun vc-mcvs-diff-tree (dir &optional rev1 rev2)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
463 "Diff all files at and below DIR."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
464 (with-current-buffer "*vc-diff*"
|
50952
|
465 ;; Run the command from the root dir so that `mcvs filt' returns
|
|
466 ;; valid relative names.
|
|
467 (setq default-directory (vc-mcvs-root dir))
|
|
468 ;; cvs diff: use a single call for the entire tree
|
|
469 (let ((coding-system-for-read (or coding-system-for-read 'undecided)))
|
|
470 (apply 'vc-mcvs-command "*vc-diff*" 1 dir "diff"
|
|
471 (and rev1 (concat "-r" rev1))
|
|
472 (and rev2 (concat "-r" rev2))
|
|
473 (vc-switches 'MCVS 'diff)))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
474
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
475 (defun vc-mcvs-annotate-command (file buffer &optional version)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
476 "Execute \"mcvs annotate\" on FILE, inserting the contents in BUFFER.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
477 Optional arg VERSION is a version to annotate from."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
478 (vc-mcvs-command
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
479 buffer
|
50928
|
480 (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
|
57914
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
481 file "annotate" (if version (concat "-r" version)))
|
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
482 (with-current-buffer buffer
|
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
483 (goto-char (point-min))
|
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
484 (re-search-forward "^[0-9]")
|
4afd8cdfd00e
(vc-mcvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
diff
changeset
|
485 (delete-region (point-min) (1- (point)))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
486
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
487 (defalias 'vc-mcvs-annotate-current-time 'vc-cvs-annotate-current-time)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
488 (defalias 'vc-mcvs-annotate-time 'vc-cvs-annotate-time)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
489
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
490 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
491 ;;; Snapshot system
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
492 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
493
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
494 (defun vc-mcvs-create-snapshot (dir name branchp)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
495 "Assign to DIR's current version a given NAME.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
496 If BRANCHP is non-nil, the name is created as a branch (and the current
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
497 workspace is immediately moved to that new branch)."
|
50952
|
498 (if (not branchp)
|
|
499 (vc-mcvs-command nil 0 dir "tag" "-c" name)
|
|
500 (vc-mcvs-command nil 0 dir "branch" name)
|
|
501 (vc-mcvs-command nil 0 dir "switch" name)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
502
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
503 (defun vc-mcvs-retrieve-snapshot (dir name update)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
504 "Retrieve a snapshot at and below DIR.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
505 NAME is the name of the snapshot; if it is empty, do a `cvs update'.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
506 If UPDATE is non-nil, then update (resynch) any affected buffers."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
507 (with-current-buffer (get-buffer-create "*vc*")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
508 (let ((default-directory dir)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
509 (sticky-tag))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
510 (erase-buffer)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
511 (if (or (not name) (string= name ""))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
512 (vc-mcvs-command t 0 nil "update")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
513 (vc-mcvs-command t 0 nil "update" "-r" name)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
514 (setq sticky-tag name))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
515 (when update
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
516 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
517 (while (not (eobp))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
518 (if (looking-at "\\([CMUP]\\) \\(.*\\)")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
519 (let* ((file (expand-file-name (match-string 2) dir))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
520 (state (match-string 1))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
521 (buffer (find-buffer-visiting file)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 (when buffer
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
523 (cond
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
524 ((or (string= state "U")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
525 (string= state "P"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
526 (vc-file-setprop file 'vc-state 'up-to-date)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
527 (vc-file-setprop file 'vc-workfile-version nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
528 (vc-file-setprop file 'vc-checkout-time
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
529 (nth 5 (file-attributes file))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 ((or (string= state "M")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
531 (string= state "C"))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
532 (vc-file-setprop file 'vc-state 'edited)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 (vc-file-setprop file 'vc-workfile-version nil)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
534 (vc-file-setprop file 'vc-checkout-time 0)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
535 (vc-file-setprop file 'vc-mcvs-sticky-tag sticky-tag)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
536 (vc-resynch-buffer file t t))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
537 (forward-line 1))))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
539
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
540 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
541 ;;; Miscellaneous
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
542 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
543
|
50928
|
544 (defalias 'vc-mcvs-make-version-backups-p 'vc-stay-local-p
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
545 "Return non-nil if version backups should be made for FILE.")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
546 (defalias 'vc-mcvs-check-headers 'vc-cvs-check-headers)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
547
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
548
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
549 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
550 ;;; Internal functions
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
551 ;;;
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
552
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
553 (defun vc-mcvs-command (buffer okstatus file &rest flags)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
554 "A wrapper around `vc-do-command' for use in vc-mcvs.el.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
555 The difference to vc-do-command is that this function always invokes `mcvs',
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
556 and that it passes `vc-mcvs-global-switches' to it before FLAGS."
|
50952
|
557 (let ((args (append '("--error-terminate")
|
50667
|
558 (if (stringp vc-mcvs-global-switches)
|
|
559 (cons vc-mcvs-global-switches flags)
|
50952
|
560 (append vc-mcvs-global-switches flags)))))
|
|
561 (if (not (member (car flags) '("diff" "log" "status")))
|
|
562 ;; No need to filter: do it the easy way.
|
|
563 (apply 'vc-do-command buffer okstatus "mcvs" file args)
|
|
564 ;; We need to filter the output.
|
|
565 ;; The output of the filter uses filenames relative to the root,
|
|
566 ;; so we need to change the default-directory.
|
53639
|
567 ;; (assert (equal default-directory (vc-mcvs-root file)))
|
50952
|
568 (vc-do-command
|
|
569 buffer okstatus "sh" nil "-c"
|
|
570 (concat "mcvs "
|
|
571 (mapconcat
|
|
572 'shell-quote-argument
|
|
573 (append (remq nil args)
|
|
574 (if file (list (file-relative-name file))))
|
|
575 " ")
|
|
576 " | mcvs filt")))))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
577
|
50928
|
578 (defun vc-mcvs-repository-hostname (dirname)
|
|
579 (vc-cvs-repository-hostname (vc-mcvs-root dirname)))
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
580
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
581 (defun vc-mcvs-dir-state-heuristic (dir)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
582 "Find the Meta-CVS state of all files in DIR, using only local information."
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
583 (with-temp-buffer
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
584 (vc-cvs-get-entries dir)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
585 (goto-char (point-min))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
586 (while (not (eobp))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
587 ;; Meta-MCVS-removed files are not taken under VC control.
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
588 (when (looking-at "/\\([^/]*\\)/[^/-]")
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
589 (let ((file (expand-file-name (match-string 1) dir)))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
590 (unless (vc-file-getprop file 'vc-state)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
591 (vc-cvs-parse-entry file t))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
592 (forward-line 1))))
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
593
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
594 (defalias 'vc-mcvs-valid-symbolic-tag-name-p 'vc-cvs-valid-symbolic-tag-name-p)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
595 (defalias 'vc-mcvs-valid-version-number-p 'vc-cvs-valid-version-number-p)
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
596
|
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
597 (provide 'vc-mcvs)
|
52401
|
598
|
57095
|
599 ;; arch-tag: a39c7c1c-5247-429d-88df-dd7187d2e704
|
50646
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
600 ;;; vc-mcvs.el ends here
|