*** empty log message ***
[emacs.git] / lisp / vc-rcs.el
blob6e6bb04c2ecb1bf11c5b630dcc86929591b0c6b6
1 ;;; vc-rcs.el --- support for RCS version-control
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4 ;; 2000, 2001, 2004 Free Software Foundation, Inc.
6 ;; Author: FSF (see vc.el for full credits)
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
9 ;; $Id$
11 ;; This file is part of GNU Emacs.
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
14 ;; it under the terms of the GNU General Public License as published by
15 ;; the Free Software Foundation; either version 2, or (at your option)
16 ;; any later version.
18 ;; GNU Emacs is distributed in the hope that it will be useful,
19 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
20 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
21 ;; GNU General Public License for more details.
23 ;; You should have received a copy of the GNU General Public License
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the
25 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
26 ;; Boston, MA 02111-1307, USA.
28 ;;; Commentary:
30 ;; See vc.el
32 ;;; Code:
34 ;;;
35 ;;; Customization options
36 ;;;
38 (eval-when-compile
39 (require 'cl)
40 (require 'vc))
42 (defcustom vc-rcs-release nil
43 "*The release number of your RCS installation, as a string.
44 If nil, VC itself computes this value when it is first needed."
45 :type '(choice (const :tag "Auto" nil)
46 (string :tag "Specified")
47 (const :tag "Unknown" unknown))
48 :group 'vc)
50 (defcustom vc-rcs-register-switches nil
51 "*Extra switches for registering a file in RCS.
52 A string or list of strings. These are passed to the checkin program
53 by \\[vc-rcs-register]."
54 :type '(choice (const :tag "None" nil)
55 (string :tag "Argument String")
56 (repeat :tag "Argument List"
57 :value ("")
58 string))
59 :version "21.1"
60 :group 'vc)
62 (defcustom vc-rcs-diff-switches nil
63 "*A string or list of strings specifying extra switches for rcsdiff under VC."
64 :type '(choice (const :tag "None" nil)
65 (string :tag "Argument String")
66 (repeat :tag "Argument List"
67 :value ("")
68 string))
69 :version "21.1"
70 :group 'vc)
72 (defcustom vc-rcs-header (or (cdr (assoc 'RCS vc-header-alist)) '("\$Id\$"))
73 "*Header keywords to be inserted by `vc-insert-headers'."
74 :type '(repeat string)
75 :version "21.1"
76 :group 'vc)
78 (defcustom vc-rcsdiff-knows-brief nil
79 "*Indicates whether rcsdiff understands the --brief option.
80 The value is either `yes', `no', or nil. If it is nil, VC tries
81 to use --brief and sets this variable to remember whether it worked."
82 :type '(choice (const :tag "Work out" nil) (const yes) (const no))
83 :group 'vc)
85 ;;;###autoload
86 (defcustom vc-rcs-master-templates
87 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")
88 "*Where to look for RCS master files.
89 For a description of possible values, see `vc-check-master-templates'."
90 :type '(choice (const :tag "Use standard RCS file names"
91 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s"))
92 (repeat :tag "User-specified"
93 (choice string
94 function)))
95 :version "21.1"
96 :group 'vc)
99 ;;;
100 ;;; State-querying functions
103 ;;; The autoload cookie below places vc-rcs-registered directly into
104 ;;; loaddefs.el, so that vc-rcs.el does not need to be loaded for
105 ;;; every file that is visited. The definition is repeated below
106 ;;; so that Help and etags can find it.
108 ;;;###autoload (defun vc-rcs-registered (f) (vc-default-registered 'RCS f))
109 (defun vc-rcs-registered (f) (vc-default-registered 'RCS f))
111 (defun vc-rcs-state (file)
112 "Implementation of `vc-state' for RCS."
113 (or (boundp 'vc-rcs-headers-result)
114 (and vc-consult-headers
115 (vc-rcs-consult-headers file)))
116 (let ((state
117 ;; vc-workfile-version might not be known; in that case the
118 ;; property is nil. vc-rcs-fetch-master-state knows how to
119 ;; handle that.
120 (vc-rcs-fetch-master-state file
121 (vc-file-getprop file
122 'vc-workfile-version))))
123 (if (not (eq state 'up-to-date))
124 state
125 (if (vc-workfile-unchanged-p file)
126 'up-to-date
127 (if (eq (vc-checkout-model file) 'locking)
128 'unlocked-changes
129 'edited)))))
131 (defun vc-rcs-state-heuristic (file)
132 "State heuristic for RCS."
133 (let (vc-rcs-headers-result)
134 (if (and vc-consult-headers
135 (setq vc-rcs-headers-result
136 (vc-rcs-consult-headers file))
137 (eq vc-rcs-headers-result 'rev-and-lock))
138 (let ((state (vc-file-getprop file 'vc-state)))
139 ;; If the headers say that the file is not locked, the
140 ;; permissions can tell us whether locking is used for
141 ;; the file or not.
142 (if (and (eq state 'up-to-date)
143 (not (vc-mistrust-permissions file)))
144 (cond
145 ((string-match ".rw..-..-." (nth 8 (file-attributes file)))
146 (vc-file-setprop file 'vc-checkout-model 'implicit)
147 (setq state
148 (if (vc-rcs-workfile-is-newer file)
149 'edited
150 'up-to-date)))
151 ((string-match ".r-..-..-." (nth 8 (file-attributes file)))
152 (vc-file-setprop file 'vc-checkout-model 'locking))))
153 state)
154 (if (not (vc-mistrust-permissions file))
155 (let* ((attributes (file-attributes file))
156 (owner-uid (nth 2 attributes))
157 (permissions (nth 8 attributes)))
158 (cond ((string-match ".r-..-..-." permissions)
159 (vc-file-setprop file 'vc-checkout-model 'locking)
160 'up-to-date)
161 ((string-match ".rw..-..-." permissions)
162 (if (eq (vc-checkout-model file) 'locking)
163 (if (file-ownership-preserved-p file)
164 'edited
165 (vc-user-login-name owner-uid))
166 (if (vc-rcs-workfile-is-newer file)
167 'edited
168 'up-to-date)))
170 ;; Strange permissions. Fall through to
171 ;; expensive state computation.
172 (vc-rcs-state file))))
173 (vc-rcs-state file)))))
175 (defun vc-rcs-workfile-version (file)
176 "RCS-specific version of `vc-workfile-version'."
177 (or (and vc-consult-headers
178 (vc-rcs-consult-headers file)
179 (vc-file-getprop file 'vc-workfile-version))
180 (progn
181 (vc-rcs-fetch-master-state file)
182 (vc-file-getprop file 'vc-workfile-version))))
184 (defun vc-rcs-latest-on-branch-p (file &optional version)
185 "Return non-nil if workfile version of FILE is the latest on its branch.
186 When VERSION is given, perform check for that version."
187 (unless version (setq version (vc-workfile-version file)))
188 (with-temp-buffer
189 (string= version
190 (if (vc-trunk-p version)
191 (progn
192 ;; Compare VERSION to the head version number.
193 (vc-insert-file (vc-name file) "^[0-9]")
194 (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1))
195 ;; If we are not on the trunk, we need to examine the
196 ;; whole current branch.
197 (vc-insert-file (vc-name file) "^desc")
198 (vc-rcs-find-most-recent-rev (vc-branch-part version))))))
200 (defun vc-rcs-checkout-model (file)
201 "RCS-specific version of `vc-checkout-model'."
202 (let (result)
203 (when vc-consult-headers
204 (vc-file-setprop file 'vc-checkout-model nil)
205 (vc-rcs-consult-headers file)
206 (setq result (vc-file-getprop file 'vc-checkout-model)))
207 (or result
208 (progn (vc-rcs-fetch-master-state file)
209 (vc-file-getprop file 'vc-checkout-model)))))
211 (defun vc-rcs-workfile-unchanged-p (file)
212 "RCS-specific implementation of `vc-workfile-unchanged-p'."
213 ;; Try to use rcsdiff --brief. If rcsdiff does not understand that,
214 ;; do a double take and remember the fact for the future
215 (let* ((version (concat "-r" (vc-workfile-version file)))
216 (status (if (eq vc-rcsdiff-knows-brief 'no)
217 (vc-do-command nil 1 "rcsdiff" file version)
218 (vc-do-command nil 2 "rcsdiff" file "--brief" version))))
219 (if (eq status 2)
220 (if (not vc-rcsdiff-knows-brief)
221 (setq vc-rcsdiff-knows-brief 'no
222 status (vc-do-command nil 1 "rcsdiff" file version))
223 (error "rcsdiff failed"))
224 (if (not vc-rcsdiff-knows-brief) (setq vc-rcsdiff-knows-brief 'yes)))
225 ;; The workfile is unchanged if rcsdiff found no differences.
226 (zerop status)))
230 ;;; State-changing functions
233 (defun vc-rcs-register (file &optional rev comment)
234 "Register FILE into the RCS version-control system.
235 REV is the optional revision number for the file. COMMENT can be used
236 to provide an initial description of FILE.
238 `vc-register-switches' and `vc-rcs-register-switches' are passed to
239 the RCS command (in that order).
241 Automatically retrieve a read-only version of the file with keywords
242 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile."
243 (let ((subdir (expand-file-name "RCS" (file-name-directory file))))
244 (and (not (file-exists-p subdir))
245 (not (directory-files (file-name-directory file)
246 nil ".*,v$" t))
247 (yes-or-no-p "Create RCS subdirectory? ")
248 (make-directory subdir))
249 (apply 'vc-do-command nil 0 "ci" file
250 ;; if available, use the secure registering option
251 (and (vc-rcs-release-p "5.6.4") "-i")
252 (concat (if vc-keep-workfiles "-u" "-r") rev)
253 (and comment (concat "-t-" comment))
254 (vc-switches 'RCS 'register))
255 ;; parse output to find master file name and workfile version
256 (with-current-buffer "*vc*"
257 (goto-char (point-min))
258 (let ((name (if (looking-at (concat "^\\(.*\\) <-- "
259 (file-name-nondirectory file)))
260 (match-string 1))))
261 (if (not name)
262 ;; if we couldn't find the master name,
263 ;; run vc-rcs-registered to get it
264 ;; (will be stored into the vc-name property)
265 (vc-rcs-registered file)
266 (vc-file-setprop file 'vc-name
267 (if (file-name-absolute-p name)
268 name
269 (expand-file-name
270 name
271 (file-name-directory file))))))
272 (vc-file-setprop file 'vc-workfile-version
273 (if (re-search-forward
274 "^initial revision: \\([0-9.]+\\).*\n"
275 nil t)
276 (match-string 1))))))
278 (defun vc-rcs-responsible-p (file)
279 "Return non-nil if RCS thinks it would be responsible for registering FILE."
280 ;; TODO: check for all the patterns in vc-rcs-master-templates
281 (file-directory-p (expand-file-name "RCS" (file-name-directory file))))
283 (defun vc-rcs-receive-file (file rev)
284 "Implementation of receive-file for RCS."
285 (let ((checkout-model (vc-checkout-model file)))
286 (vc-rcs-register file rev "")
287 (when (eq checkout-model 'implicit)
288 (vc-rcs-set-non-strict-locking file))
289 (vc-rcs-set-default-branch file (concat rev ".1"))))
291 (defun vc-rcs-unregister (file)
292 "Unregister FILE from RCS.
293 If this leaves the RCS subdirectory empty, ask the user
294 whether to remove it."
295 (let* ((master (vc-name file))
296 (dir (file-name-directory master))
297 (backup-info (find-backup-file-name master)))
298 (if (not backup-info)
299 (delete-file master)
300 (rename-file master (car backup-info) 'ok-if-already-exists)
301 (dolist (f (cdr backup-info)) (ignore-errors (delete-file f))))
302 (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS")
303 ;; check whether RCS dir is empty, i.e. it does not
304 ;; contain any files except "." and ".."
305 (not (directory-files dir nil
306 "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*"))
307 (yes-or-no-p (format "Directory %s is empty; remove it? " dir))
308 (delete-directory dir))))
310 (defun vc-rcs-checkin (file rev comment)
311 "RCS-specific version of `vc-backend-checkin'."
312 (let ((switches (vc-switches 'RCS 'checkin)))
313 (let ((old-version (vc-workfile-version file)) new-version
314 (default-branch (vc-file-getprop file 'vc-rcs-default-branch)))
315 ;; Force branch creation if an appropriate
316 ;; default branch has been set.
317 (and (not rev)
318 default-branch
319 (string-match (concat "^" (regexp-quote old-version) "\\.")
320 default-branch)
321 (setq rev default-branch)
322 (setq switches (cons "-f" switches)))
323 (if (and (not rev) old-version)
324 (setq rev (vc-branch-part old-version)))
325 (apply 'vc-do-command nil 0 "ci" (vc-name file)
326 ;; if available, use the secure check-in option
327 (and (vc-rcs-release-p "5.6.4") "-j")
328 (concat (if vc-keep-workfiles "-u" "-r") rev)
329 (concat "-m" comment)
330 switches)
331 (vc-file-setprop file 'vc-workfile-version nil)
333 ;; determine the new workfile version
334 (set-buffer "*vc*")
335 (goto-char (point-min))
336 (when (or (re-search-forward
337 "new revision: \\([0-9.]+\\);" nil t)
338 (re-search-forward
339 "reverting to previous revision \\([0-9.]+\\)" nil t))
340 (setq new-version (match-string 1))
341 (vc-file-setprop file 'vc-workfile-version new-version))
343 ;; if we got to a different branch, adjust the default
344 ;; branch accordingly
345 (cond
346 ((and old-version new-version
347 (not (string= (vc-branch-part old-version)
348 (vc-branch-part new-version))))
349 (vc-rcs-set-default-branch file
350 (if (vc-trunk-p new-version) nil
351 (vc-branch-part new-version)))
352 ;; If this is an old RCS release, we might have
353 ;; to remove a remaining lock.
354 (if (not (vc-rcs-release-p "5.6.2"))
355 ;; exit status of 1 is also accepted.
356 ;; It means that the lock was removed before.
357 (vc-do-command nil 1 "rcs" (vc-name file)
358 (concat "-u" old-version))))))))
360 (defun vc-rcs-find-version (file rev buffer)
361 (apply 'vc-do-command
362 buffer 0 "co" (vc-name file)
363 "-q" ;; suppress diagnostic output
364 (concat "-p" rev)
365 (vc-switches 'RCS 'checkout)))
367 (defun vc-rcs-checkout (file &optional editable rev)
368 "Retrieve a copy of a saved version of FILE."
369 (let ((file-buffer (get-file-buffer file))
370 switches)
371 (message "Checking out %s..." file)
372 (save-excursion
373 ;; Change buffers to get local value of vc-checkout-switches.
374 (if file-buffer (set-buffer file-buffer))
375 (setq switches (vc-switches 'RCS 'checkout))
376 ;; Save this buffer's default-directory
377 ;; and use save-excursion to make sure it is restored
378 ;; in the same buffer it was saved in.
379 (let ((default-directory default-directory))
380 (save-excursion
381 ;; Adjust the default-directory so that the check-out creates
382 ;; the file in the right place.
383 (setq default-directory (file-name-directory file))
384 (let (new-version)
385 ;; if we should go to the head of the trunk,
386 ;; clear the default branch first
387 (and rev (string= rev "")
388 (vc-rcs-set-default-branch file nil))
389 ;; now do the checkout
390 (apply 'vc-do-command
391 nil 0 "co" (vc-name file)
392 ;; If locking is not strict, force to overwrite
393 ;; the writable workfile.
394 (if (eq (vc-checkout-model file) 'implicit) "-f")
395 (if editable "-l")
396 (if (stringp rev)
397 ;; a literal revision was specified
398 (concat "-r" rev)
399 (let ((workrev (vc-workfile-version file)))
400 (if workrev
401 (concat "-r"
402 (if (not rev)
403 ;; no revision specified:
404 ;; use current workfile version
405 workrev
406 ;; REV is t ...
407 (if (not (vc-trunk-p workrev))
408 ;; ... go to head of current branch
409 (vc-branch-part workrev)
410 ;; ... go to head of trunk
411 (vc-rcs-set-default-branch file
412 nil)
413 ""))))))
414 switches)
415 ;; determine the new workfile version
416 (with-current-buffer "*vc*"
417 (setq new-version
418 (vc-parse-buffer "^revision \\([0-9.]+\\).*\n" 1)))
419 (vc-file-setprop file 'vc-workfile-version new-version)
420 ;; if necessary, adjust the default branch
421 (and rev (not (string= rev ""))
422 (vc-rcs-set-default-branch
423 file
424 (if (vc-rcs-latest-on-branch-p file new-version)
425 (if (vc-trunk-p new-version) nil
426 (vc-branch-part new-version))
427 new-version)))))
428 (message "Checking out %s...done" file)))))
430 (defun vc-rcs-revert (file &optional contents-done)
431 "Revert FILE to the version it was based on."
432 (vc-do-command nil 0 "co" (vc-name file) "-f"
433 (concat (if (eq (vc-state file) 'edited) "-u" "-r")
434 (vc-workfile-version file))))
436 (defun vc-rcs-cancel-version (file editable)
437 "Undo the most recent checkin of FILE.
438 EDITABLE non-nil means previous version should be locked."
439 (let* ((target (vc-workfile-version file))
440 (previous (if (vc-trunk-p target) "" (vc-branch-part target)))
441 (config (current-window-configuration))
442 (done nil))
443 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-o" target))
444 ;; Check out the most recent remaining version. If it fails, because
445 ;; the whole branch got deleted, do a double-take and check out the
446 ;; version where the branch started.
447 (while (not done)
448 (condition-case err
449 (progn
450 (vc-do-command nil 0 "co" (vc-name file) "-f"
451 (concat (if editable "-l" "-u") previous))
452 (setq done t))
453 (error (set-buffer "*vc*")
454 (goto-char (point-min))
455 (if (search-forward "no side branches present for" nil t)
456 (progn (setq previous (vc-branch-part previous))
457 (vc-rcs-set-default-branch file previous)
458 ;; vc-do-command popped up a window with
459 ;; the error message. Get rid of it, by
460 ;; restoring the old window configuration.
461 (set-window-configuration config))
462 ;; No, it was some other error: re-signal it.
463 (signal (car err) (cdr err))))))))
465 (defun vc-rcs-merge (file first-version &optional second-version)
466 "Merge changes into current working copy of FILE.
467 The changes are between FIRST-VERSION and SECOND-VERSION."
468 (vc-do-command nil 1 "rcsmerge" (vc-name file)
469 "-kk" ; ignore keyword conflicts
470 (concat "-r" first-version)
471 (if second-version (concat "-r" second-version))))
473 (defun vc-rcs-steal-lock (file &optional rev)
474 "Steal the lock on the current workfile for FILE and revision REV.
475 Needs RCS 5.6.2 or later for -M."
476 (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev))
477 ;; Do a real checkout after stealing the lock, so that we see
478 ;; expanded headers.
479 (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev)))
484 ;;; History functions
487 (defun vc-rcs-print-log (file &optional buffer)
488 "Get change log associated with FILE."
489 (vc-do-command buffer 0 "rlog" (vc-name file)))
491 (defun vc-rcs-diff (file &optional oldvers newvers buffer)
492 "Get a difference report using RCS between two versions of FILE."
493 (if (not oldvers) (setq oldvers (vc-workfile-version file)))
494 (apply 'vc-do-command (or buffer "*vc-diff*") 1 "rcsdiff" file
495 (append (list "-q"
496 (concat "-r" oldvers)
497 (and newvers (concat "-r" newvers)))
498 (vc-switches 'RCS 'diff))))
500 (defun vc-rcs-annotate-command (file buffer &optional revision)
501 "Annotate FILE, inserting the results in BUFFER.
502 Optional arg REVISION is a revision to annotate from."
503 (vc-setup-buffer buffer)
504 ;; Aside from the "head revision on the trunk", the instructions for
505 ;; each revision on the trunk are an ordered list of kill and insert
506 ;; commands necessary to go from the chronologically-following
507 ;; revision to this one. That is, associated with revision N are
508 ;; edits that applied to revision N+1 would result in revision N.
510 ;; On a branch, however, (some) things are inverted: the commands
511 ;; listed are those necessary to go from the chronologically-preceding
512 ;; revision to this one. That is, associated with revision N are
513 ;; edits that applied to revision N-1 would result in revision N.
515 ;; So, to get per-line history info, we apply reverse-chronological
516 ;; edits, starting with the head revision on the trunk, all the way
517 ;; back through the initial revision (typically "1.1" or similar),
518 ;; then apply forward-chronological edits -- keeping track of which
519 ;; revision is associated with each inserted line -- until we reach
520 ;; the desired revision for display (which may be either on the trunk
521 ;; or on a branch).
522 (let* ((tree (with-temp-buffer
523 (insert-file-contents (vc-rcs-registered file))
524 (vc-rcs-parse)))
525 (revisions (cdr (assq 'revisions tree)))
526 ;; The revision N whose instructions we currently are processing.
527 (cur (cdr (assq 'head (cdr (assq 'headers tree)))))
528 ;; Alist from the parse tree for N.
529 (meta (cdr (assoc cur revisions)))
530 ;; Point and temporary string, respectively.
532 ;; "Next-branch list". Nil means the desired revision to
533 ;; display lives on the trunk. Non-nil means it lives on a
534 ;; branch, in which case the value is a list of revision pairs
535 ;; (PARENT . CHILD), the first PARENT being on the trunk, that
536 ;; links each series of revisions in the path from the initial
537 ;; revision to the desired revision to display.
538 nbls
539 ;; "Path-accumulate-predicate plus revision/date/author".
540 ;; Until set, forward-chronological edits are not accumulated.
541 ;; Once set, its value (updated every revision) is used for
542 ;; the text property `:vc-rcs-r/d/a' for inserts during
543 ;; processing of forward-chronological instructions for N.
544 ;; See internal func `r/d/a'.
545 prda
546 ;; List of forward-chronological instructions, each of the
547 ;; form: (POS . ACTION), where POS is a buffer position. If
548 ;; ACTION is a string, it is inserted, otherwise it is taken as
549 ;; the number of characters to be deleted.
550 path
551 ;; N+1. When `cur' is "", this is the initial revision.
552 pre)
553 (unless revision
554 (setq revision cur))
555 (unless (assoc revision revisions)
556 (error "No such revision: %s" revision))
557 ;; Find which branches (if any) must be included in the edits.
558 (let ((par revision)
559 bpt kids)
560 (while (setq bpt (vc-branch-part par)
561 par (vc-branch-part bpt))
562 (setq kids (cdr (assq 'branches (cdr (assoc par revisions)))))
563 ;; A branchpoint may have multiple children. Find the right one.
564 (while (not (string= bpt (vc-branch-part (car kids))))
565 (setq kids (cdr kids)))
566 (push (cons par (car kids)) nbls)))
567 ;; Start with the full text.
568 (set-buffer buffer)
569 (insert (cdr (assq 'text meta)))
570 ;; Apply reverse-chronological edits on the trunk, computing and
571 ;; accumulating forward-chronological edits after some point, for
572 ;; later.
573 (flet ((r/d/a () (vector pre
574 (cdr (assq 'date meta))
575 (cdr (assq 'author meta)))))
576 (while (when (setq pre cur cur (cdr (assq 'next meta)))
577 (not (string= "" cur)))
578 (setq
579 ;; Start accumulating the forward-chronological edits when N+1
580 ;; on the trunk is either the desired revision to display, or
581 ;; the appropriate branchpoint for it. Do this before
582 ;; updating `meta' since `r/d/a' uses N+1's `meta' value.
583 prda (when (or prda (string= (if nbls (caar nbls) revision) pre))
584 (r/d/a))
585 meta (cdr (assoc cur revisions)))
586 ;; Edits in the parse tree specify a line number (in the buffer
587 ;; *BEFORE* editing occurs) to start from, but line numbers
588 ;; change as a result of edits. To DTRT, we apply edits in
589 ;; order of descending buffer position so that edits further
590 ;; down in the buffer occur first w/o corrupting specified
591 ;; buffer positions of edits occurring towards the beginning of
592 ;; the buffer. In this way we avoid using markers. A pleasant
593 ;; property of this approach is ability to push instructions
594 ;; onto `path' directly, w/o need to maintain rev boundaries.
595 (dolist (insn (cdr (assq :insn meta)))
596 (goto-line (pop insn))
597 (setq p (point))
598 (case (pop insn)
599 (k (setq s (buffer-substring-no-properties
600 p (progn (forward-line (car insn))
601 (point))))
602 (when prda
603 (push `(,p . ,(propertize s :vc-rcs-r/d/a prda)) path))
604 (delete-region p (point)))
605 (i (setq s (car insn))
606 (when prda
607 (push `(,p . ,(length s)) path))
608 (insert s)))))
609 ;; For the initial revision, setting `:vc-rcs-r/d/a' directly is
610 ;; equivalent to pushing an insert instruction (of the entire buffer
611 ;; contents) onto `path' then erasing the buffer, but less wasteful.
612 (put-text-property (point-min) (point-max) :vc-rcs-r/d/a (r/d/a))
613 ;; Now apply the forward-chronological edits for the trunk.
614 (dolist (insn path)
615 (goto-char (pop insn))
616 (if (stringp insn)
617 (insert insn)
618 (delete-char insn)))
619 ;; Now apply the forward-chronological edits (directly from the
620 ;; parse-tree) for the branch(es), if necessary. We re-use vars
621 ;; `pre' and `meta' for the sake of internal func `r/d/a'.
622 (while nbls
623 (setq pre (cdr (pop nbls)))
624 (while (progn
625 (setq meta (cdr (assoc pre revisions))
626 prda nil)
627 (dolist (insn (cdr (assq :insn meta)))
628 (goto-line (pop insn))
629 (case (pop insn)
630 (k (delete-region
631 (point) (progn (forward-line (car insn))
632 (point))))
633 (i (insert (propertize
634 (car insn)
635 :vc-rcs-r/d/a
636 (or prda (setq prda (r/d/a))))))))
637 (prog1 (not (string= (if nbls (caar nbls) revision) pre))
638 (setq pre (cdr (assq 'next meta)))))))))
639 ;; Lastly, for each line, insert at bol nicely-formatted history info.
640 ;; We do two passes to collect summary information used to minimize
641 ;; the annotation's usage of screen real-estate: (1) Consider rendered
642 ;; width of revision plus author together as a unit; and (2) Omit
643 ;; author entirely if all authors are the same as the user.
644 (let ((ht (make-hash-table :test 'eq))
645 (me (user-login-name))
646 (maxw 0)
647 (all-me t)
648 rda w a)
649 (goto-char (point-max))
650 (while (not (bobp))
651 (forward-line -1)
652 (setq rda (get-text-property (point) :vc-rcs-r/d/a))
653 (unless (gethash rda ht)
654 (setq a (aref rda 2)
655 all-me (and all-me (string= a me)))
656 (puthash rda (setq w (+ (length (aref rda 0))
657 (length a)))
659 (setq maxw (max w maxw))))
660 (let ((padding (make-string maxw 32)))
661 (flet ((pad (w) (substring-no-properties padding w))
662 (render (rda &rest ls)
663 (propertize
664 (apply 'concat
665 (format-time-string "%Y-%m-%d" (aref rda 1))
667 (aref rda 0)
669 :vc-rcs-r/d/a rda)))
670 (maphash
671 (if all-me
672 (lambda (rda w)
673 (puthash rda (render rda (pad w) ": ") ht))
674 (lambda (rda w)
675 (puthash rda (render rda " " (pad w) " " (aref rda 2) ": ") ht)))
676 ht)))
677 (while (not (eobp))
678 (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht))
679 (forward-line 1))))
681 (defun vc-rcs-annotate-current-time ()
682 "Return the current time, based at midnight of the current day, and
683 encoded as fractional days."
684 (vc-annotate-convert-time
685 (apply 'encode-time 0 0 0 (nthcdr 3 (decode-time (current-time))))))
687 (defun vc-rcs-annotate-time ()
688 "Return the time of the next annotation (as fraction of days)
689 systime, or nil if there is none. Also, reposition point."
690 (unless (eobp)
691 (search-forward ": ")
692 (vc-annotate-convert-time
693 (aref (get-text-property (point) :vc-rcs-r/d/a) 1))))
695 (defun vc-rcs-annotate-extract-revision-at-line ()
696 (aref (get-text-property (point) :vc-rcs-r/d/a) 0))
700 ;;; Snapshot system
703 (defun vc-rcs-assign-name (file name)
704 "Assign to FILE's latest version a given NAME."
705 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-n" name ":")))
709 ;;; Miscellaneous
712 (defun vc-rcs-check-headers ()
713 "Check if the current file has any headers in it."
714 (save-excursion
715 (goto-char (point-min))
716 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
717 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))
719 (defun vc-rcs-clear-headers ()
720 "Implementation of vc-clear-headers for RCS."
721 (let ((case-fold-search nil))
722 (goto-char (point-min))
723 (while (re-search-forward
724 (concat "\\$\\(Author\\|Date\\|Header\\|Id\\|Locker\\|Name\\|"
725 "RCSfile\\|Revision\\|Source\\|State\\): [^$\n]+\\$")
726 nil t)
727 (replace-match "$\\1$"))))
729 (defun vc-rcs-rename-file (old new)
730 ;; Just move the master file (using vc-rcs-master-templates).
731 (vc-rename-master (vc-name old) new vc-rcs-master-templates))
735 ;;; Internal functions
738 (defun vc-rcs-workfile-is-newer (file)
739 "Return non-nil if FILE is newer than its RCS master.
740 This likely means that FILE has been changed with respect
741 to its master version."
742 (let ((file-time (nth 5 (file-attributes file)))
743 (master-time (nth 5 (file-attributes (vc-name file)))))
744 (or (> (nth 0 file-time) (nth 0 master-time))
745 (and (= (nth 0 file-time) (nth 0 master-time))
746 (> (nth 1 file-time) (nth 1 master-time))))))
748 (defun vc-rcs-find-most-recent-rev (branch)
749 "Find most recent revision on BRANCH."
750 (goto-char (point-min))
751 (let ((latest-rev -1) value)
752 (while (re-search-forward (concat "^\\(" (regexp-quote branch)
753 "\\.\\([0-9]+\\)\\)\ndate[ \t]+[0-9.]+;")
754 nil t)
755 (let ((rev (string-to-number (match-string 2))))
756 (when (< latest-rev rev)
757 (setq latest-rev rev)
758 (setq value (match-string 1)))))
759 (or value
760 (vc-branch-part branch))))
762 (defun vc-rcs-fetch-master-state (file &optional workfile-version)
763 "Compute the master file's idea of the state of FILE.
764 If a WORKFILE-VERSION is given, compute the state of that version,
765 otherwise determine the workfile version based on the master file.
766 This function sets the properties `vc-workfile-version' and
767 `vc-checkout-model' to their correct values, based on the master
768 file."
769 (with-temp-buffer
770 (if (or (not (vc-insert-file (vc-name file) "^[0-9]"))
771 (progn (goto-char (point-min))
772 (not (looking-at "^head[ \t\n]+[^;]+;$"))))
773 (error "File %s is not an RCS master file" (vc-name file)))
774 (let ((workfile-is-latest nil)
775 (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1)))
776 (vc-file-setprop file 'vc-rcs-default-branch default-branch)
777 (unless workfile-version
778 ;; Workfile version not known yet. Determine that first. It
779 ;; is either the head of the trunk, the head of the default
780 ;; branch, or the "default branch" itself, if that is a full
781 ;; revision number.
782 (cond
783 ;; no default branch
784 ((or (not default-branch) (string= "" default-branch))
785 (setq workfile-version
786 (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1))
787 (setq workfile-is-latest t))
788 ;; default branch is actually a revision
789 ((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$"
790 default-branch)
791 (setq workfile-version default-branch))
792 ;; else, search for the head of the default branch
793 (t (vc-insert-file (vc-name file) "^desc")
794 (setq workfile-version
795 (vc-rcs-find-most-recent-rev default-branch))
796 (setq workfile-is-latest t)))
797 (vc-file-setprop file 'vc-workfile-version workfile-version))
798 ;; Check strict locking
799 (goto-char (point-min))
800 (vc-file-setprop file 'vc-checkout-model
801 (if (re-search-forward ";[ \t\n]*strict;" nil t)
802 'locking 'implicit))
803 ;; Compute state of workfile version
804 (goto-char (point-min))
805 (let ((locking-user
806 (vc-parse-buffer (concat "^locks[ \t\n]+[^;]*[ \t\n]+\\([^:]+\\):"
807 (regexp-quote workfile-version)
808 "[^0-9.]")
809 1)))
810 (cond
811 ;; not locked
812 ((not locking-user)
813 (if (or workfile-is-latest
814 (vc-rcs-latest-on-branch-p file workfile-version))
815 ;; workfile version is latest on branch
816 'up-to-date
817 ;; workfile version is not latest on branch
818 'needs-patch))
819 ;; locked by the calling user
820 ((and (stringp locking-user)
821 (string= locking-user (vc-user-login-name)))
822 (if (or (eq (vc-checkout-model file) 'locking)
823 workfile-is-latest
824 (vc-rcs-latest-on-branch-p file workfile-version))
825 'edited
826 ;; Locking is not used for the file, but the owner does
827 ;; have a lock, and there is a higher version on the current
828 ;; branch. Not sure if this can occur, and if it is right
829 ;; to use `needs-merge' in this case.
830 'needs-merge))
831 ;; locked by somebody else
832 ((stringp locking-user)
833 locking-user)
835 (error "Error getting state of RCS file")))))))
837 (defun vc-rcs-consult-headers (file)
838 "Search for RCS headers in FILE, and set properties accordingly.
840 Returns: nil if no headers were found
841 'rev if a workfile revision was found
842 'rev-and-lock if revision and lock info was found"
843 (cond
844 ((not (get-file-buffer file)) nil)
845 ((let (status version locking-user)
846 (save-excursion
847 (set-buffer (get-file-buffer file))
848 (goto-char (point-min))
849 (cond
850 ;; search for $Id or $Header
851 ;; -------------------------
852 ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file.
853 ((or (and (search-forward "$Id\ : " nil t)
854 (looking-at "[^ ]+ \\([0-9.]+\\) "))
855 (and (progn (goto-char (point-min))
856 (search-forward "$Header\ : " nil t))
857 (looking-at "[^ ]+ \\([0-9.]+\\) ")))
858 (goto-char (match-end 0))
859 ;; if found, store the revision number ...
860 (setq version (match-string-no-properties 1))
861 ;; ... and check for the locking state
862 (cond
863 ((looking-at
864 (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] " ; date
865 "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time
866 "[^ ]+ [^ ]+ ")) ; author & state
867 (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds
868 (cond
869 ;; unlocked revision
870 ((looking-at "\\$")
871 (setq locking-user 'none)
872 (setq status 'rev-and-lock))
873 ;; revision is locked by some user
874 ((looking-at "\\([^ ]+\\) \\$")
875 (setq locking-user (match-string-no-properties 1))
876 (setq status 'rev-and-lock))
877 ;; everything else: false
878 (nil)))
879 ;; unexpected information in
880 ;; keyword string --> quit
881 (nil)))
882 ;; search for $Revision
883 ;; --------------------
884 ((re-search-forward (concat "\\$"
885 "Revision: \\([0-9.]+\\) \\$")
886 nil t)
887 ;; if found, store the revision number ...
888 (setq version (match-string-no-properties 1))
889 ;; and see if there's any lock information
890 (goto-char (point-min))
891 (if (re-search-forward (concat "\\$" "Locker:") nil t)
892 (cond ((looking-at " \\([^ ]+\\) \\$")
893 (setq locking-user (match-string-no-properties 1))
894 (setq status 'rev-and-lock))
895 ((looking-at " *\\$")
896 (setq locking-user 'none)
897 (setq status 'rev-and-lock))
899 (setq locking-user 'none)
900 (setq status 'rev-and-lock)))
901 (setq status 'rev)))
902 ;; else: nothing found
903 ;; -------------------
904 (t nil)))
905 (if status (vc-file-setprop file 'vc-workfile-version version))
906 (and (eq status 'rev-and-lock)
907 (vc-file-setprop file 'vc-state
908 (cond
909 ((eq locking-user 'none) 'up-to-date)
910 ((string= locking-user (vc-user-login-name)) 'edited)
911 (t locking-user)))
912 ;; If the file has headers, we don't want to query the
913 ;; master file, because that would eliminate all the
914 ;; performance gain the headers brought us. We therefore
915 ;; use a heuristic now to find out whether locking is used
916 ;; for this file. If we trust the file permissions, and the
917 ;; file is not locked, then if the file is read-only we
918 ;; assume that locking is used for the file, otherwise
919 ;; locking is not used.
920 (not (vc-mistrust-permissions file))
921 (vc-up-to-date-p file)
922 (if (string-match ".r-..-..-." (nth 8 (file-attributes file)))
923 (vc-file-setprop file 'vc-checkout-model 'locking)
924 (vc-file-setprop file 'vc-checkout-model 'implicit)))
925 status))))
927 (defun vc-release-greater-or-equal (r1 r2)
928 "Compare release numbers, represented as strings.
929 Release components are assumed cardinal numbers, not decimal fractions
930 \(5.10 is a higher release than 5.9\). Omitted fields are considered
931 lower \(5.6.7 is earlier than 5.6.7.1\). Comparison runs till the end
932 of the string is found, or a non-numeric component shows up \(5.6.7 is
933 earlier than \"5.6.7 beta\", which is probably not what you want in
934 some cases\). This code is suitable for existing RCS release numbers.
935 CVS releases are handled reasonably, too \(1.3 < 1.4* < 1.5\)."
936 (let (v1 v2 i1 i2)
937 (catch 'done
938 (or (and (string-match "^\\.?\\([0-9]+\\)" r1)
939 (setq i1 (match-end 0))
940 (setq v1 (string-to-number (match-string 1 r1)))
941 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
942 (setq i2 (match-end 0))
943 (setq v2 (string-to-number (match-string 1 r2)))
944 (if (> v1 v2) (throw 'done t)
945 (if (< v1 v2) (throw 'done nil)
946 (throw 'done
947 (vc-release-greater-or-equal
948 (substring r1 i1)
949 (substring r2 i2)))))))
950 (throw 'done t)))
951 (or (and (string-match "^\\.?\\([0-9]+\\)" r2)
952 (throw 'done nil))
953 (throw 'done t)))))
955 (defun vc-rcs-release-p (release)
956 "Return t if we have RELEASE or better."
957 (let ((installation (vc-rcs-system-release)))
958 (if (and installation
959 (not (eq installation 'unknown)))
960 (vc-release-greater-or-equal installation release))))
962 (defun vc-rcs-system-release ()
963 "Return the RCS release installed on this system, as a string.
964 Return symbol UNKNOWN if the release cannot be deducted. The user can
965 override this using variable `vc-rcs-release'.
967 If the user has not set variable `vc-rcs-release' and it is nil,
968 variable `vc-rcs-release' is set to the returned value."
969 (or vc-rcs-release
970 (setq vc-rcs-release
971 (or (and (zerop (vc-do-command nil nil "rcs" nil "-V"))
972 (with-current-buffer (get-buffer "*vc*")
973 (vc-parse-buffer "^RCS version \\([0-9.]+ *.*\\)" 1)))
974 'unknown))))
976 (defun vc-rcs-set-non-strict-locking (file)
977 (vc-do-command nil 0 "rcs" file "-U")
978 (vc-file-setprop file 'vc-checkout-model 'implicit)
979 (set-file-modes file (logior (file-modes file) 128)))
981 (defun vc-rcs-set-default-branch (file branch)
982 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-b" branch))
983 (vc-file-setprop file 'vc-rcs-default-branch branch))
985 (defun vc-rcs-parse (&optional buffer)
986 "Parse current buffer, presumed to be in RCS-style masterfile format.
987 Optional arg BUFFER specifies another buffer to parse. Return an alist
988 of two elements, w/ keys `headers' and `revisions' and values in turn
989 sub-alists. For `headers', the values unless otherwise specified are
990 strings and the keys are:
992 desc -- description
993 head -- latest revision
994 branch -- the branch the \"head revision\" lies on;
995 absent if the head revision lies on the trunk
996 access -- ???
997 symbols -- sub-alist of (SYMBOL . REVISION) elements
998 locks -- if file is checked out, something like \"ttn:1.7\"
999 strict -- t if \"strict locking\" is in effect, otherwise nil
1000 comment -- may be absent; typically something like \"# \" or \"; \"
1001 expand -- may be absent; ???
1003 For `revisions', the car is REVISION (string), the cdr a sub-alist,
1004 with string values (unless otherwise specified) and keys:
1006 date -- a time value (like that returned by `encode-time'); as a
1007 special case, a year value less than 100 is augmented by 1900
1008 author -- username
1009 state -- typically \"Exp\" or \"Rel\"
1010 branches -- list of revisions that begin branches from this revision
1011 next -- on the trunk: the chronologically-preceding revision, or \"\";
1012 on a branch: the chronologically-following revision, or \"\"
1013 log -- change log entry
1014 text -- for the head revision on the trunk, the body of the file;
1015 other revisions have `:insn' instead
1016 :insn -- for non-head revisions, a list of parsed instructions
1017 in one of two forms, in both cases START meaning \"first
1018 go to line START\":
1019 - `(START k COUNT)' -- kill COUNT lines
1020 - `(START i TEXT)' -- insert TEXT (a string)
1021 The list is in descending order by START.
1023 The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension."
1024 (setq buffer (get-buffer (or buffer (current-buffer))))
1025 (set-buffer buffer)
1026 ;; An RCS masterfile can be viewed as containing four regular (for the
1027 ;; most part) sections: (a) the "headers", (b) the "rev headers", (c)
1028 ;; the "description" and (d) the "rev bodies", in that order. In the
1029 ;; returned alist (see docstring), elements from (b) and (d) are
1030 ;; combined pairwise to form the "revisions", while those from (a) and
1031 ;; (c) are simply combined to form the "headers".
1033 ;; Loosely speaking, each section contains a series of alternating
1034 ;; "tags" and "printed representations". In the (b) and (d), many
1035 ;; such series can appear, and a revision number on a line by itself
1036 ;; precedes the series of tags and printed representations associated
1037 ;; with it.
1039 ;; In (a) and (b), the printed representations (with the exception of
1040 ;; the `comment' tag in the headers) terminate with a semicolon, which
1041 ;; is NOT part of the "value" finally associated with the tag. All
1042 ;; other printed representations are in "@@-format"; there is an "@",
1043 ;; the middle part (to be translated into the value), another "@" and
1044 ;; a newline. Each "@@" in the middle part indicates the position of
1045 ;; a single "@" (and consequently the requirement of an additional
1046 ;; initial step when translating to the value).
1048 ;; Parser state includes vars that collect parts of the return value...
1049 (let ((desc nil) (headers nil) (revs nil)
1050 ;; ... as well as vars that support a single-pass, tag-assisted,
1051 ;; minimal-data-copying scan. Basically -- skirting around the
1052 ;; grouping by revision required in (b) and (d) -- we repeatedly
1053 ;; and context-sensitively read a tag (that MUST be present),
1054 ;; determine the bounds of the printed representation, translate
1055 ;; it into a value, and push the tag plus value onto one of the
1056 ;; collection vars. Finally, we return the parse tree
1057 ;; incorporating the values of the collection vars (see "rv").
1059 ;; A symbol or string to keep track of context (for error messages).
1060 context
1061 ;; A symbol, the current tag.
1063 ;; Region (begin and end buffer positions) of the printed
1064 ;; representation for the current tag.
1066 ;; A list of buffer positions where "@@" can be found within the
1067 ;; printed representation region. For each location, we push two
1068 ;; elements onto the list, 1+ and 2+ the location, respectively,
1069 ;; with the 2+ appearing at the head. In this way, the expression
1070 ;; `(,e ,@@-holes ,b)
1071 ;; describes regions that can be concatenated (in reverse order)
1072 ;; to "de-@@-format" the printed representation as the first step
1073 ;; to translating it into some value. See internal func `gather'.
1074 @-holes)
1075 (flet ((sw () (skip-chars-forward " \t\n")) ; i.e., `[:space:]'
1076 (at (tag) (save-excursion (eq tag (read buffer))))
1077 (to-eol () (buffer-substring-no-properties
1078 (point) (progn (forward-line 1)
1079 (1- (point)))))
1080 (to-semi () (setq b (point)
1081 e (progn (search-forward ";")
1082 (1- (point)))))
1083 (to-one@ () (setq @-holes nil
1084 b (progn (search-forward "@") (point))
1085 e (progn (while (and (search-forward "@")
1086 (= ?@ (char-after))
1087 (progn
1088 (push (point) @-holes)
1089 (forward-char 1)
1090 (push (point) @-holes))))
1091 (1- (point)))))
1092 (tok+val (set-b+e name &optional proc)
1093 (unless (eq name (setq tok (read buffer)))
1094 (error "Missing `%s' while parsing %s" name context))
1095 (sw)
1096 (funcall set-b+e)
1097 (cons tok (if proc
1098 (funcall proc)
1099 (buffer-substring-no-properties b e))))
1100 (k-semi (name &optional proc) (tok+val 'to-semi name proc))
1101 (gather () (let ((pairs `(,e ,@@-holes ,b))
1102 acc)
1103 (while pairs
1104 (push (buffer-substring-no-properties
1105 (cadr pairs) (car pairs))
1106 acc)
1107 (setq pairs (cddr pairs)))
1108 (apply 'concat acc)))
1109 (k-one@ (name &optional later) (tok+val 'to-one@ name
1110 (if later
1111 (lambda () t)
1112 'gather))))
1113 (save-excursion
1114 (goto-char (point-min))
1115 ;; headers
1116 (setq context 'headers)
1117 (flet ((hpush (name &optional proc)
1118 (push (k-semi name proc) headers)))
1119 (hpush 'head)
1120 (when (at 'branch)
1121 (hpush 'branch))
1122 (hpush 'access)
1123 (hpush 'symbols
1124 (lambda ()
1125 (mapcar (lambda (together)
1126 (let ((two (split-string together ":")))
1127 (setcar two (intern (car two)))
1128 (setcdr two (cadr two))
1129 two))
1130 (split-string
1131 (buffer-substring-no-properties b e)))))
1132 (hpush 'locks))
1133 (push `(strict . ,(when (at 'strict)
1134 (search-forward ";")
1136 headers)
1137 (when (at 'comment)
1138 (push (k-one@ 'comment) headers)
1139 (search-forward ";"))
1140 (when (at 'expand)
1141 (push (k-one@ 'expand) headers)
1142 (search-forward ";"))
1143 (setq headers (nreverse headers))
1144 ;; rev headers
1145 (sw) (setq context 'rev-headers)
1146 (while (looking-at "[0-9]")
1147 (push `(,(to-eol)
1148 ,(k-semi 'date
1149 (lambda ()
1150 (let ((ls (mapcar 'string-to-number
1151 (split-string
1152 (buffer-substring-no-properties
1153 b e)
1154 "\\."))))
1155 ;; Hack the year -- verified to be the
1156 ;; same algorithm used in RCS 5.7.
1157 (when (< (car ls) 100)
1158 (setcar ls (+ 1900 (car ls))))
1159 (apply 'encode-time (nreverse ls)))))
1160 ,@(mapcar 'k-semi '(author state))
1161 ,(k-semi 'branches
1162 (lambda ()
1163 (split-string
1164 (buffer-substring-no-properties b e))))
1165 ,(k-semi 'next))
1166 revs)
1167 (sw))
1168 (setq revs (nreverse revs))
1169 ;; desc
1170 (sw) (setq context 'desc
1171 desc (k-one@ 'desc))
1172 ;; rev bodies
1173 (let (acc
1174 ;; Element of `revs' that initially holds only header info.
1175 ;; "Pairwise combination" occurs when we add body info.
1177 ;; Components of the editing commands (aside from the actual
1178 ;; text) that comprise the `text' printed representations
1179 ;; (not including the "head" revision).
1180 cmd start act
1181 ;; Ascending (reversed) `@-holes' which the internal func
1182 ;; `incg' pops to effect incremental gathering.
1184 ;; Function to extract text (for the `a' command), either
1185 ;; `incg' or `buffer-substring-no-properties'. (This is
1186 ;; for speed; strictly speaking, it is sufficient to use
1187 ;; only the former since it behaves identically to the
1188 ;; latter in the absense of "@@".)
1189 sub)
1190 (flet ((incg (beg end) (let ((b beg) (e end) @-holes)
1191 (while (and asc (< (car asc) e))
1192 (push (pop asc) @-holes))
1193 ;; Self-deprecate when work is done.
1194 ;; Folding many dimensions into one.
1195 ;; Thanks B.Mandelbrot, for complex sum.
1196 ;; O beauteous math! --the Unvexed Bum
1197 (unless asc
1198 (setq sub 'buffer-substring-no-properties))
1199 (gather))))
1200 (while (and (sw)
1201 (not (eobp))
1202 (setq context (to-eol)
1203 rev (or (assoc context revs)
1204 (error "Rev `%s' has body but no head"
1205 context))))
1206 (push (k-one@ 'log) (cdr rev))
1207 ;; For rev body `text' tags, delay translation slightly...
1208 (push (k-one@ 'text t) (cdr rev))
1209 ;; ... until we decide which tag and value is appropriate to
1210 ;; collect. For the "head" revision, compute the value of the
1211 ;; `text' printed representation by simple `gather'. For all
1212 ;; other revisions, replace the `text' tag+value with `:insn'
1213 ;; plus value, always scanning in-place.
1214 (if (string= context (cdr (assq 'head headers)))
1215 (setcdr (cadr rev) (gather))
1216 (if @-holes
1217 (setq asc (nreverse @-holes)
1218 sub 'incg)
1219 (setq sub 'buffer-substring-no-properties))
1220 (goto-char b)
1221 (setq acc nil)
1222 (while (< (point) e)
1223 (forward-char 1)
1224 (setq cmd (char-before)
1225 start (read (current-buffer))
1226 act (read (current-buffer)))
1227 (forward-char 1)
1228 (push (case cmd
1230 ;; `d' means "delete lines".
1231 ;; For Emacs spirit, we use `k' for "kill".
1232 `(,start k ,act))
1234 ;; `a' means "append after this line" but
1235 ;; internally we normalize it so that START
1236 ;; specifies the actual line for insert, thus
1237 ;; requiring less hair in the realization algs.
1238 ;; For Emacs spirit, we use `i' for "insert".
1239 `(,(1+ start) i
1240 ,(funcall sub (point) (progn (forward-line act)
1241 (point)))))
1242 (t (error "Bad command `%c' in `text' for rev `%s'"
1243 cmd context)))
1244 acc))
1245 (goto-char (1+ e))
1246 (setcar (cdr rev) (cons :insn acc)))))))
1247 ;; rv
1248 `((headers ,desc ,@headers)
1249 (revisions ,@revs)))))
1251 (provide 'vc-rcs)
1253 ;; arch-tag: 759b4916-5b0d-431d-b647-b185b8c652cf
1254 ;;; vc-rcs.el ends here