1 ;;; vc-cvs.el --- non-resident support for CVS version-control
3 ;; Copyright (C) 1995,98,99,2000,2001,2002 Free Software Foundation, Inc.
5 ;; Author: FSF (see vc.el for full credits)
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
8 ;; $Id: vc-cvs.el,v 1.59 2003/05/08 20:44:50 monnier Exp $
10 ;; This file is part of GNU Emacs.
12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation; either version 2, or (at your option)
17 ;; GNU Emacs is distributed in the hope that it will be useful,
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 ;; GNU General Public License for more details.
22 ;; You should have received a copy of the GNU General Public License
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
25 ;; Boston, MA 02111-1307, USA.
35 ;;; Customization options
38 (defcustom vc-cvs-global-switches nil
39 "*Global switches to pass to any CVS command."
40 :type
'(choice (const :tag
"None" nil
)
41 (string :tag
"Argument String")
42 (repeat :tag
"Argument List"
48 (defcustom vc-cvs-register-switches nil
49 "*Extra switches for registering a file into CVS.
50 A string or list of strings passed to the checkin program by
52 :type
'(choice (const :tag
"None" nil
)
53 (string :tag
"Argument String")
54 (repeat :tag
"Argument List"
60 (defcustom vc-cvs-diff-switches nil
61 "*A string or list of strings specifying extra switches for cvs diff under VC."
62 :type
'(choice (const :tag
"None" nil
)
63 (string :tag
"Argument String")
64 (repeat :tag
"Argument List"
70 (defcustom vc-cvs-header
(or (cdr (assoc 'CVS vc-header-alist
)) '("\$Id\$"))
71 "*Header keywords to be inserted by `vc-insert-headers'."
73 :type
'(repeat string
)
76 (defcustom vc-cvs-use-edit t
77 "*Non-nil means to use `cvs edit' to \"check out\" a file.
78 This is only meaningful if you don't use the implicit checkout model
79 \(i.e. if you have $CVSREAD set)."
84 (defcustom vc-cvs-stay-local t
85 "*Non-nil means use local operations when possible for remote repositories.
86 This avoids slow queries over the network and instead uses heuristics
87 and past information to determine the current status of a file.
89 The value can also be a regular expression or list of regular
90 expressions to match against the host name of a repository; then VC
91 only stays local for hosts that match it. Alternatively, the value
92 can be a list of regular expressions where the first element is the
93 symbol `except'; then VC always stays local except for hosts matched
94 by these regular expressions."
95 :type
'(choice (const :tag
"Always stay local" t
)
96 (const :tag
"Don't stay local" nil
)
97 (list :format
"\nExamine hostname and %v" :tag
"Examine hostname ..."
98 (set :format
"%v" :inline t
(const :format
"%t" :tag
"don't" except
))
99 (regexp :format
" stay local,\n%t: %v" :tag
"if it matches")
100 (repeat :format
"%v%i\n" :inline t
(regexp :tag
"or"))))
104 (defcustom vc-cvs-sticky-date-format-string
"%c"
105 "*Format string for mode-line display of sticky date.
106 Format is according to `format-time-string'. Only used if
107 `vc-cvs-sticky-tag-display' is t."
112 (defcustom vc-cvs-sticky-tag-display t
113 "*Specify the mode-line display of sticky tags.
114 Value t means default display, nil means no display at all. If the
115 value is a function or macro, it is called with the sticky tag and
116 its' type as parameters, in that order. TYPE can have three different
117 values: `symbolic-name' (TAG is a string), `revision-number' (TAG is a
118 string) and `date' (TAG is a date as returned by `encode-time'). The
119 return value of the function or macro will be displayed as a string.
121 Here's an example that will display the formatted date for sticky
122 dates and the word \"Sticky\" for sticky tag names and revisions.
125 (cond ((eq type 'date) (format-time-string
126 vc-cvs-sticky-date-format-string tag))
127 ((eq type 'revision-number) \"Sticky\")
128 ((eq type 'symbolic-name) \"Sticky\")))
130 Here's an example that will abbreviate to the first character only,
131 any text before the first occurrence of `-' for sticky symbolic tags.
132 If the sticky tag is a revision number, the word \"Sticky\" is
133 displayed. Date and time is displayed for sticky dates.
136 (cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag))
137 ((eq type 'revision-number) \"Sticky\")
138 ((eq type 'symbolic-name)
141 (string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
142 (concat (substring (match-string 1 tag) 0 1) \":\"
143 (substring (match-string 2 tag) 1 nil)))
144 (error tag))))) ; Fall-back to given tag name.
146 See also variable `vc-cvs-sticky-date-format-string'."
147 :type
'(choice boolean function
)
152 ;;; Internal variables
155 (defvar vc-cvs-local-month-numbers
156 '(("Jan" .
1) ("Feb" .
2) ("Mar" .
3) ("Apr" .
4)
157 ("May" .
5) ("Jun" .
6) ("Jul" .
7) ("Aug" .
8)
158 ("Sep" .
9) ("Oct" .
10) ("Nov" .
11) ("Dec" .
12))
159 "Local association list of month numbers.")
163 ;;; State-querying functions
166 ;;;###autoload (defun vc-cvs-registered (f)
167 ;;;###autoload (when (file-readable-p (expand-file-name
168 ;;;###autoload "CVS/Entries" (file-name-directory f)))
169 ;;;###autoload (load "vc-cvs")
170 ;;;###autoload (vc-cvs-registered f)))
172 (defun vc-cvs-registered (file)
173 "Check if FILE is CVS registered."
174 (let ((dirname (or (file-name-directory file
) ""))
175 (basename (file-name-nondirectory file
))
176 ;; make sure that the file name is searched case-sensitively
177 (case-fold-search nil
))
178 (if (file-readable-p (expand-file-name "CVS/Entries" dirname
))
180 (vc-cvs-get-entries dirname
)
181 (goto-char (point-min))
184 ;; CVS-removed files are not taken under VC control.
185 (concat "^/" (regexp-quote basename
) "/[^/-]") nil t
)
187 (vc-cvs-parse-entry file
)
192 (defun vc-cvs-state (file)
193 "CVS-specific version of `vc-state'."
194 (if (vc-cvs-stay-local-p file
)
195 (let ((state (vc-file-getprop file
'vc-state
)))
196 ;; If we should stay local, use the heuristic but only if
197 ;; we don't have a more precise state already available.
198 (if (memq state
'(up-to-date edited
))
199 (vc-cvs-state-heuristic file
)
202 (cd (file-name-directory file
))
203 (vc-cvs-command t
0 file
"status")
204 (vc-cvs-parse-status t
))))
206 (defun vc-cvs-state-heuristic (file)
207 "CVS-specific state heuristic."
208 ;; If the file has not changed since checkout, consider it `up-to-date'.
209 ;; Otherwise consider it `edited'.
210 (let ((checkout-time (vc-file-getprop file
'vc-checkout-time
))
211 (lastmod (nth 5 (file-attributes file
))))
212 (if (equal checkout-time lastmod
)
216 (defun vc-cvs-dir-state (dir)
217 "Find the CVS state of all files in DIR."
218 ;; if DIR is not under CVS control, don't do anything.
219 (when (file-readable-p (expand-file-name "CVS/Entries" dir
))
220 (if (vc-cvs-stay-local-p dir
)
221 (vc-cvs-dir-state-heuristic dir
)
222 (let ((default-directory dir
))
223 ;; Don't specify DIR in this command, the default-directory is
224 ;; enough. Otherwise it might fail with remote repositories.
226 (vc-cvs-command t
0 nil
"status" "-l")
227 (goto-char (point-min))
228 (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t
)
229 (narrow-to-region (match-beginning 0) (match-end 0))
230 (vc-cvs-parse-status)
231 (goto-char (point-max))
234 (defun vc-cvs-workfile-version (file)
235 "CVS-specific version of `vc-workfile-version'."
236 ;; There is no need to consult RCS headers under CVS, because we
237 ;; get the workfile version for free when we recognize that a file
238 ;; is registered in CVS.
239 (vc-cvs-registered file
)
240 (vc-file-getprop file
'vc-workfile-version
))
242 (defun vc-cvs-checkout-model (file)
243 "CVS-specific version of `vc-checkout-model'."
244 (if (or (getenv "CVSREAD")
245 ;; If the file is not writable (despite CVSREAD being
246 ;; undefined), this is probably because the file is being
247 ;; "watched" by other developers.
248 ;; (If vc-mistrust-permissions was t, we actually shouldn't
249 ;; trust this, but there is no other way to learn this from CVS
250 ;; at the moment (version 1.9).)
251 (string-match "r-..-..-." (nth 8 (file-attributes file
))))
255 (defun vc-cvs-mode-line-string (file)
256 "Return string for placement into the modeline for FILE.
257 Compared to the default implementation, this function does two things:
258 Handle the special case of a CVS file that is added but not yet
259 committed and support display of sticky tags."
260 (let ((sticky-tag (vc-file-getprop file
'vc-cvs-sticky-tag
))
261 (string (if (string= (vc-workfile-version file
) "0")
262 ;; A file that is added but not yet committed.
264 (vc-default-mode-line-string 'CVS file
))))
265 (if (zerop (length sticky-tag
))
267 (concat string
"[" sticky-tag
"]"))))
269 (defun vc-cvs-dired-state-info (file)
270 "CVS-specific version of `vc-dired-state-info'."
271 (let ((cvs-state (vc-state file
)))
272 (cond ((eq cvs-state
'edited
)
273 (if (equal (vc-workfile-version file
) "0")
274 "(added)" "(modified)"))
275 ((eq cvs-state
'needs-patch
) "(patch)")
276 ((eq cvs-state
'needs-merge
) "(merge)"))))
280 ;;; State-changing functions
283 (defun vc-cvs-register (file &optional rev comment
)
284 "Register FILE into the CVS version-control system.
285 COMMENT can be used to provide an initial description of FILE.
287 `vc-register-switches' and `vc-cvs-register-switches' are passed to
288 the CVS command (in that order)."
289 (apply 'vc-cvs-command nil
0 file
291 (and comment
(string-match "[^\t\n ]" comment
)
292 (concat "-m" comment
))
293 (vc-switches 'CVS
'register
)))
295 (defun vc-cvs-responsible-p (file)
296 "Return non-nil if CVS thinks it is responsible for FILE."
297 (file-directory-p (expand-file-name "CVS"
298 (if (file-directory-p file
)
300 (file-name-directory file
)))))
302 (defalias 'vc-cvs-could-register
'vc-cvs-responsible-p
303 "Return non-nil if FILE could be registered in CVS.
304 This is only possible if CVS is responsible for FILE's directory.")
306 (defun vc-cvs-checkin (file rev comment
)
307 "CVS-specific version of `vc-backend-checkin'."
308 (unless (or (not rev
) (vc-cvs-valid-version-number-p rev
))
309 (if (not (vc-cvs-valid-symbolic-tag-name-p rev
))
310 (error "%s is not a valid symbolic tag name" rev
)
311 ;; If the input revison is a valid symbolic tag name, we create it
312 ;; as a branch, commit and switch to it.
313 (apply 'vc-cvs-command nil
0 file
"tag" "-b" (list rev
))
314 (apply 'vc-cvs-command nil
0 file
"update" "-r" (list rev
))
315 (vc-file-setprop file
'vc-cvs-sticky-tag rev
)))
316 (let ((status (apply 'vc-cvs-command nil
1 file
317 "ci" (if rev
(concat "-r" rev
))
318 (concat "-m" comment
)
319 (vc-switches 'CVS
'checkin
))))
321 (goto-char (point-min))
322 (when (not (zerop status
))
323 ;; Check checkin problem.
325 ((re-search-forward "Up-to-date check failed" nil t
)
326 (vc-file-setprop file
'vc-state
'needs-merge
)
327 (error (substitute-command-keys
328 (concat "Up-to-date check failed: "
329 "type \\[vc-next-action] to merge in changes"))))
331 (pop-to-buffer (current-buffer))
332 (goto-char (point-min))
333 (shrink-window-if-larger-than-buffer)
334 (error "Check-in failed"))))
335 ;; Update file properties
337 file
'vc-workfile-version
338 (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
339 ;; Forget the checkout model of the file, because we might have
340 ;; guessed wrong when we found the file. After commit, we can
341 ;; tell it from the permissions of the file (see
342 ;; vc-cvs-checkout-model).
343 (vc-file-setprop file
'vc-checkout-model nil
)
345 ;; if this was an explicit check-in (does not include creation of
346 ;; a branch), remove the sticky tag.
347 (if (and rev
(not (vc-cvs-valid-symbolic-tag-name-p rev
)))
348 (vc-cvs-command nil
0 file
"update" "-A"))))
350 (defun vc-cvs-find-version (file rev buffer
)
351 (apply 'vc-cvs-command
353 "-Q" ; suppress diagnostic output
355 (and rev
(not (string= rev
""))
358 (vc-switches 'CVS
'checkout
)))
360 (defun vc-cvs-checkout (file &optional editable rev workfile
)
361 "Retrieve a revision of FILE into a WORKFILE.
362 EDITABLE non-nil means that the file should be writable.
363 REV is the revision to check out into WORKFILE."
364 (let ((filename (or workfile file
))
365 (file-buffer (get-file-buffer file
))
367 (message "Checking out %s..." filename
)
369 ;; Change buffers to get local value of vc-checkout-switches.
370 (if file-buffer
(set-buffer file-buffer
))
371 (setq switches
(vc-switches 'CVS
'checkout
))
372 ;; Save this buffer's default-directory
373 ;; and use save-excursion to make sure it is restored
374 ;; in the same buffer it was saved in.
375 (let ((default-directory default-directory
))
377 ;; Adjust the default-directory so that the check-out creates
378 ;; the file in the right place.
379 (setq default-directory
(file-name-directory filename
))
382 (backup-name (if (string= file workfile
)
383 (car (find-backup-file-name filename
)))))
385 (copy-file filename backup-name
386 'ok-if-already-exists
'keep-date
)
387 (unless (file-writable-p filename
)
388 (set-file-modes filename
389 (logior (file-modes filename
) 128))))
392 (let ((coding-system-for-read 'no-conversion
)
393 (coding-system-for-write 'no-conversion
))
394 (with-temp-file filename
395 (apply 'vc-cvs-command
396 (current-buffer) 0 file
397 "-Q" ; suppress diagnostic output
400 (not (string= rev
""))
407 (rename-file backup-name filename
408 'ok-if-already-exists
)
409 (if (file-exists-p filename
)
410 (delete-file filename
)))
412 (not vc-make-backup-files
)
413 (delete-file backup-name
)))))
414 (if (and (file-exists-p file
) (not rev
))
415 ;; If no revision was specified, just make the file writable
416 ;; if necessary (using `cvs-edit' if requested).
417 (and editable
(not (eq (vc-cvs-checkout-model file
) 'implicit
))
419 (vc-cvs-command nil
0 file
"edit")
420 (set-file-modes file
(logior (file-modes file
) 128))
421 (if file-buffer
(toggle-read-only -
1))))
422 ;; Check out a particular version (or recreate the file).
423 (vc-file-setprop file
'vc-workfile-version nil
)
424 (apply 'vc-cvs-command nil
0 file
426 (or (not (file-exists-p file
))
427 (not (eq (vc-cvs-checkout-model file
)
431 ;; default for verbose checkout: clear the sticky tag so
432 ;; that the actual update will get the head of the trunk
433 (if (or (not rev
) (eq rev t
) (string= rev
""))
438 (message "Checking out %s...done" filename
)))))
440 (defun vc-cvs-delete-file (file)
441 (vc-cvs-command nil
0 file
"remove" "-f"))
443 (defun vc-cvs-rename-file (old new
)
444 ;; CVS doesn't know how to move files, so we just remove&add.
446 (add-name-to-file old new
)
447 (error (rename-file old new
)))
448 (vc-cvs-delete-file old
)
449 (with-current-buffer (find-file-noselect new
)
452 (defun vc-cvs-revert (file &optional contents-done
)
453 "Revert FILE to the version it was based on."
454 (unless contents-done
455 ;; Check out via standard output (caused by the final argument
456 ;; FILE below), so that no sticky tag is set.
457 (vc-cvs-checkout file nil
(vc-workfile-version file
) file
))
458 (unless (eq (vc-checkout-model file
) 'implicit
)
460 (vc-cvs-command nil
0 file
"unedit")
461 ;; Make the file read-only by switching off all w-bits
462 (set-file-modes file
(logand (file-modes file
) 3950)))))
464 (defun vc-cvs-merge (file first-version
&optional second-version
)
465 "Merge changes into current working copy of FILE.
466 The changes are between FIRST-VERSION and SECOND-VERSION."
467 (vc-cvs-command nil
0 file
469 (concat "-j" first-version
)
470 (concat "-j" second-version
))
471 (vc-file-setprop file
'vc-state
'edited
)
472 (with-current-buffer (get-buffer "*vc*")
473 (goto-char (point-min))
474 (if (re-search-forward "conflicts during merge" nil t
)
476 0))) ; signal success
478 (defun vc-cvs-merge-news (file)
479 "Merge in any new changes made to FILE."
480 (message "Merging changes into %s..." file
)
481 ;; (vc-file-setprop file 'vc-workfile-version nil)
482 (vc-file-setprop file
'vc-checkout-time
0)
483 (vc-cvs-command nil
0 file
"update")
484 ;; Analyze the merge result reported by CVS, and set
485 ;; file properties accordingly.
486 (with-current-buffer (get-buffer "*vc*")
487 (goto-char (point-min))
488 ;; get new workfile version
489 (if (re-search-forward
490 "^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t
)
491 (vc-file-setprop file
'vc-workfile-version
(match-string 1))
492 (vc-file-setprop file
'vc-workfile-version nil
))
495 (if (eq (buffer-size) 0)
496 0 ;; there were no news; indicate success
497 (if (re-search-forward
498 (concat "^\\([CMUP] \\)?"
499 (regexp-quote (file-name-nondirectory file
))
500 "\\( already contains the differences between \\)?")
503 ;; Merge successful, we are in sync with repository now
504 ((or (match-string 2)
505 (string= (match-string 1) "U ")
506 (string= (match-string 1) "P "))
507 (vc-file-setprop file
'vc-state
'up-to-date
)
508 (vc-file-setprop file
'vc-checkout-time
509 (nth 5 (file-attributes file
)))
510 0);; indicate success to the caller
511 ;; Merge successful, but our own changes are still in the file
512 ((string= (match-string 1) "M ")
513 (vc-file-setprop file
'vc-state
'edited
)
514 0);; indicate success to the caller
515 ;; Conflicts detected!
517 (vc-file-setprop file
'vc-state
'edited
)
518 1);; signal the error to the caller
520 (pop-to-buffer "*vc*")
521 (error "Couldn't analyze cvs update result")))
522 (message "Merging changes into %s...done" file
))))
526 ;;; History functions
529 (defun vc-cvs-print-log (file)
530 "Get change log associated with FILE."
533 (if (and (vc-cvs-stay-local-p file
) (fboundp 'start-process
)) 'async
0)
536 (defun vc-cvs-diff (file &optional oldvers newvers
)
537 "Get a difference report using CVS between two versions of FILE."
538 (if (string= (vc-workfile-version file
) "0")
539 ;; This file is added but not yet committed; there is no master file.
540 (if (or oldvers newvers
)
541 (error "No revisions of %s exist" file
)
542 ;; We regard this as "changed".
543 ;; Diff it against /dev/null.
544 ;; Note: this is NOT a "cvs diff".
545 (apply 'vc-do-command
"*vc-diff*"
547 (append (vc-switches nil
'diff
) '("/dev/null")))
548 ;; Even if it's empty, it's locally modified.
550 (let* ((async (and (vc-cvs-stay-local-p file
) (fboundp 'start-process
)))
551 (status (apply 'vc-cvs-command
"*vc-diff*"
554 (and oldvers
(concat "-r" oldvers
))
555 (and newvers
(concat "-r" newvers
))
556 (vc-switches 'CVS
'diff
))))
557 (if async
1 status
)))) ; async diff, pessimistic assumption
559 (defun vc-cvs-diff-tree (dir &optional rev1 rev2
)
560 "Diff all files at and below DIR."
561 (with-current-buffer "*vc-diff*"
562 (setq default-directory dir
)
563 (if (vc-cvs-stay-local-p dir
)
564 ;; local diff: do it filewise, and only for files that are modified
569 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f
)))
570 ;; possible optimization: fetch the state of all files
571 ;; in the tree via vc-cvs-dir-state-heuristic
572 (unless (vc-up-to-date-p ',f
)
573 (message "Looking at %s" ',f
)
574 (vc-diff-internal ',f
',rev1
',rev2
))))))
575 ;; cvs diff: use a single call for the entire tree
576 (let ((coding-system-for-read
577 (or coding-system-for-read
'undecided
)))
578 (apply 'vc-cvs-command
"*vc-diff*" 1 nil
"diff"
579 (and rev1
(concat "-r" rev1
))
580 (and rev2
(concat "-r" rev2
))
581 (vc-switches 'CVS
'diff
))))))
583 (defun vc-cvs-annotate-command (file buffer
&optional version
)
584 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
585 Optional arg VERSION is a version to annotate from."
586 (vc-cvs-command buffer
0 file
"annotate" (if version
(concat "-r" version
))))
588 (defun vc-cvs-annotate-current-time ()
589 "Return the current time, based at midnight of the current day, and
590 encoded as fractional days."
591 (vc-annotate-convert-time
592 (apply 'encode-time
0 0 0 (nthcdr 3 (decode-time (current-time))))))
594 (defun vc-cvs-annotate-time ()
595 "Return the time of the next annotation (as fraction of days)
596 systime, or nil if there is none."
598 "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): "))
599 (if (looking-at time-stamp
)
601 (let* ((day (string-to-number (match-string 1)))
602 (month (cdr (assoc (match-string 2)
603 vc-cvs-local-month-numbers
)))
604 (year-tmp (string-to-number (match-string 3)))
605 ;; Years 0..68 are 2000..2068.
606 ;; Years 69..99 are 1969..1999.
607 (year (+ (cond ((> 69 year-tmp
) 2000)
608 ((> 100 year-tmp
) 1900)
611 (goto-char (match-end 0)) ; Position at end makes for nicer overlay result
612 (vc-annotate-convert-time (encode-time 0 0 0 day month year
))))
613 ;; If we did not look directly at an annotation, there might be
614 ;; some further down. This is the case if we are positioned at
615 ;; the very top of the buffer, for instance.
616 (if (re-search-forward time-stamp nil t
)
618 (beginning-of-line nil
)
619 (vc-cvs-annotate-time))))))
625 (defun vc-cvs-create-snapshot (dir name branchp
)
626 "Assign to DIR's current version a given NAME.
627 If BRANCHP is non-nil, the name is created as a branch (and the current
628 workspace is immediately moved to that new branch)."
629 (vc-cvs-command nil
0 dir
"tag" "-c" (if branchp
"-b") name
)
630 (when branchp
(vc-cvs-command nil
0 dir
"update" "-r" name
)))
632 (defun vc-cvs-retrieve-snapshot (dir name update
)
633 "Retrieve a snapshot at and below DIR.
634 NAME is the name of the snapshot; if it is empty, do a `cvs update'.
635 If UPDATE is non-nil, then update (resynch) any affected buffers."
636 (with-current-buffer (get-buffer-create "*vc*")
637 (let ((default-directory dir
)
640 (if (or (not name
) (string= name
""))
641 (vc-cvs-command t
0 nil
"update")
642 (vc-cvs-command t
0 nil
"update" "-r" name
)
643 (setq sticky-tag name
))
645 (goto-char (point-min))
647 (if (looking-at "\\([CMUP]\\) \\(.*\\)")
648 (let* ((file (expand-file-name (match-string 2) dir
))
649 (state (match-string 1))
650 (buffer (find-buffer-visiting file
)))
653 ((or (string= state
"U")
655 (vc-file-setprop file
'vc-state
'up-to-date
)
656 (vc-file-setprop file
'vc-workfile-version nil
)
657 (vc-file-setprop file
'vc-checkout-time
658 (nth 5 (file-attributes file
))))
659 ((or (string= state
"M")
661 (vc-file-setprop file
'vc-state
'edited
)
662 (vc-file-setprop file
'vc-workfile-version nil
)
663 (vc-file-setprop file
'vc-checkout-time
0)))
664 (vc-file-setprop file
'vc-cvs-sticky-tag sticky-tag
)
665 (vc-resynch-buffer file t t
))))
666 (forward-line 1))))))
673 (defalias 'vc-cvs-make-version-backups-p
'vc-cvs-stay-local-p
674 "Return non-nil if version backups should be made for FILE.")
676 (defun vc-cvs-check-headers ()
677 "Check if the current file has any headers in it."
679 (goto-char (point-min))
680 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
681 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t
)))
685 ;;; Internal functions
688 (defun vc-cvs-command (buffer okstatus file
&rest flags
)
689 "A wrapper around `vc-do-command' for use in vc-cvs.el.
690 The difference to vc-do-command is that this function always invokes `cvs',
691 and that it passes `vc-cvs-global-switches' to it before FLAGS."
692 (apply 'vc-do-command buffer okstatus
"cvs" file
693 (if (stringp vc-cvs-global-switches
)
694 (cons vc-cvs-global-switches flags
)
695 (append vc-cvs-global-switches
698 (defun vc-cvs-stay-local-p (file)
699 "Return non-nil if VC should stay local when handling FILE.
700 See `vc-cvs-stay-local'."
701 (when vc-cvs-stay-local
702 (let* ((dirname (if (file-directory-p file
)
703 (directory-file-name file
)
704 (file-name-directory file
)))
706 (or (vc-file-getprop dirname
'vc-cvs-stay-local-p
)
708 dirname
'vc-cvs-stay-local-p
709 (let ((rootname (expand-file-name "CVS/Root" dirname
)))
710 (when (file-readable-p rootname
)
712 (let ((coding-system-for-read
713 (or file-name-coding-system
714 default-file-name-coding-system
)))
715 (vc-insert-file rootname
))
716 (goto-char (point-min))
717 (let* ((cvs-root-members
719 (buffer-substring (point)
720 (line-end-position))))
721 (hostname (nth 2 cvs-root-members
)))
724 (let* ((stay-local t
)
727 ;; vc-cvs-stay-local: rx
728 ((stringp vc-cvs-stay-local
)
730 ;; vc-cvs-stay-local: '( [except] rx ... )
731 ((consp vc-cvs-stay-local
)
734 (if (not (eq (car vc-cvs-stay-local
)
737 (setq stay-local nil
)
738 (cdr vc-cvs-stay-local
))
742 (if (not (string-match rx hostname
))
743 (setq stay-local
(not stay-local
)))
747 (if (eq prop
'yes
) t nil
))))
749 (defun vc-cvs-parse-root (root)
750 "Split CVS ROOT specification string into a list of fields.
751 A CVS root specification of the form
752 [:METHOD:][[USER@]HOSTNAME:]/path/to/repository
753 is converted to a normalized record with the following structure:
754 \(METHOD USER HOSTNAME CVS-ROOT).
755 The default METHOD for a CVS root of the form
758 The default METHOD for a CVS root of the form
759 [USER@]HOSTNAME:/path/to/repository
761 For an empty string, nil is returned (illegal CVS root)."
762 ;; Split CVS root into colon separated fields (0-4).
763 ;; The `x:' makes sure, that leading colons are not lost;
764 ;; `HOST:/PATH' is then different from `:METHOD:/PATH'.
765 (let* ((root-list (cdr (split-string (concat "x:" root
) ":")))
766 (len (length root-list
))
767 ;; All syntactic varieties will get a proper METHOD.
774 ;; Simple PATH => method `local'
776 (cons nil root-list
)))
778 ;; [USER@]HOST:PATH => method `ext'
779 (and (not (equal (car root-list
) ""))
780 (cons "ext" root-list
)))
783 (cons (cadr root-list
)
784 (cons nil
(cddr root-list
))))
786 ;; :METHOD:[USER@]HOST:PATH
789 (let ((method (car root-list
))
790 (uhost (or (cadr root-list
) ""))
791 (root (nth 2 root-list
))
794 (if (string-match "\\(.*\\)@\\(.*\\)" uhost
)
795 (setq user
(match-string 1 uhost
)
796 host
(match-string 2 uhost
))
801 ;; Fix windows style CVS root `:local:C:\\project\\cvs\\some\\dir'
803 (equal method
"local")
804 (setq root
(concat host
":" root
) host
))
805 ;; Normalize CVS root record
806 (list method user host root
)))))
808 (defun vc-cvs-parse-status (&optional full
)
809 "Parse output of \"cvs status\" command in the current buffer.
810 Set file properties accordingly. Unless FULL is t, parse only
811 essential information."
813 (goto-char (point-min))
814 (if (re-search-forward "^File: " nil t
)
816 ((looking-at "no file") nil
)
817 ((re-search-forward "\\=\\([^ \t]+\\)" nil t
)
818 (setq file
(expand-file-name (match-string 1)))
819 (vc-file-setprop file
'vc-backend
'CVS
)
820 (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t
))
821 (setq status
"Unknown")
822 (setq status
(match-string 1)))
825 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
826 \[\t ]+\\([0-9.]+\\)"
828 (vc-file-setprop file
'vc-latest-version
(match-string 2)))
832 ((string-match "Up-to-date" status
)
833 (vc-file-setprop file
'vc-checkout-time
834 (nth 5 (file-attributes file
)))
836 ((string-match "Locally Modified" status
) 'edited
)
837 ((string-match "Needs Merge" status
) 'needs-merge
)
838 ((string-match "Needs \\(Checkout\\|Patch\\)" status
) 'needs-patch
)
841 (defun vc-cvs-dir-state-heuristic (dir)
842 "Find the CVS state of all files in DIR, using only local information."
844 (vc-cvs-get-entries dir
)
845 (goto-char (point-min))
847 ;; CVS-removed files are not taken under VC control.
848 (when (looking-at "/\\([^/]*\\)/[^/-]")
849 (let ((file (expand-file-name (match-string 1) dir
)))
850 (unless (vc-file-getprop file
'vc-state
)
851 (vc-cvs-parse-entry file t
))))
854 (defun vc-cvs-get-entries (dir)
855 "Insert the CVS/Entries file from below DIR into the current buffer.
856 This function ensures that the correct coding system is used for that,
857 which may not be the one that is used for the files' contents.
858 CVS/Entries should only be accessed through this function."
859 (let ((coding-system-for-read (or file-name-coding-system
860 default-file-name-coding-system
)))
861 (vc-insert-file (expand-file-name "CVS/Entries" dir
))))
863 (defun vc-cvs-valid-symbolic-tag-name-p (tag)
864 "Return non-nil if TAG is a valid symbolic tag name."
865 ;; According to the CVS manual, a valid symbolic tag must start with
866 ;; an uppercase or lowercase letter and can contain uppercase and
867 ;; lowercase letters, digits, `-', and `_'.
868 (and (string-match "^[a-zA-Z]" tag
)
869 (not (string-match "[^a-z0-9A-Z-_]" tag
))))
871 (defun vc-cvs-valid-version-number-p (tag)
872 "Return non-nil if TAG is a valid version number."
873 (and (string-match "^[0-9]" tag
)
874 (not (string-match "[^0-9.]" tag
))))
876 (defun vc-cvs-parse-sticky-tag (match-type match-tag
)
877 "Parse and return the sticky tag as a string.
878 `match-data' is protected."
879 (let ((data (match-data))
881 (type (cond ((string= match-type
"D") 'date
)
882 ((string= match-type
"T")
883 (if (vc-cvs-valid-symbolic-tag-name-p match-tag
)
890 ;; Sticky Date tag. Convert to a proper date value (`encode-time')
893 "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
895 (let* ((year-tmp (string-to-number (match-string 1 match-tag
)))
896 (month (string-to-number (match-string 2 match-tag
)))
897 (day (string-to-number (match-string 3 match-tag
)))
898 (hour (string-to-number (match-string 4 match-tag
)))
899 (min (string-to-number (match-string 5 match-tag
)))
900 (sec (string-to-number (match-string 6 match-tag
)))
901 ;; Years 0..68 are 2000..2068.
902 ;; Years 69..99 are 1969..1999.
903 (year (+ (cond ((> 69 year-tmp
) 2000)
904 ((> 100 year-tmp
) 1900)
907 (setq tag
(encode-time sec min hour day month year
))))
908 ;; Sticky Tag name or revision number
909 ((eq type
'symbolic-name
) (setq tag match-tag
))
910 ((eq type
'revision-number
) (setq tag match-tag
))
911 ;; Default is no sticky tag at all
913 (cond ((eq vc-cvs-sticky-tag-display nil
) nil
)
914 ((eq vc-cvs-sticky-tag-display t
)
915 (cond ((eq type
'date
) (format-time-string
916 vc-cvs-sticky-date-format-string
918 ((eq type
'symbolic-name
) tag
)
919 ((eq type
'revision-number
) tag
)
921 ((functionp vc-cvs-sticky-tag-display
)
922 (funcall vc-cvs-sticky-tag-display tag type
))
925 (set-match-data data
))))
927 (defun vc-cvs-parse-entry (file &optional set-state
)
928 "Parse a line from CVS/Entries.
929 Compare modification time to that of the FILE, set file properties
930 accordingly. However, `vc-state' is set only if optional arg SET-STATE
933 ;; entry for a "locally added" file (not yet committed)
934 ((looking-at "/[^/]+/0/")
935 (vc-file-setprop file
'vc-checkout-time
0)
936 (vc-file-setprop file
'vc-workfile-version
"0")
937 (if set-state
(vc-file-setprop file
'vc-state
'edited
)))
943 ;; timestamp and optional conflict field
948 "\\(.\\|\\)" ;Sticky tag type (date or tag name, could be empty)
949 "\\(.*\\)")) ;Sticky tag
950 (vc-file-setprop file
'vc-workfile-version
(match-string 1))
951 (vc-file-setprop file
'vc-cvs-sticky-tag
952 (vc-cvs-parse-sticky-tag (match-string 4) (match-string 5)))
953 ;; compare checkout time and modification time
954 (let* ((mtime (nth 5 (file-attributes file
)))
955 (system-time-locale "C")
956 (mtstr (format-time-string "%c" mtime
'utc
)))
957 ;; Solaris sometimes uses "Wed Sep 05" instead of "Wed Sep 5".
958 ;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference.
959 (if (= (aref mtstr
8) ?
0)
960 (setq mtstr
(concat (substring mtstr
0 8) " " (substring mtstr
9))))
961 (cond ((equal mtstr
(match-string 2))
962 (vc-file-setprop file
'vc-checkout-time mtime
)
963 (if set-state
(vc-file-setprop file
'vc-state
'up-to-date
)))
965 (vc-file-setprop file
'vc-checkout-time
0)
966 (if set-state
(vc-file-setprop file
'vc-state
'edited
))))))))
970 ;;; vc-cvs.el ends here