1 ;;; vc-cvs.el --- non-resident support for CVS version-control -*- lexical-binding: t -*-
3 ;; Copyright (C) 1995, 1998-2014 Free Software Foundation, Inc.
5 ;; Author: FSF (see vc.el for full credits)
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
9 ;; This file is part of GNU Emacs.
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
12 ;; it under the terms of the GNU General Public License as published by
13 ;; the Free Software Foundation, either version 3 of the License, or
14 ;; (at your option) any later version.
16 ;; GNU Emacs is distributed in the hope that it will be useful,
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19 ;; GNU General Public License for more details.
21 ;; You should have received a copy of the GNU General Public License
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
28 (eval-when-compile (require 'vc
))
30 ;; Clear up the cache to force vc-call to check again and discover
31 ;; new functions when we reload this file.
32 (put 'CVS
'vc-functions nil
)
34 ;;; Properties of the backend.
36 (defun vc-cvs-revision-granularity () 'file
)
38 (defun vc-cvs-checkout-model (files)
39 "CVS-specific version of `vc-checkout-model'."
40 (if (getenv "CVSREAD")
42 (let* ((file (if (consp files
) (car files
) files
))
43 (attrib (file-attributes file
)))
44 (or (vc-file-getprop file
'vc-checkout-model
)
46 file
'vc-checkout-model
47 (if (and attrib
;; don't check further if FILE doesn't exist
48 ;; If the file is not writable (despite CVSREAD being
49 ;; undefined), this is probably because the file is being
50 ;; "watched" by other developers.
51 ;; (If vc-mistrust-permissions was t, we actually shouldn't
52 ;; trust this, but there is no other way to learn this from
53 ;; CVS at the moment (version 1.9).)
54 (string-match "r-..-..-." (nth 8 attrib
)))
59 ;;; Customization options
67 (defcustom vc-cvs-global-switches nil
68 "Global switches to pass to any CVS command."
69 :type
'(choice (const :tag
"None" nil
)
70 (string :tag
"Argument String")
71 (repeat :tag
"Argument List"
77 (defcustom vc-cvs-register-switches nil
78 "Switches for registering a file into CVS.
79 A string or list of strings passed to the checkin program by
80 \\[vc-register]. If nil, use the value of `vc-register-switches'.
81 If t, use no switches."
82 :type
'(choice (const :tag
"Unspecified" nil
)
84 (string :tag
"Argument String")
85 (repeat :tag
"Argument List" :value
("") string
))
89 (defcustom vc-cvs-diff-switches nil
90 "String or list of strings specifying switches for CVS diff under VC.
91 If nil, use the value of `vc-diff-switches'. If t, use no switches."
92 :type
'(choice (const :tag
"Unspecified" nil
)
94 (string :tag
"Argument String")
95 (repeat :tag
"Argument List" :value
("") string
))
99 (defcustom vc-cvs-header
'("\$Id\$")
100 "Header keywords to be inserted by `vc-insert-headers'."
101 :version
"24.1" ; no longer consult the obsolete vc-header-alist
102 :type
'(repeat string
)
105 (defcustom vc-cvs-use-edit t
106 "Non-nil means to use `cvs edit' to \"check out\" a file.
107 This is only meaningful if you don't use the implicit checkout model
108 \(i.e. if you have $CVSREAD set)."
113 (defcustom vc-cvs-stay-local
'only-file
114 "Non-nil means use local operations when possible for remote repositories.
115 This avoids slow queries over the network and instead uses heuristics
116 and past information to determine the current status of a file.
118 If value is the symbol `only-file', `vc-dir' will connect to the
119 server, but heuristics will be used to determine the status for
120 all other VC operations.
122 The value can also be a regular expression or list of regular
123 expressions to match against the host name of a repository; then VC
124 only stays local for hosts that match it. Alternatively, the value
125 can be a list of regular expressions where the first element is the
126 symbol `except'; then VC always stays local except for hosts matched
127 by these regular expressions."
128 :type
'(choice (const :tag
"Always stay local" t
)
129 (const :tag
"Only for file operations" only-file
)
130 (const :tag
"Don't stay local" nil
)
131 (list :format
"\nExamine hostname and %v"
132 :tag
"Examine hostname ..."
133 (set :format
"%v" :inline t
134 (const :format
"%t" :tag
"don't" except
))
135 (regexp :format
" stay local,\n%t: %v"
136 :tag
"if it matches")
137 (repeat :format
"%v%i\n" :inline t
(regexp :tag
"or"))))
141 (defcustom vc-cvs-sticky-date-format-string
"%c"
142 "Format string for mode-line display of sticky date.
143 Format is according to `format-time-string'. Only used if
144 `vc-cvs-sticky-tag-display' is t."
149 (defcustom vc-cvs-sticky-tag-display t
150 "Specify the mode-line display of sticky tags.
151 Value t means default display, nil means no display at all. If the
152 value is a function or macro, it is called with the sticky tag and
153 its' type as parameters, in that order. TYPE can have three different
154 values: `symbolic-name' (TAG is a string), `revision-number' (TAG is a
155 string) and `date' (TAG is a date as returned by `encode-time'). The
156 return value of the function or macro will be displayed as a string.
158 Here's an example that will display the formatted date for sticky
159 dates and the word \"Sticky\" for sticky tag names and revisions.
162 (cond ((eq type 'date) (format-time-string
163 vc-cvs-sticky-date-format-string tag))
164 ((eq type 'revision-number) \"Sticky\")
165 ((eq type 'symbolic-name) \"Sticky\")))
167 Here's an example that will abbreviate to the first character only,
168 any text before the first occurrence of `-' for sticky symbolic tags.
169 If the sticky tag is a revision number, the word \"Sticky\" is
170 displayed. Date and time is displayed for sticky dates.
173 (cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag))
174 ((eq type 'revision-number) \"Sticky\")
175 ((eq type 'symbolic-name)
178 (string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
179 (concat (substring (match-string 1 tag) 0 1) \":\"
180 (substring (match-string 2 tag) 1 nil)))
181 (error tag))))) ; Fall-back to given tag name.
183 See also variable `vc-cvs-sticky-date-format-string'."
184 :type
'(choice boolean function
)
189 ;;; Internal variables
194 ;;; State-querying functions
197 ;;;###autoload(defun vc-cvs-registered (f)
198 ;;;###autoload "Return non-nil if file F is registered with CVS."
199 ;;;###autoload (when (file-readable-p (expand-file-name
200 ;;;###autoload "CVS/Entries" (file-name-directory f)))
201 ;;;###autoload (load "vc-cvs" nil t)
202 ;;;###autoload (vc-cvs-registered f)))
204 (defun vc-cvs-registered (file)
205 "Check if FILE is CVS registered."
206 (let ((dirname (or (file-name-directory file
) ""))
207 (basename (file-name-nondirectory file
))
208 ;; make sure that the file name is searched case-sensitively
209 (case-fold-search nil
))
210 (if (file-readable-p (expand-file-name "CVS/Entries" dirname
))
211 (or (string= basename
"")
213 (vc-cvs-get-entries dirname
)
214 (goto-char (point-min))
215 (cond ((re-search-forward
216 (concat "^/" (regexp-quote basename
) "/[^/]") nil t
)
218 (vc-cvs-parse-entry file
)
223 (defun vc-cvs-state (file)
224 "CVS-specific version of `vc-state'."
225 (if (vc-stay-local-p file
'CVS
)
226 (let ((state (vc-file-getprop file
'vc-state
)))
227 ;; If we should stay local, use the heuristic but only if
228 ;; we don't have a more precise state already available.
229 (if (memq state
'(up-to-date edited nil
))
230 (vc-cvs-state-heuristic file
)
233 (cd (file-name-directory file
))
234 (let (process-file-side-effects)
235 (vc-cvs-command t
0 file
"status"))
236 (vc-cvs-parse-status t
))))
238 (defun vc-cvs-state-heuristic (file)
239 "CVS-specific state heuristic."
240 ;; If the file has not changed since checkout, consider it `up-to-date'.
241 ;; Otherwise consider it `edited'.
242 (let ((checkout-time (vc-file-getprop file
'vc-checkout-time
))
243 (lastmod (nth 5 (file-attributes file
))))
245 ((equal checkout-time lastmod
) 'up-to-date
)
246 ((string= (vc-working-revision file
) "0") 'added
)
247 ((null checkout-time
) 'unregistered
)
250 (defun vc-cvs-working-revision (file)
251 "CVS-specific version of `vc-working-revision'."
252 ;; There is no need to consult RCS headers under CVS, because we
253 ;; get the workfile version for free when we recognize that a file
254 ;; is registered in CVS.
255 (vc-cvs-registered file
)
256 (vc-file-getprop file
'vc-working-revision
))
258 (defun vc-cvs-mode-line-string (file)
259 "Return a string for `vc-mode-line' to put in the mode line for FILE.
260 Compared to the default implementation, this function does two things:
261 Handle the special case of a CVS file that is added but not yet
262 committed and support display of sticky tags."
263 (let* ((sticky-tag (vc-file-getprop file
'vc-cvs-sticky-tag
))
266 (let ((def-ml (vc-default-mode-line-string 'CVS file
)))
268 (get-text-property 0 'help-echo def-ml
))
271 (if (zerop (length sticky-tag
))
273 (setq help-echo
(format "%s on the '%s' branch"
274 help-echo sticky-tag
))
275 (concat string
"[" sticky-tag
"]"))
276 'help-echo help-echo
)))
280 ;;; State-changing functions
283 (autoload 'vc-switches
"vc")
285 (defun vc-cvs-register (files &optional _rev comment
)
286 "Register FILES into the CVS version-control system.
287 COMMENT can be used to provide an initial description of FILES.
288 Passes either `vc-cvs-register-switches' or `vc-register-switches'
290 ;; Register the directories if needed.
293 (and (not (vc-cvs-responsible-p file
))
294 (vc-cvs-could-register file
)
295 (push (directory-file-name (file-name-directory file
)) dirs
)))
296 (if dirs
(vc-cvs-register dirs
)))
297 (apply 'vc-cvs-command nil
0 files
299 (and comment
(string-match "[^\t\n ]" comment
)
300 (concat "-m" comment
))
301 (vc-switches 'CVS
'register
)))
303 (defun vc-cvs-responsible-p (file)
304 "Return non-nil if CVS thinks it is responsible for FILE."
305 (file-directory-p (expand-file-name "CVS"
306 (if (file-directory-p file
)
308 (file-name-directory file
)))))
310 (defun vc-cvs-could-register (file)
311 "Return non-nil if FILE could be registered in CVS.
312 This is only possible if CVS is managing FILE's directory or one of
315 (while (and (stringp dir
)
316 (not (equal dir
(setq dir
(file-name-directory dir
))))
318 (setq dir
(if (file-exists-p
319 (expand-file-name "CVS/Entries" dir
))
321 (directory-file-name dir
))))
324 (defun vc-cvs-checkin (files rev comment
)
325 "CVS-specific version of `vc-backend-checkin'."
326 (unless (or (not rev
) (vc-cvs-valid-revision-number-p rev
))
327 (if (not (vc-cvs-valid-symbolic-tag-name-p rev
))
328 (error "%s is not a valid symbolic tag name" rev
)
329 ;; If the input revision is a valid symbolic tag name, we create it
330 ;; as a branch, commit and switch to it.
331 (apply 'vc-cvs-command nil
0 files
"tag" "-b" (list rev
))
332 (apply 'vc-cvs-command nil
0 files
"update" "-r" (list rev
))
333 (mapc (lambda (file) (vc-file-setprop file
'vc-cvs-sticky-tag rev
))
335 (let ((status (apply 'vc-cvs-command nil
1 files
336 "ci" (if rev
(concat "-r" rev
))
337 (concat "-m" comment
)
338 (vc-switches 'CVS
'checkin
))))
340 (goto-char (point-min))
341 (when (not (zerop status
))
342 ;; Check checkin problem.
344 ((re-search-forward "Up-to-date check failed" nil t
)
345 (mapc (lambda (file) (vc-file-setprop file
'vc-state
'needs-merge
))
347 (error "%s" (substitute-command-keys
348 (concat "Up-to-date check failed: "
349 "type \\[vc-next-action] to merge in changes"))))
351 (pop-to-buffer (current-buffer))
352 (goto-char (point-min))
353 (shrink-window-if-larger-than-buffer)
354 (error "Check-in failed"))))
355 ;; Single-file commit? Then update the revision by parsing the buffer.
356 ;; Otherwise we can't necessarily tell what goes with what; clear
357 ;; its properties so they have to be refetched.
358 (if (= (length files
) 1)
360 (car files
) 'vc-working-revision
361 (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
362 (mapc 'vc-file-clearprops files
))
363 ;; Anyway, forget the checkout model of the file, because we might have
364 ;; guessed wrong when we found the file. After commit, we can
365 ;; tell it from the permissions of the file (see
366 ;; vc-cvs-checkout-model).
367 (mapc (lambda (file) (vc-file-setprop file
'vc-checkout-model nil
))
370 ;; if this was an explicit check-in (does not include creation of
371 ;; a branch), remove the sticky tag.
372 (if (and rev
(not (vc-cvs-valid-symbolic-tag-name-p rev
)))
373 (vc-cvs-command nil
0 files
"update" "-A"))))
375 (defun vc-cvs-find-revision (file rev buffer
)
376 (apply 'vc-cvs-command
378 "-Q" ; suppress diagnostic output
380 (and rev
(not (string= rev
""))
383 (vc-switches 'CVS
'checkout
)))
385 (defun vc-cvs-checkout (file &optional editable rev
)
386 "Checkout a revision of FILE into the working area.
387 EDITABLE non-nil means that the file should be writable.
388 REV is the revision to check out."
389 (message "Checking out %s..." file
)
390 ;; Change buffers to get local value of vc-checkout-switches.
391 (with-current-buffer (or (get-file-buffer file
) (current-buffer))
392 (if (and (file-exists-p file
) (not rev
))
393 ;; If no revision was specified, just make the file writable
394 ;; if necessary (using `cvs-edit' if requested).
395 (and editable
(not (eq (vc-cvs-checkout-model (list file
)) 'implicit
))
397 (vc-cvs-command nil
0 file
"edit")
398 (set-file-modes file
(logior (file-modes file
) 128))
399 (if (equal file buffer-file-name
) (read-only-mode -
1))))
400 ;; Check out a particular revision (or recreate the file).
401 (vc-file-setprop file
'vc-working-revision nil
)
402 (apply 'vc-cvs-command nil
0 file
407 ;; default for verbose checkout: clear the
408 ;; sticky tag so that the actual update will
409 ;; get the head of the trunk
413 (vc-switches 'CVS
'checkout
)))
414 (vc-mode-line file
'CVS
))
415 (message "Checking out %s...done" file
))
417 (defun vc-cvs-delete-file (file)
418 (vc-cvs-command nil
0 file
"remove" "-f"))
420 (autoload 'vc-default-revert
"vc")
422 (defun vc-cvs-revert (file &optional contents-done
)
423 "Revert FILE to the working revision on which it was based."
424 (vc-default-revert 'CVS file contents-done
)
425 (unless (eq (vc-cvs-checkout-model (list file
)) 'implicit
)
427 (vc-cvs-command nil
0 file
"unedit")
428 ;; Make the file read-only by switching off all w-bits
429 (set-file-modes file
(logand (file-modes file
) 3950)))))
431 (defun vc-cvs-merge (file first-revision
&optional second-revision
)
432 "Merge changes into current working copy of FILE.
433 The changes are between FIRST-REVISION and SECOND-REVISION."
434 (vc-cvs-command nil
0 file
436 (concat "-j" first-revision
)
437 (concat "-j" second-revision
))
438 (vc-file-setprop file
'vc-state
'edited
)
439 (with-current-buffer (get-buffer "*vc*")
440 (goto-char (point-min))
441 (if (re-search-forward "conflicts during merge" nil t
)
443 (vc-file-setprop file
'vc-state
'conflict
)
446 (vc-file-setprop file
'vc-state
'edited
)
450 (defun vc-cvs-merge-news (file)
451 "Merge in any new changes made to FILE."
452 (message "Merging changes into %s..." file
)
453 ;; (vc-file-setprop file 'vc-working-revision nil)
454 (vc-file-setprop file
'vc-checkout-time
0)
455 (vc-cvs-command nil nil file
"update")
456 ;; Analyze the merge result reported by CVS, and set
457 ;; file properties accordingly.
458 (with-current-buffer (get-buffer "*vc*")
459 (goto-char (point-min))
460 ;; get new working revision
461 (if (re-search-forward
462 "^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t
)
463 (vc-file-setprop file
'vc-working-revision
(match-string 1))
464 (vc-file-setprop file
'vc-working-revision nil
))
467 (if (eq (buffer-size) 0)
468 0 ;; there were no news; indicate success
469 (if (re-search-forward
470 (concat "^\\([CMUP] \\)?"
472 (substring file
(1+ (length (expand-file-name
473 "." default-directory
)))))
474 "\\( already contains the differences between \\)?")
477 ;; Merge successful, we are in sync with repository now
478 ((or (match-string 2)
479 (string= (match-string 1) "U ")
480 (string= (match-string 1) "P "))
481 (vc-file-setprop file
'vc-state
'up-to-date
)
482 (vc-file-setprop file
'vc-checkout-time
483 (nth 5 (file-attributes file
)))
484 0);; indicate success to the caller
485 ;; Merge successful, but our own changes are still in the file
486 ((string= (match-string 1) "M ")
487 (vc-file-setprop file
'vc-state
'edited
)
488 0);; indicate success to the caller
489 ;; Conflicts detected!
491 (vc-file-setprop file
'vc-state
'conflict
)
492 1);; signal the error to the caller
494 (pop-to-buffer "*vc*")
495 (error "Couldn't analyze cvs update result")))
496 (message "Merging changes into %s...done" file
))))
498 (defun vc-cvs-modify-change-comment (files rev comment
)
499 "Modify the change comments for FILES on a specified REV.
500 Will fail unless you have administrative privileges on the repo."
501 (vc-cvs-command nil
0 files
"admin" (concat "-m" rev
":" comment
)))
504 ;;; History functions
507 (declare-function vc-rcs-print-log-cleanup
"vc-rcs" ())
508 ;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher.
509 (declare-function vc-exec-after
"vc-dispatcher" (code))
511 (defun vc-cvs-print-log (files buffer
&optional _shortlog _start-revision limit
)
512 "Print commit log associated with FILES into specified BUFFER.
513 Remaining arguments are ignored."
515 ;; It's just the catenation of the individual logs.
518 (if (vc-stay-local-p files
'CVS
) 'async
0)
520 (with-current-buffer buffer
521 (vc-run-delayed (vc-rcs-print-log-cleanup)))
522 (when limit
'limit-unsupported
))
524 (defun vc-cvs-comment-history (file)
525 "Get comment history of a file."
526 (vc-call-backend 'RCS
'comment-history file
))
528 (autoload 'vc-version-backup-file
"vc")
529 (declare-function vc-coding-system-for-diff
"vc" (file))
531 (defun vc-cvs-diff (files &optional oldvers newvers buffer
)
532 "Get a difference report using CVS between two revisions of FILE."
533 (let* (process-file-side-effects
534 (async (and (not vc-disable-async-diff
)
535 (vc-stay-local-p files
'CVS
)))
536 (invoke-cvs-diff-list nil
)
538 ;; Look through the file list and see if any files have backups
539 ;; that can be used to do a plain "diff" instead of "cvs diff".
543 (when (or (not ov
) (string-equal ov
""))
544 (setq ov
(vc-working-revision file
)))
545 (when (string-equal nv
"")
547 (let ((file-oldvers (vc-version-backup-file file ov
))
548 (file-newvers (if (not nv
)
550 (vc-version-backup-file file nv
)))
551 (coding-system-for-read (vc-coding-system-for-diff file
)))
552 (if (and file-oldvers file-newvers
)
554 ;; This used to append diff-switches and vc-diff-switches,
555 ;; which was consistent with the vc-diff-switches doc at that
556 ;; time, but not with the actual behavior of any other VC diff.
557 (apply 'vc-do-command
(or buffer
"*vc-diff*") 1 "diff" nil
558 ;; Not a CVS diff, does not use vc-cvs-diff-switches.
559 (append (vc-switches nil
'diff
)
560 (list (file-relative-name file-oldvers
)
561 (file-relative-name file-newvers
))))
563 (push file invoke-cvs-diff-list
)))))
564 (when invoke-cvs-diff-list
565 (setq status
(apply 'vc-cvs-command
(or buffer
"*vc-diff*")
567 invoke-cvs-diff-list
"diff"
568 (and oldvers
(concat "-r" oldvers
))
569 (and newvers
(concat "-r" newvers
))
570 (vc-switches 'CVS
'diff
))))
571 (if async
1 status
))) ; async diff, pessimistic assumption
573 (defconst vc-cvs-annotate-first-line-re
"^[0-9]")
575 (defun vc-cvs-annotate-process-filter (filter process string
)
576 (setq string
(concat (process-get process
'output
) string
))
577 (if (not (string-match vc-cvs-annotate-first-line-re string
))
578 ;; Still waiting for the first real line.
579 (process-put process
'output string
)
580 (remove-function (process-filter process
) #'vc-cvs-annotate-process-filter
)
581 (funcall filter process
(substring string
(match-beginning 0)))))
583 (defun vc-cvs-annotate-command (file buffer
&optional revision
)
584 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
585 Optional arg REVISION is a revision to annotate from."
586 (vc-cvs-command buffer
587 (if (vc-stay-local-p file
'CVS
)
590 (if revision
(concat "-r" revision
)))
591 ;; Strip the leading few lines.
592 (let ((proc (get-buffer-process buffer
)))
594 ;; If running asynchronously, use a process filter.
595 (add-function :around
(process-filter proc
)
596 #'vc-cvs-annotate-process-filter
)
597 (with-current-buffer buffer
598 (goto-char (point-min))
599 (re-search-forward vc-cvs-annotate-first-line-re
)
600 (delete-region (point-min) (1- (point)))))))
602 (declare-function vc-annotate-convert-time
"vc-annotate" (time))
604 (defun vc-cvs-annotate-current-time ()
605 "Return the current time, based at midnight of the current day, and
606 encoded as fractional days."
607 (vc-annotate-convert-time
608 (apply 'encode-time
0 0 0 (nthcdr 3 (decode-time (current-time))))))
610 (defun vc-cvs-annotate-time ()
611 "Return the time of the next annotation (as fraction of days)
612 systime, or nil if there is none."
614 (cache (get-text-property bol
'vc-cvs-annotate-time
))
615 (inhibit-read-only t
)
616 (inhibit-modification-hooks t
))
620 "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): ")
621 (let ((day (string-to-number (match-string 1)))
622 (month (cdr (assq (intern (match-string 2))
623 '((Jan .
1) (Feb .
2) (Mar .
3)
624 (Apr .
4) (May .
5) (Jun .
6)
625 (Jul .
7) (Aug .
8) (Sep .
9)
626 (Oct .
10) (Nov .
11) (Dec .
12)))))
627 (year (let ((tmp (string-to-number (match-string 3))))
628 ;; Years 0..68 are 2000..2068.
629 ;; Years 69..99 are 1969..1999.
630 (+ (cond ((> 69 tmp
) 2000)
635 bol
(1+ bol
) 'vc-cvs-annotate-time
637 ;; Position at end makes for nicer overlay result.
638 ;; Don't put actual buffer pos here, but only relative
639 ;; distance, so we don't ever move backward in the
640 ;; goto-char below, even if the text is moved.
641 (- (match-end 0) (match-beginning 0))
642 (vc-annotate-convert-time
643 (encode-time 0 0 0 day month year
))))))))
645 (goto-char (+ bol
(car cache
))) ; Fontify from here to eol.
646 (cdr cache
)))) ; days (float)
648 (defun vc-cvs-annotate-extract-revision-at-line ()
651 (if (re-search-forward "^\\([0-9]+\\.[0-9]+\\(\\.[0-9]+\\)*\\) +("
652 (line-end-position) t
)
653 (match-string-no-properties 1)
656 (defun vc-cvs-previous-revision (file rev
)
657 (vc-call-backend 'RCS
'previous-revision file rev
))
659 (defun vc-cvs-next-revision (file rev
)
660 (vc-call-backend 'RCS
'next-revision file rev
))
662 ;; FIXME: This should probably be replaced by code using cvs2cl.
663 (defun vc-cvs-update-changelog (files)
664 (vc-call-backend 'RCS
'update-changelog files
))
670 (defun vc-cvs-create-tag (dir name branchp
)
671 "Assign to DIR's current revision a given NAME.
672 If BRANCHP is non-nil, the name is created as a branch (and the current
673 workspace is immediately moved to that new branch)."
674 (vc-cvs-command nil
0 dir
"tag" "-c" (if branchp
"-b") name
)
675 (when branchp
(vc-cvs-command nil
0 dir
"update" "-r" name
)))
677 ;; Follows vc-cvs-command, which uses vc-do-command from vc-dispatcher.
678 (declare-function vc-resynch-buffer
"vc-dispatcher"
679 (file &optional keep noquery reset-vc-info
))
681 (defun vc-cvs-retrieve-tag (dir name update
)
682 "Retrieve a tag at and below DIR.
683 NAME is the name of the tag; if it is empty, do a `cvs update'.
684 If UPDATE is non-nil, then update (resynch) any affected buffers."
685 (with-current-buffer (get-buffer-create "*vc*")
686 (let ((default-directory dir
)
689 (if (or (not name
) (string= name
""))
690 (vc-cvs-command t
0 nil
"update")
691 (vc-cvs-command t
0 nil
"update" "-r" name
)
692 (setq sticky-tag name
))
694 (goto-char (point-min))
696 (if (looking-at "\\([CMUP]\\) \\(.*\\)")
697 (let* ((file (expand-file-name (match-string 2) dir
))
698 (state (match-string 1))
699 (buffer (find-buffer-visiting file
)))
702 ((or (string= state
"U")
704 (vc-file-setprop file
'vc-state
'up-to-date
)
705 (vc-file-setprop file
'vc-working-revision nil
)
706 (vc-file-setprop file
'vc-checkout-time
707 (nth 5 (file-attributes file
))))
708 ((or (string= state
"M")
710 (vc-file-setprop file
'vc-state
'edited
)
711 (vc-file-setprop file
'vc-working-revision nil
)
712 (vc-file-setprop file
'vc-checkout-time
0)))
713 (vc-file-setprop file
'vc-cvs-sticky-tag sticky-tag
)
714 (vc-resynch-buffer file t t
))))
715 (forward-line 1))))))
722 (defun vc-cvs-make-version-backups-p (file)
723 "Return non-nil if version backups should be made for FILE."
724 (vc-stay-local-p file
'CVS
))
726 (defun vc-cvs-check-headers ()
727 "Check if the current file has any headers in it."
729 (goto-char (point-min))
730 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
731 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t
)))
735 ;;; Internal functions
738 (defun vc-cvs-command (buffer okstatus files
&rest flags
)
739 "A wrapper around `vc-do-command' for use in vc-cvs.el.
740 The difference to vc-do-command is that this function always invokes `cvs',
741 and that it passes `vc-cvs-global-switches' to it before FLAGS."
742 (apply 'vc-do-command
(or buffer
"*vc*") okstatus
"cvs" files
743 (if (stringp vc-cvs-global-switches
)
744 (cons vc-cvs-global-switches flags
)
745 (append vc-cvs-global-switches
748 (defun vc-cvs-stay-local-p (file) ;Back-compatibility.
749 (vc-stay-local-p file
'CVS
))
751 (defun vc-cvs-repository-hostname (dirname)
752 "Hostname of the CVS server associated to workarea DIRNAME."
753 (let ((rootname (expand-file-name "CVS/Root" dirname
)))
754 (when (file-readable-p rootname
)
756 (let ((coding-system-for-read
757 (or file-name-coding-system
758 default-file-name-coding-system
)))
759 (vc-insert-file rootname
))
760 (goto-char (point-min))
761 (nth 2 (vc-cvs-parse-root
762 (buffer-substring (point)
763 (line-end-position))))))))
765 (defun vc-cvs-parse-uhp (path)
766 "parse user@host/path into (user@host /path)"
767 (if (string-match "\\([^/]+\\)\\(/.*\\)" path
)
768 (list (match-string 1 path
) (match-string 2 path
))
771 (defun vc-cvs-parse-root (root)
772 "Split CVS ROOT specification string into a list of fields.
773 A CVS root specification of the form
774 [:METHOD:][[USER@]HOSTNAME]:?/path/to/repository
775 is converted to a normalized record with the following structure:
776 \(METHOD USER HOSTNAME CVS-ROOT).
777 The default METHOD for a CVS root of the form
780 The default METHOD for a CVS root of the form
781 [USER@]HOSTNAME:/path/to/repository
783 For an empty string, nil is returned (invalid CVS root)."
784 ;; Split CVS root into colon separated fields (0-4).
785 ;; The `x:' makes sure, that leading colons are not lost;
786 ;; `HOST:/PATH' is then different from `:METHOD:/PATH'.
787 (let* ((root-list (cdr (split-string (concat "x:" root
) ":")))
788 (len (length root-list
))
789 ;; All syntactic varieties will get a proper METHOD.
796 (let ((uhp (vc-cvs-parse-uhp (car root-list
))))
797 (cons (if (car uhp
) "ext" "local") uhp
)))
799 ;; [USER@]HOST:PATH => method `ext'
800 (and (not (equal (car root-list
) ""))
801 (cons "ext" root-list
)))
803 ;; :METHOD:PATH or :METHOD:USER@HOSTNAME/PATH
804 (cons (cadr root-list
)
805 (vc-cvs-parse-uhp (nth 2 root-list
))))
807 ;; :METHOD:[USER@]HOST:PATH
810 (let ((method (car root-list
))
811 (uhost (or (cadr root-list
) ""))
812 (root (nth 2 root-list
))
815 (if (string-match "\\(.*\\)@\\(.*\\)" uhost
)
816 (setq user
(match-string 1 uhost
)
817 host
(match-string 2 uhost
))
822 ;; Fix windows style CVS root `:local:C:\\project\\cvs\\some\\dir'
824 (equal method
"local")
825 (setq root
(concat host
":" root
) host
))
826 ;; Normalize CVS root record
827 (list method user host root
)))))
829 ;; XXX: This does not work correctly for subdirectories. "cvs status"
830 ;; information is context sensitive, it contains lines like:
831 ;; cvs status: Examining DIRNAME
832 ;; and the file entries after that don't show the full path.
833 ;; Because of this VC directory listings only show changed files
834 ;; at the top level for CVS.
835 (defun vc-cvs-parse-status (&optional full
)
836 "Parse output of \"cvs status\" command in the current buffer.
837 Set file properties accordingly. Unless FULL is t, parse only
838 essential information. Note that this can never set the 'ignored
840 (let (file status missing
)
841 (goto-char (point-min))
842 (while (looking-at "? \\(.*\\)")
843 (setq file
(expand-file-name (match-string 1)))
844 (vc-file-setprop file
'vc-state
'unregistered
)
846 (when (re-search-forward "^File: " nil t
)
847 (when (setq missing
(looking-at "no file "))
848 (goto-char (match-end 0)))
850 ((re-search-forward "\\=\\([^ \t]+\\)" nil t
)
851 (setq file
(expand-file-name (match-string 1)))
852 (setq status
(if (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t
)
853 (match-string 1) "Unknown"))
856 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
857 \[\t ]+\\([0-9.]+\\)"
859 (vc-file-setprop file
'vc-latest-revision
(match-string 2)))
863 ((string-match "Up-to-date" status
)
864 (vc-file-setprop file
'vc-checkout-time
865 (nth 5 (file-attributes file
)))
867 ((string-match "Locally Modified" status
) 'edited
)
868 ((string-match "Needs Merge" status
) 'needs-merge
)
869 ((string-match "Needs \\(Checkout\\|Patch\\)" status
)
870 (if missing
'missing
'needs-update
))
871 ((string-match "Locally Added" status
) 'added
)
872 ((string-match "Locally Removed" status
) 'removed
)
873 ((string-match "File had conflicts " status
) 'conflict
)
874 ((string-match "Unknown" status
) 'unregistered
)
877 (defun vc-cvs-after-dir-status (update-function)
878 ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack.
879 ;; This needs a lot of testing.
886 (subdir default-directory
))
887 (goto-char (point-min))
889 ;; Look for either a file entry, an unregistered file, or a
892 "\\(^=+\n\\([^=c?\n].*\n\\|\n\\)+\\)\\|\\(\\(^?? .*\n\\)+\\)\\|\\(^cvs status: \\(Examining\\|nothing\\) .*\n\\)"
894 ;; FIXME: get rid of narrowing here.
895 (narrow-to-region (match-beginning 0) (match-end 0))
896 (goto-char (point-min))
898 (when (looking-at "cvs status: Examining \\(.+\\)")
899 (setq subdir
(expand-file-name (match-string 1))))
900 ;; Unregistered files
901 (while (looking-at "? \\(.*\\)")
902 (setq file
(file-relative-name
903 (expand-file-name (match-string 1) subdir
)))
904 (push (list file
'unregistered
) result
)
906 (when (looking-at "cvs status: nothing known about")
907 ;; We asked about a non existent file. The output looks like this:
909 ;; cvs status: nothing known about `lisp/v.diff'
910 ;; ===================================================================
911 ;; File: no file v.diff Status: Unknown
913 ;; Working revision: No entry for v.diff
914 ;; Repository revision: No revision control file
917 ;; Due to narrowing in this iteration we only see the "cvs
918 ;; status:" line, so just set a flag so that we can ignore the
919 ;; file in the next iteration.
920 (setq ignore-next t
))
922 (when (re-search-forward "^File: \\(no file \\)?\\(.*[^ \t]\\)[ \t]+Status: \\(.*\\)" nil t
)
923 (setq missing
(match-string 1))
924 (setq file
(file-relative-name
925 (expand-file-name (match-string 2) subdir
)))
926 (setq status-str
(match-string 3))
929 ((string-match "Up-to-date" status-str
) 'up-to-date
)
930 ((string-match "Locally Modified" status-str
) 'edited
)
931 ((string-match "Needs Merge" status-str
) 'needs-merge
)
932 ((string-match "Needs \\(Checkout\\|Patch\\)" status-str
)
933 (if missing
'missing
'needs-update
))
934 ((string-match "Locally Added" status-str
) 'added
)
935 ((string-match "Locally Removed" status-str
) 'removed
)
936 ((string-match "File had conflicts " status-str
) 'conflict
)
937 ((string-match "Unknown" status-str
) 'unregistered
)
940 (setq ignore-next nil
)
941 (unless (eq status
'up-to-date
)
942 (push (list file status
) result
))))
943 (goto-char (point-max))
945 (funcall update-function result
))
946 ;; Alternative implementation: use the "update" command instead of
947 ;; the "status" command.
948 ;; (let ((result nil)
949 ;; (translation '((?? . unregistered)
953 ;; (?P . needs-merge)
955 ;; (?U . needs-update))))
956 ;; (goto-char (point-min))
957 ;; (while (not (eobp))
958 ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$")
959 ;; (push (list (match-string 1)
960 ;; (cdr (assoc (char-after) translation)))
963 ;; ((looking-at "cvs update: warning: \\(.*\\) was lost")
965 ;; ;; cvs update: warning: FILENAME was lost
967 ;; (push (list (match-string 1) 'missing) result)
968 ;; ;; Skip the "U" line
970 ;; ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored")
971 ;; (push (list (match-string 1) 'unregistered) result))))
973 ;; (funcall update-function result)))
976 ;; Based on vc-cvs-dir-state-heuristic from Emacs 22.
977 ;; FIXME does not mention unregistered files.
978 (defun vc-cvs-dir-status-heuristic (dir update-function
&optional basedir
)
979 "Find the CVS state of all files in DIR, using only local information."
980 (let (file basename status result dirlist
)
982 (vc-cvs-get-entries dir
)
983 (goto-char (point-min))
985 (if (looking-at "D/\\([^/]*\\)////")
986 (push (expand-file-name (match-string 1) dir
) dirlist
)
987 ;; CVS-removed files are not taken under VC control.
988 (when (looking-at "/\\([^/]*\\)/[^/-]")
989 (setq basename
(match-string 1)
990 file
(expand-file-name basename dir
)
991 status
(or (vc-file-getprop file
'vc-state
)
992 (vc-cvs-parse-entry file t
)))
993 (unless (eq status
'up-to-date
)
994 (push (list (if basedir
995 (file-relative-name file basedir
)
999 (dolist (subdir dirlist
)
1000 (setq result
(append result
1001 (vc-cvs-dir-status-heuristic subdir nil
1002 (or basedir dir
)))))
1004 (funcall update-function result
))))
1006 (defun vc-cvs-dir-status (dir update-function
)
1007 "Create a list of conses (file . state) for DIR."
1008 ;; FIXME check all files in DIR instead?
1009 (let ((local (vc-stay-local-p dir
'CVS
)))
1010 (if (and local
(not (eq local
'only-file
)))
1011 (vc-cvs-dir-status-heuristic dir update-function
)
1012 (vc-cvs-command (current-buffer) 'async dir
"-f" "status")
1013 ;; Alternative implementation: use the "update" command instead of
1014 ;; the "status" command.
1015 ;; (vc-cvs-command (current-buffer) 'async
1016 ;; (file-relative-name dir)
1017 ;; "-f" "-n" "update" "-d" "-P")
1019 (vc-cvs-after-dir-status update-function
)))))
1021 (defun vc-cvs-dir-status-files (dir files _default-state update-function
)
1022 "Create a list of conses (file . state) for DIR."
1023 (apply 'vc-cvs-command
(current-buffer) 'async dir
"-f" "status" files
)
1025 (vc-cvs-after-dir-status update-function
)))
1027 (defun vc-cvs-file-to-string (file)
1028 "Read the content of FILE and return it as a string."
1031 (insert-file-contents file
)
1032 (goto-char (point-min))
1033 (buffer-substring (point) (point-max)))
1036 (defun vc-cvs-dir-extra-headers (_dir)
1037 "Extract and represent per-directory properties of a CVS working copy."
1041 (insert-file-contents "CVS/Root")
1042 (goto-char (point-min))
1043 (and (looking-at ":ext:") (delete-char 5))
1044 (concat (buffer-substring (point) (1- (point-max))) "\n"))
1049 (insert-file-contents "CVS/Repository")
1050 (goto-char (point-min))
1051 (skip-chars-forward "^\n")
1052 (concat (buffer-substring (point-min) (point)) "\n"))
1056 (concat (propertize "Repository : " 'face
'font-lock-type-face
)
1057 (propertize repo
'face
'font-lock-variable-name-face
)))
1060 (concat (propertize "Module : " 'face
'font-lock-type-face
)
1061 (propertize module
'face
'font-lock-variable-name-face
)))
1063 (if (file-readable-p "CVS/Tag")
1064 (let ((tag (vc-cvs-file-to-string "CVS/Tag")))
1066 ((string-match "\\`T" tag
)
1067 (concat (propertize "Tag : " 'face
'font-lock-type-face
)
1068 (propertize (substring tag
1)
1069 'face
'font-lock-variable-name-face
)))
1070 ((string-match "\\`D" tag
)
1071 (concat (propertize "Date : " 'face
'font-lock-type-face
)
1072 (propertize (substring tag
1)
1073 'face
'font-lock-variable-name-face
)))
1076 ;; In CVS, branch is a per-file property, not a per-directory property.
1077 ;; We can't really do this here without making dangerous assumptions.
1078 ;;(propertize "Branch: " 'face 'font-lock-type-face)
1079 ;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n"
1080 ;; 'face 'font-lock-warning-face)
1083 (defun vc-cvs-get-entries (dir)
1084 "Insert the CVS/Entries file from below DIR into the current buffer.
1085 This function ensures that the correct coding system is used for that,
1086 which may not be the one that is used for the files' contents.
1087 CVS/Entries should only be accessed through this function."
1088 (let ((coding-system-for-read (or file-name-coding-system
1089 default-file-name-coding-system
)))
1090 (vc-insert-file (expand-file-name "CVS/Entries" dir
))))
1092 (defun vc-cvs-valid-symbolic-tag-name-p (tag)
1093 "Return non-nil if TAG is a valid symbolic tag name."
1094 ;; According to the CVS manual, a valid symbolic tag must start with
1095 ;; an uppercase or lowercase letter and can contain uppercase and
1096 ;; lowercase letters, digits, `-', and `_'.
1097 (and (string-match "^[a-zA-Z]" tag
)
1098 (not (string-match "[^a-z0-9A-Z-_]" tag
))))
1100 (defun vc-cvs-valid-revision-number-p (tag)
1101 "Return non-nil if TAG is a valid revision number."
1102 (and (string-match "^[0-9]" tag
)
1103 (not (string-match "[^0-9.]" tag
))))
1105 (defun vc-cvs-parse-sticky-tag (match-type match-tag
)
1106 "Parse and return the sticky tag as a string.
1107 `match-data' is protected."
1108 (let ((data (match-data))
1110 (type (cond ((string= match-type
"D") 'date
)
1111 ((string= match-type
"T")
1112 (if (vc-cvs-valid-symbolic-tag-name-p match-tag
)
1119 ;; Sticky Date tag. Convert to a proper date value (`encode-time')
1122 "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
1124 (let* ((year-tmp (string-to-number (match-string 1 match-tag
)))
1125 (month (string-to-number (match-string 2 match-tag
)))
1126 (day (string-to-number (match-string 3 match-tag
)))
1127 (hour (string-to-number (match-string 4 match-tag
)))
1128 (min (string-to-number (match-string 5 match-tag
)))
1129 (sec (string-to-number (match-string 6 match-tag
)))
1130 ;; Years 0..68 are 2000..2068.
1131 ;; Years 69..99 are 1969..1999.
1132 (year (+ (cond ((> 69 year-tmp
) 2000)
1133 ((> 100 year-tmp
) 1900)
1136 (setq tag
(encode-time sec min hour day month year
))))
1137 ;; Sticky Tag name or revision number
1138 ((eq type
'symbolic-name
) (setq tag match-tag
))
1139 ((eq type
'revision-number
) (setq tag match-tag
))
1140 ;; Default is no sticky tag at all
1142 (cond ((eq vc-cvs-sticky-tag-display nil
) nil
)
1143 ((eq vc-cvs-sticky-tag-display t
)
1144 (cond ((eq type
'date
) (format-time-string
1145 vc-cvs-sticky-date-format-string
1147 ((eq type
'symbolic-name
) tag
)
1148 ((eq type
'revision-number
) tag
)
1150 ((functionp vc-cvs-sticky-tag-display
)
1151 (funcall vc-cvs-sticky-tag-display tag type
))
1154 (set-match-data data
))))
1156 (defun vc-cvs-parse-entry (file &optional set-state
)
1157 "Parse a line from CVS/Entries.
1158 Compare modification time to that of the FILE, set file properties
1159 accordingly. However, `vc-state' is set only if optional arg SET-STATE
1162 ;; entry for a "locally added" file (not yet committed)
1163 ((looking-at "/[^/]+/0/")
1164 (vc-file-setprop file
'vc-checkout-time
0)
1165 (vc-file-setprop file
'vc-working-revision
"0")
1166 (if set-state
(vc-file-setprop file
'vc-state
'added
)))
1172 ;; timestamp and optional conflict field
1177 "\\(.\\|\\)" ;Sticky tag type (date or tag name, could be empty)
1178 "\\(.*\\)")) ;Sticky tag
1179 (vc-file-setprop file
'vc-working-revision
(match-string 1))
1180 (vc-file-setprop file
'vc-cvs-sticky-tag
1181 (vc-cvs-parse-sticky-tag (match-string 4)
1183 ;; Compare checkout time and modification time.
1184 ;; This is intentionally different from the algorithm that CVS uses
1185 ;; (which is based on textual comparison), because there can be problems
1186 ;; generating a time string that looks exactly like the one from CVS.
1187 (let* ((time (match-string 2))
1188 (mtime (nth 5 (file-attributes file
)))
1189 (parsed-time (progn (require 'parse-time
)
1190 (parse-time-string (concat time
" +0000")))))
1191 (cond ((and (not (string-match "\\+" time
))
1193 ;; Compare just the seconds part of the file time,
1194 ;; since CVS file time stamp resolution is just 1 second.
1195 (let ((ptime (apply 'encode-time parsed-time
)))
1196 (and (eq (car mtime
) (car ptime
))
1197 (eq (cadr mtime
) (cadr ptime
)))))
1198 (vc-file-setprop file
'vc-checkout-time mtime
)
1199 (if set-state
(vc-file-setprop file
'vc-state
'up-to-date
)))
1201 (vc-file-setprop file
'vc-checkout-time
0)
1202 (if set-state
(vc-file-setprop file
'vc-state
'edited
))))))))
1204 ;; Completion of revision names.
1205 ;; Just so I don't feel like I'm duplicating code from pcl-cvs, I'll use
1206 ;; `cvs log' so I can list all the revision numbers rather than only
1209 (defun vc-cvs-revision-table (file)
1210 (let (process-file-side-effects
1211 (default-directory (file-name-directory file
))
1214 (vc-cvs-command t nil file
"log")
1215 (goto-char (point-min))
1216 (when (re-search-forward "^symbolic names:\n" nil t
)
1217 (while (looking-at "^ \\(.*\\): \\(.*\\)")
1218 (push (cons (match-string 1) (match-string 2)) res
)
1220 (while (re-search-forward "^revision \\([0-9.]+\\)" nil t
)
1221 (push (match-string 1) res
))
1224 (defun vc-cvs-revision-completion-table (files)
1225 (letrec ((table (lazy-completion-table
1226 table
(lambda () (vc-cvs-revision-table (car files
))))))
1229 (defun vc-cvs-find-admin-dir (file)
1230 "Return the administrative directory of FILE."
1231 (vc-find-root file
"CVS"))
1233 (defun vc-cvs-ignore (file &optional _directory _remove
)
1234 "Ignore FILE under CVS."
1235 (vc-cvs-append-to-ignore (file-name-directory file
) file
))
1237 (defun vc-cvs-append-to-ignore (dir str
&optional old-dir
)
1238 "In DIR, add STR to the .cvsignore file.
1239 If OLD-DIR is non-nil, then this is a directory that we don't want
1240 to hear about anymore."
1241 (with-current-buffer
1242 (find-file-noselect (expand-file-name ".cvsignore" dir
))
1243 (when (ignore-errors
1244 (and buffer-read-only
1245 (eq 'CVS
(vc-backend buffer-file-name
))
1246 (not (vc-editable-p buffer-file-name
))))
1247 ;; CVSREAD=on special case
1248 (vc-checkout buffer-file-name t
))
1249 (goto-char (point-max))
1250 (unless (bolp) (insert "\n"))
1251 (insert str
(if old-dir
"/\n" "\n"))
1252 ;; FIXME this is a pcvs variable.
1253 (if (bound-and-true-p cvs-sort-ignore-file
)
1254 (sort-lines nil
(point-min) (point-max)))
1259 ;;; vc-cvs.el ends here