1 ;;; pcvs.el --- a front-end to CVS
3 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4 ;; 2000, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
6 ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
7 ;; (Per Cederqvist) ceder@lysator.liu.se
8 ;; (Greg A. Woods) woods@weird.com
9 ;; (Jim Blandy) jimb@cyclic.com
10 ;; (Karl Fogel) kfogel@floss.red-bean.com
11 ;; (Jim Kingdon) kingdon@cyclic.com
12 ;; (Stefan Monnier) monnier@cs.yale.edu
13 ;; (Greg Klanderman) greg@alphatech.com
14 ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com
15 ;; Maintainer: (Stefan Monnier) monnier@gnu.org
16 ;; Keywords: CVS, version control, release management
18 ;; This file is part of GNU Emacs.
20 ;; GNU Emacs is free software; you can redistribute it and/or modify
21 ;; it under the terms of the GNU General Public License as published by
22 ;; the Free Software Foundation; either version 2, or (at your option)
25 ;; GNU Emacs is distributed in the hope that it will be useful,
26 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
27 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28 ;; GNU General Public License for more details.
30 ;; You should have received a copy of the GNU General Public License
31 ;; along with GNU Emacs; see the file COPYING. If not, write to the
32 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
33 ;; Boston, MA 02111-1307, USA.
37 ;; PCL-CVS is a front-end to the CVS version control system. For people
38 ;; familiar with VC, it is somewhat like VC-dired: it presents the status of
39 ;; all the files in your working area and allows you to commit/update several
40 ;; of them at a time. Compared to VC-dired, it is considerably better and
41 ;; faster (but only for CVS).
43 ;; PCL-CVS was originally written by Per Cederqvist many years ago. This
44 ;; version derives from the XEmacs-21 version, itself based on the 2.0b2
45 ;; version (last release from Per). It is a thorough rework.
47 ;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only
48 ;; for VC-dired. As such, I've tried to make PCL-CVS and VC interoperate
49 ;; seamlessly (I also use VC).
51 ;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'.
52 ;; There is a TeXinfo manual, which can be helpful to get started.
56 ;; - Extracting an old version seems not to recognize encoding correctly.
57 ;; That's probably because it's done via a process rather than a file.
61 ;; ******** FIX THE DOCUMENTATION *********
63 ;; - rework the displaying of error messages.
64 ;; - allow to flush messages only
65 ;; - allow to protect files like ChangeLog from flushing
66 ;; - automatically cvs-mode-insert files from find-file-hook
67 ;; (and don't flush them as long as they are visited)
68 ;; - query the user for cvs-get-marked (for some cmds or if nothing's selected)
69 ;; - don't return the first (resp last) FI if the cursor is before
71 ;; - allow cvs-confirm-removals to force always confirmation.
72 ;; - cvs-checkout should ask for a revision (with completion).
73 ;; - removal confirmation should allow specifying another file name.
75 ;; - hide fileinfos without getting rid of them (will require ewok work).
76 ;; - add toolbar entries
78 ;; marking directories should jump to just after the dir.
79 ;; allow (un)marking directories at a time with the mouse.
80 ;; allow cvs-cmd-do to either clear the marks or not.
81 ;; add a "marks active" notion, like transient-mark-mode does.
82 ;; - liveness indicator
83 ;; - indicate in docstring if the cmd understands the `b' prefix(es).
84 ;; - call smerge-mode when opening CONFLICT files.
85 ;; - have vc-checkin delegate to cvs-mode-commit when applicable
86 ;; - higher-level CVS operations
89 ;; - module-level commands
90 ;; add support for parsing 'modules' file ("cvs co -c")
95 ;; C-u M-x cvs-checkout should ask for a cvsroot
96 ;; cvs-mode-handle-new-vendor-version
97 ;; - checks out module, or alternately does update join
98 ;; - does "cvs -n tag LAST_VENDOR" to find old files into *cvs*
100 ;; (with completion on tag names and hooks to help generate full releases)
101 ;; - display stickiness information. And current CVS/Tag as well.
102 ;; - write 'cvs-mode-admin' to do arbitrary 'cvs admin' commands
103 ;; Most interesting would be version removal and log message replacement.
104 ;; The last one would be neat when called from log-view-mode.
105 ;; - cvs-mode-incorporate
106 ;; It would merge in the status from one *cvs* buffer into another.
107 ;; This would be used to populate such a buffer that had been created with
108 ;; a `cvs {update,status,checkout} -l'.
109 ;; - cvs-mode-(i)diff-other-{file,buffer,cvs-buffer}
110 ;; - offer the choice to kill the process when the user kills the cvs buffer.
111 ;; right now, it's killed without further ado.
112 ;; - make `cvs-mode-ignore' allow manually entering a pattern.
113 ;; to which dir should it apply ?
114 ;; - cvs-mode-ignore should try to remove duplicate entries.
115 ;; - maybe poll/check CVS/Entries files to react to external `cvs' commands ?
116 ;; - some kind of `cvs annotate' support ?
117 ;; but vc-annotate can be used instead.
118 ;; - proper `g' that passes safe args and uses either cvs-status or cvs-examine
119 ;; maybe also use cvs-update depending on I-don't-know-what.
120 ;; - add message-levels so that we can hide some levels of messages
124 (eval-when-compile (require 'cl
))
125 (require 'ewoc
) ;Ewoc was once cookie
128 (require 'pcvs-parse
)
136 (defvar cvs-cookies
) ;;nil
137 ;;"Handle for the cookie structure that is displayed in the *cvs* buffer.")
138 ;;(make-variable-buffer-local 'cvs-cookies)
141 ;;;; Dynamically scoped variables
144 (defvar cvs-from-vc nil
"Bound to t inside VC advice.")
150 (defun cvs-defaults (&rest defs
)
151 (let ((defs (cvs-first defs cvs-shared-start
)))
153 (make-list (- cvs-shared-start
(length defs
)) (car defs
))
156 ;; For cvs flags, we need to add "-f" to override the cvsrc settings
157 ;; we also want to evict the annoying -q and -Q options that hide useful
158 ;; information from pcl-cvs.
159 (cvs-flags-define cvs-cvs-flags
'(("-f")))
161 (cvs-flags-define cvs-checkout-flags
(cvs-defaults '("-P")))
162 (cvs-flags-define cvs-status-flags
(cvs-defaults '("-v") nil
))
163 (cvs-flags-define cvs-log-flags
(cvs-defaults nil
))
164 (cvs-flags-define cvs-diff-flags
(cvs-defaults '("-u" "-N") '("-c" "-N") '("-u" "-b")))
165 (cvs-flags-define cvs-tag-flags
(cvs-defaults nil
))
166 (cvs-flags-define cvs-add-flags
(cvs-defaults nil
))
167 (cvs-flags-define cvs-commit-flags
(cvs-defaults nil
))
168 (cvs-flags-define cvs-remove-flags
(cvs-defaults nil
))
169 ;;(cvs-flags-define cvs-undo-flags (cvs-defaults nil))
170 (cvs-flags-define cvs-update-flags
(cvs-defaults '("-d" "-P")))
172 (defun cvs-reread-cvsrc ()
173 "Reset the default arguments to those in the `cvs-cvsrc-file'."
177 (insert-file-contents cvs-cvsrc-file
)
179 (dolist (cmd '("cvs" "checkout" "status" "log" "diff" "tag"
180 "add" "commit" "remove" "update"))
181 (goto-char (point-min))
182 (when (re-search-forward
183 (concat "^" cmd
"\\(\\s-+\\(.*\\)\\)?$") nil t
)
184 (let* ((sym (intern (concat "cvs-" cmd
"-flags")))
185 (val (cvs-string->strings
(or (match-string 2) ""))))
186 (cvs-flags-set sym
0 val
))))
187 ;; ensure that cvs doesn't have -q or -Q
188 (cvs-flags-set 'cvs-cvs-flags
0
191 (lambda (x) (member x
'("-q" "-Q" "-f")))
192 (cvs-flags-query 'cvs-cvs-flags
196 ;; initialize to cvsrc's default values
201 ;;;; Mouse bindings and mode motion
204 (defvar cvs-minor-current-files
)
207 "Popup the CVS menu."
209 (let ((cvs-minor-current-files
210 (list (ewoc-data (ewoc-locate
211 cvs-cookies
(posn-point (event-end e
)))))))
212 (popup-menu cvs-menu e
)))
214 (defvar cvs-mode-line-process nil
215 "Mode-line control for displaying info on cvs process status.")
219 ;;;; Query-Type-Descriptor for Tags
222 (autoload 'cvs-status-get-tags
"cvs-status")
223 (defun cvs-tags-list ()
224 "Return a list of acceptable tags, ready for completions."
225 (assert (cvs-buffer-p))
226 (let ((marked (cvs-get-marked)))
227 (list* '("BASE") '("HEAD")
230 (call-process cvs-program
232 t
;output to current-buffer
233 nil
;don't update display while running
236 (cvs-fileinfo->full-path
(car marked
)))
237 (goto-char (point-min))
238 (let ((tags (cvs-status-get-tags)))
239 (when (listp tags
) tags
)))))))
241 (defvar cvs-tag-history nil
)
242 (defconst cvs-qtypedesc-tag
243 (cvs-qtypedesc-create 'identity
'identity
'cvs-tags-list
'cvs-tag-history
))
247 (defun cvs-mode! (&optional -cvs-mode
!-fun
)
248 "Switch to the *cvs* buffer.
249 If -CVS-MODE!-FUN is provided, it is executed *cvs* being the current buffer
250 and with its window selected. Else, the *cvs* buffer is simply selected.
251 -CVS-MODE!-FUN is called interactively if applicable and else with no argument."
252 (let* ((-cvs-mode!-buf
(current-buffer))
253 (cvsbuf (cond ((cvs-buffer-p) (current-buffer))
254 ((and cvs-buffer
(cvs-buffer-p cvs-buffer
)) cvs-buffer
)
255 (t (error "can't find the *cvs* buffer"))))
256 (-cvs-mode!-wrapper cvs-minor-wrap-function
)
257 (-cvs-mode!-cont
(lambda ()
259 (if (commandp -cvs-mode
!-fun
)
260 (call-interactively -cvs-mode
!-fun
)
261 (funcall -cvs-mode
!-fun
))))))
262 (if (not -cvs-mode
!-fun
) (set-buffer cvsbuf
)
263 (let ((cvs-mode!-buf
(current-buffer))
264 (cvs-mode!-owin
(selected-window))
265 (cvs-mode!-nwin
(get-buffer-window cvsbuf
'visible
)))
269 (when cvs-mode
!-nwin
(select-window cvs-mode
!-nwin
))
270 (if -cvs-mode
!-wrapper
271 (funcall -cvs-mode
!-wrapper -cvs-mode
!-buf -cvs-mode
!-cont
)
272 (funcall -cvs-mode
!-cont
)))
273 (set-buffer cvs-mode
!-buf
)
274 (when (and cvs-mode
!-nwin
(eq cvs-mode
!-nwin
(selected-window)))
275 ;; the selected window has not been changed by FUN
276 (select-window cvs-mode
!-owin
)))))))
282 (defvar cvs-branches
(list cvs-vendor-branch
"HEAD" "HEAD"))
283 (cvs-prefix-define cvs-branch-prefix
284 "Current selected branch."
286 (cons cvs-vendor-branch cvs-branches
)
289 (defun cvs-set-branch-prefix (arg)
290 "Set the branch prefix to take action at the next command.
291 See `cvs-prefix-set' for a further the description of the behavior.
292 \\[universal-argument] 1 selects the vendor branch
293 and \\[universal-argument] 2 selects the HEAD."
296 (cvs-prefix-set 'cvs-branch-prefix arg
))
298 (defun cvs-add-branch-prefix (flags &optional arg
)
299 "Add branch selection argument if the branch prefix was set.
300 The argument is added (or not) to the list of FLAGS and is constructed
301 by appending the branch to ARG which defaults to \"-r\"."
302 (let ((branch (cvs-prefix-get 'cvs-branch-prefix
)))
303 ;; deactivate the secondary prefix, even if not used.
304 (cvs-prefix-get 'cvs-secondary-branch-prefix
)
305 (if branch
(cons (concat (or arg
"-r") branch
) flags
) flags
)))
307 (cvs-prefix-define cvs-secondary-branch-prefix
308 "Current secondary selected branch."
310 (cons cvs-vendor-branch cvs-branches
)
313 (defun cvs-set-secondary-branch-prefix (arg)
314 "Set the branch prefix to take action at the next command.
315 See `cvs-prefix-set' for a further the description of the behavior.
316 \\[universal-argument] 1 selects the vendor branch
317 and \\[universal-argument] 2 selects the HEAD."
320 (cvs-prefix-set 'cvs-secondary-branch-prefix arg
))
322 (defun cvs-add-secondary-branch-prefix (flags &optional arg
)
323 "Add branch selection argument if the secondary branch prefix was set.
324 The argument is added (or not) to the list of FLAGS and is constructed
325 by appending the branch to ARG which defaults to \"-r\".
326 Since the `cvs-secondary-branch-prefix' is only active if the primary
327 prefix is active, it is important to read the secondary prefix before
328 the primay since reading the primary can deactivate it."
329 (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix
'read-only
)
330 (cvs-prefix-get 'cvs-secondary-branch-prefix
))))
331 (if branch
(cons (concat (or arg
"-r") branch
) flags
) flags
)))
335 (define-minor-mode cvs-minor-mode
336 "This mode is used for buffers related to a main *cvs* buffer.
337 All the `cvs-mode' buffer operations are simply rebound under
338 the \\[cvs-mode-map] prefix."
341 (put 'cvs-minor-mode
'permanent-local t
)
344 (defvar cvs-temp-buffers nil
)
345 (defun cvs-temp-buffer (&optional cmd normal nosetup
)
346 "Create a temporary buffer to run CMD in.
347 If CMD is a string, use it to lookup `cvs-buffer-name-alist' to find
348 the buffer name to be used and its `major-mode'.
350 The selected window will not be changed. The new buffer will not maintain undo
351 information and will be read-only unless NORMAL is non-nil. It will be emptied
352 \(unless NOSETUP is non-nil\) and its `default-directory' will be inherited
353 from the current buffer."
354 (let* ((cvs-buf (current-buffer))
355 (info (cdr (assoc cmd cvs-buffer-name-alist
)))
356 (name (eval (nth 0 info
)))
358 (dir default-directory
)
360 (name (cvs-get-buffer-create name
))
361 ((and (bufferp cvs-temp-buffer
) (buffer-name cvs-temp-buffer
))
364 (set (make-local-variable 'cvs-temp-buffer
)
365 (cvs-get-buffer-create
366 (eval cvs-temp-buffer-name
) 'noreuse
))))))
368 ;; handle the potential pre-existing process
369 (let ((proc (get-buffer-process buf
)))
370 (when (and (not normal
) (processp proc
)
371 (memq (process-status proc
) '(run stop
)))
373 ;; When CMD is specified, the buffer is normally shown to the
374 ;; user, so interrupting the process is not harmful.
375 ;; Use `delete-process' rather than `kill-process' otherwise
376 ;; the pending output of the process will still get inserted
377 ;; after we erase the buffer.
378 (delete-process proc
)
379 (error "Can not run two cvs processes simultaneously"))))
381 (if (not name
) (kill-local-variable 'other-window-scroll-buffer
)
382 ;; Strangely, if no window is created, `display-buffer' ends up
383 ;; doing a `switch-to-buffer' which does a `set-buffer', hence
384 ;; the need for `save-excursion'.
385 (unless nosetup
(save-excursion (display-buffer buf
)))
386 ;; FIXME: this doesn't do the right thing if the user later on
387 ;; does a `find-file-other-window' and `scroll-other-window'
388 (set (make-local-variable 'other-window-scroll-buffer
) buf
))
390 (add-to-list 'cvs-temp-buffers buf
)
392 (with-current-buffer buf
393 (setq buffer-read-only nil
)
394 (setq default-directory dir
)
395 (unless nosetup
(erase-buffer))
396 (set (make-local-variable 'cvs-buffer
) cvs-buf
)
398 (let ((lbd list-buffers-directory
))
399 (if (fboundp mode
) (funcall mode
) (fundamental-mode))
400 (when lbd
(set (make-local-variable 'list-buffers-directory
) lbd
)))
402 ;;(set (make-local-variable 'cvs-buffer) cvs-buf)
404 (setq buffer-read-only t
)
405 (buffer-disable-undo))
408 (defun cvs-mode-kill-buffers ()
409 "Kill all the \"temporary\" buffers created by the *cvs* buffer."
411 (dolist (buf cvs-temp-buffers
) (ignore-errors (kill-buffer buf
))))
413 (defun cvs-make-cvs-buffer (dir &optional new
)
414 "Create the *cvs* buffer for directory DIR.
415 If non-nil, NEW means to create a new buffer no matter what."
416 ;; the real cvs-buffer creation
417 (setq dir
(cvs-expand-dir-name dir
))
418 (let* ((buffer-name (eval cvs-buffer-name
))
421 (eq cvs-reuse-cvs-buffer
'current
)
422 (cvs-buffer-p) ;reuse the current buffer if possible
424 ;; look for another cvs buffer visiting the same directory
427 (dolist (buffer (cons (current-buffer) (buffer-list)))
430 (case cvs-reuse-cvs-buffer
433 (or (cvs-string-prefix-p default-directory dir
)
434 (cvs-string-prefix-p dir default-directory
)))
435 (samedir (string= default-directory dir
)))
437 ;; we really have to create a new buffer:
438 ;; we temporarily bind cwd to "" to prevent
439 ;; create-file-buffer from using directory info
440 ;; unless it is explicitly in the cvs-buffer-name.
441 (cvs-get-buffer-create buffer-name new
))))
442 (with-current-buffer buffer
444 (and (string= dir default-directory
) (cvs-buffer-p)
447 (cvs-cleanup-collection cvs-cookies nil nil t
)
449 ;; setup from scratch
451 (setq default-directory dir
)
452 (setq buffer-read-only nil
)
454 (insert "Repository : " (directory-file-name (cvs-get-cvsroot))
455 "\nModule : " (cvs-get-module)
456 "\nWorking dir: " (abbreviate-file-name dir
)
457 (if (not (file-readable-p "CVS/Tag")) "\n"
458 (let ((tag (cvs-file-to-string "CVS/Tag")))
460 ((string-match "\\`T" tag
)
461 (concat "\nTag : " (substring tag
1)))
462 ((string-match "\\`D" tag
)
463 (concat "\nDate : " (substring tag
1)))
466 (setq buffer-read-only t
)
468 (set (make-local-variable 'list-buffers-directory
) buffer-name
)
469 ;;(set (make-local-variable 'cvs-temp-buffer) (cvs-temp-buffer))
470 (let ((cookies (ewoc-create 'cvs-fileinfo-pp
"\n" "")))
471 (set (make-local-variable 'cvs-cookies
) cookies
)
472 (add-hook 'kill-buffer-hook
474 (ignore-errors (kill-buffer cvs-temp-buffer
)))
479 (defun* cvs-cmd-do
(cmd dir flags fis new
480 &key cvsargs noexist dont-change-disc noshow
)
481 (let* ((dir (file-name-as-directory
482 (abbreviate-file-name (expand-file-name dir
))))
483 (cvsbuf (cvs-make-cvs-buffer dir new
)))
484 ;; Check that dir is under CVS control.
485 (unless (file-directory-p dir
)
486 (error "%s is not a directory" dir
))
487 (unless (or noexist
(file-directory-p (expand-file-name "CVS" dir
))
488 (file-expand-wildcards (expand-file-name "*/CVS" dir
)))
489 (error "%s does not contain CVS controlled files" dir
))
492 (cvs-mode-run cmd flags fis
493 :cvsargs cvsargs
:dont-change-disc dont-change-disc
)
496 (let ((pop-up-windows nil
)) (pop-to-buffer cvsbuf
)))))
497 ;; (funcall (if (and (boundp 'pop-up-frames) pop-up-frames)
498 ;; 'pop-to-buffer 'switch-to-buffer)
501 (defun cvs-run-process (args fis postprocess
&optional single-dir
)
502 (assert (cvs-buffer-p cvs-buffer
))
504 (let ((procbuf (current-buffer))
506 (single-dir (or single-dir
(eq cvs-execute-single-dir t
))))
509 (goto-char (point-max))
510 (unless (bolp) (let ((inhibit-read-only t
)) (insert "\n")))
511 ;; find the set of files we'll process in this round
512 (let* ((dir+files
+rest
513 (if (or (null fis
) (not single-dir
))
514 ;; not single-dir mode: just process the whole thing
515 (list "" (mapcar 'cvs-fileinfo-
>full-path fis
) nil
)
516 ;; single-dir mode: extract the same-dir-elements
517 (let ((dir (cvs-fileinfo->dir
(car fis
))))
518 ;; output the concerned dir so the parser can translate paths
519 (let ((inhibit-read-only t
))
520 (insert "pcl-cvs: descending directory " dir
"\n"))
521 ;; loop to find the same-dir-elems
522 (do* ((files () (cons (cvs-fileinfo->file fi
) files
))
524 (fi (car fis
) (car fis
)))
525 ((not (and fis
(string= dir
(cvs-fileinfo->dir fi
))))
526 (list dir files fis
))))))
527 (dir (nth 0 dir
+files
+rest
))
528 (files (nth 1 dir
+files
+rest
))
529 (rest (nth 2 dir
+files
+rest
)))
531 ;; setup the (current) process buffer
532 (set (make-local-variable 'cvs-postprocess
)
534 ;; this is the last invocation
536 ;; else, we have to register ourselves to be rerun on the rest
537 `(cvs-run-process ',args
',rest
',postprocess
',single-dir
)))
538 (add-hook 'kill-buffer-hook
540 (let ((proc (get-buffer-process (current-buffer))))
541 (when (processp proc
)
542 (set-process-filter proc nil
)
543 (set-process-sentinel proc nil
)
544 (delete-process proc
))))
547 ;; create the new process and setup the procbuffer correspondingly
548 (let* ((args (append (cvs-flags-query 'cvs-cvs-flags nil
'noquery
)
549 (if cvs-cvsroot
(list "-d" cvs-cvsroot
))
552 ;; If process-connection-type is nil and the repository
553 ;; is accessed via SSH, a bad interaction between libc,
554 ;; CVS and SSH can lead to garbled output.
555 ;; It might be a glibc-specific problem (but it also happens
556 ;; under Mac OS X, it seems).
557 ;; Until the problem is cleared, we'll use a pty rather than
559 ;; (process-connection-type nil) ; Use a pipe, not a pty.
561 ;; the process will be run in the selected dir
562 (let ((default-directory (cvs-expand-dir-name dir
)))
563 (apply 'start-process
"cvs" procbuf cvs-program args
))))
564 (set-process-sentinel process
'cvs-sentinel
)
565 (set-process-filter process
'cvs-update-filter
)
566 (set-marker (process-mark process
) (point-max))
567 (ignore-errors (process-send-eof process
)) ;close its stdin to avoid hangs
569 ;; now finish setting up the cvs-buffer
571 (setq cvs-mode-line-process
(symbol-name (process-status process
)))
572 (force-mode-line-update)))))
574 ;; The following line is said to improve display updates on some
575 ;; emacsen. It shouldn't be needed, but it does no harm.
578 (defun cvs-header-msg (args fis
)
580 (args (mapcar (lambda (arg)
582 ;; filter out the largish commit message
583 ((and (eq lastarg nil
) (string= arg
"commit"))
584 (setq lastarg
'commit
) arg
)
585 ((and (eq lastarg
'commit
) (string= arg
"-m"))
586 (setq lastarg
'-m
) arg
)
588 (setq lastarg
'done
) "<log message>")
589 ;; filter out the largish `admin -mrev:msg' message
590 ((and (eq lastarg nil
) (string= arg
"admin"))
591 (setq lastarg
'admin
) arg
)
592 ((and (eq lastarg
'admin
)
593 (string-match "\\`-m[^:]*:" arg
))
595 (concat (match-string 0 arg
) "<log message>"))
596 ;; Keep the rest as is.
599 (concat cvs-program
" "
601 (append (cvs-flags-query 'cvs-cvs-flags nil
'noquery
)
602 (if cvs-cvsroot
(list "-d" cvs-cvsroot
))
604 (mapcar 'cvs-fileinfo-
>full-path fis
))))))
606 (defun cvs-update-header (cmd add
)
607 (let* ((hf (ewoc-get-hf cvs-cookies
))
610 (tin (ewoc-nth cvs-cookies
0)))
611 (if (eq (length str
) 1) (setq str
""))
612 ;; look for the first *real* fileinfo (to determine emptyness)
615 (memq (cvs-fileinfo->type
(ewoc-data tin
))
616 '(MESSAGE DIRCHANGE
)))
617 (setq tin
(ewoc-next cvs-cookies tin
)))
619 (setq str
(concat "-- Running " cmd
" ...\n" str
))
620 (if (not (string-match
621 (concat "^-- Running " (regexp-quote cmd
) " \\.\\.\\.\n") str
))
622 (error "Internal PCL-CVS error while removing message")
623 (setq str
(replace-match "" t t str
))
624 (if (zerop (length str
)) (setq str
"\n"))
625 (setq done
(concat "-- last cmd: " cmd
" --"))))
626 ;; set the new header and footer
627 (ewoc-set-hf cvs-cookies
628 str
(concat "\n--------------------- "
629 (if tin
"End" "Empty")
630 " ---------------------\n"
634 (defun cvs-sentinel (proc msg
)
635 "Sentinel for the cvs update process.
636 This is responsible for parsing the output from the cvs update when
638 (when (memq (process-status proc
) '(signal exit
))
639 (if (null (buffer-name (process-buffer proc
)))
640 ;;(set-process-buffer proc nil)
641 (error "cvs' process buffer was killed")
642 (let* ((obuf (current-buffer))
643 (procbuffer (process-buffer proc
)))
644 (set-buffer (with-current-buffer procbuffer cvs-buffer
))
645 (setq cvs-mode-line-process
(symbol-name (process-status proc
)))
646 (force-mode-line-update)
647 (set-buffer procbuffer
)
648 (let ((cvs-postproc cvs-postprocess
))
649 ;; Since the buffer and mode line will show that the
650 ;; process is dead, we can delete it now. Otherwise it
651 ;; will stay around until M-x list-processes.
652 (delete-process proc
)
653 (setq cvs-postprocess nil
)
654 ;; do the postprocessing like parsing and such
655 (save-excursion (eval cvs-postproc
))
656 ;; check whether something is left
657 (unless cvs-postprocess
658 ;; IIRC, we enable undo again once the process is finished
659 ;; for cases where the output was inserted in *vc-diff* or
660 ;; in a file-like buffer. -stef
662 (with-current-buffer cvs-buffer
663 (message "CVS process has completed in %s" (buffer-name)))))
664 ;; This might not even be necessary
665 (set-buffer obuf
)))))
667 (defun cvs-parse-process (dcd &optional subdir old-fis
)
668 "Parse the output of a cvs process.
669 DCD is the `dont-change-disc' flag to use when parsing that output.
670 SUBDIR is the subdirectory (if any) where this command was run.
671 OLD-FIS is the list of fileinfos on which the cvs command was applied and
672 which should be considered up-to-date if they are missing from the output."
673 (when (eq system-type
'darwin
)
674 ;; Fixup the ^D^H^H inserted at beginning of buffer sometimes on MacOSX
675 ;; because of the call to `process-send-eof'.
677 (goto-char (point-min))
678 (while (re-search-forward "^\\^D\b+" nil t
)
679 (let ((inhibit-read-only t
))
680 (delete-region (match-beginning 0) (match-end 0))))))
681 (let* ((fileinfos (cvs-parse-buffer 'cvs-parse-table dcd subdir
))
683 (with-current-buffer cvs-buffer
684 ;; Expand OLD-FIS to actual files.
687 (setq fis
(if (eq (cvs-fileinfo->type fi
) 'DIRCHANGE
)
688 (nconc (ewoc-collect cvs-cookies
'cvs-dir-member-p
689 (cvs-fileinfo->dir fi
))
693 ;; Drop OLD-FIS which were already up-to-date.
696 (unless (eq (cvs-fileinfo->type fi
) 'UP-TO-DATE
) (push fi fis
)))
698 ;; Add the new fileinfos to the ewoc.
699 (dolist (fi fileinfos
)
700 (setq last
(cvs-addto-collection cvs-cookies fi last
))
701 ;; This FI was in the output, so remove it from OLD-FIS.
702 (setq old-fis
(delq (ewoc-data last
) old-fis
)))
703 ;; Process the "silent output" (i.e. absence means up-to-date).
705 (setf (cvs-fileinfo->type fi
) 'UP-TO-DATE
)
706 (setq last
(cvs-addto-collection cvs-cookies fi last
)))
707 (setq fileinfos
(nconc old-fis fileinfos
))
708 ;; Clean up the ewoc as requested by the user.
709 (cvs-cleanup-collection cvs-cookies
710 (eq cvs-auto-remove-handled t
)
711 cvs-auto-remove-directories
713 ;; Revert buffers if necessary.
714 (when (and cvs-auto-revert
(not dcd
) (not cvs-from-vc
))
715 (cvs-revert-if-needed fileinfos
)))))
717 (defmacro defun-cvs-mode
(fun args docstring interact
&rest body
)
718 "Define a function to be used in a *cvs* buffer.
719 This will look for a *cvs* buffer and execute BODY in it.
720 Since the interactive arguments might need to be queried after
721 switching to the *cvs* buffer, the generic code is rather ugly,
722 but luckily we can often use simpler alternatives.
724 FUN can be either a symbol (i.e. STYLE is nil) or a cons (FUN . STYLE).
725 ARGS and DOCSTRING are the normal argument list.
726 INTERACT is the interactive specification or nil for non-commands.
728 STYLE can be either SIMPLE, NOARGS or DOUBLE. It's an error for it
729 to have any other value, unless other details of the function make it
730 clear what alternative to use.
731 - SIMPLE will get all the interactive arguments from the original buffer.
732 - NOARGS will get all the arguments from the *cvs* buffer and will
733 always behave as if called interactively.
734 - DOUBLE is the generic case."
735 (declare (debug (&define sexp lambda-list stringp
("interactive" interactive
) def-body
)))
736 (let ((style (cvs-cdr fun
))
739 ;; a trivial interaction, no need to move it
740 ((or (eq style
'SIMPLE
)
741 (null (nth 1 interact
))
742 (stringp (nth 1 interact
)))
743 `(defun ,fun
,args
,docstring
,interact
744 (cvs-mode! (lambda () ,@body
))))
746 ;; fun is only called interactively: move all the args to the inner fun
748 `(defun ,fun
() ,docstring
(interactive)
749 (cvs-mode! (lambda ,args
,interact
,@body
))))
753 (string-match ".*" docstring
)
754 (let ((line1 (match-string 0 docstring
))
755 (fun-1 (intern (concat (symbol-name fun
) "-1"))))
758 ,(concat docstring
"\nThis function only works within a *cvs* buffer.
759 For interactive use, use `" (symbol-name fun
) "' instead.")
763 ,(concat line1
"\nWrapper function that switches to a *cvs* buffer
764 before calling the real function `" (symbol-name fun-1
) "'.\n")
766 (cvs-mode! ',fun-1
)))))
768 (t (error "Unknown style %s in `defun-cvs-mode'" style
)))))
770 (defun-cvs-mode cvs-mode-kill-process
()
771 "Kill the temporary buffer and associated process."
773 (when (and (bufferp cvs-temp-buffer
) (buffer-name cvs-temp-buffer
))
774 (let ((proc (get-buffer-process cvs-temp-buffer
)))
775 (when proc
(delete-process proc
)))))
778 ;; Maintaining the collection in the face of updates
781 (defun cvs-addto-collection (c fi
&optional tin
)
782 "Add FI to C and return FI's corresponding tin.
783 FI is inserted in its proper place or maybe even merged with a preexisting
784 fileinfo if applicable.
785 TIN specifies an optional starting point."
786 (unless tin
(setq tin
(ewoc-nth c
0)))
787 (while (and tin
(cvs-fileinfo< fi
(ewoc-data tin
)))
788 (setq tin
(ewoc-prev c tin
)))
789 (if (null tin
) (ewoc-enter-first c fi
) ;empty collection
790 (assert (not (cvs-fileinfo< fi
(ewoc-data tin
))))
791 (let ((next-tin (ewoc-next c tin
)))
792 (while (not (or (null next-tin
)
793 (cvs-fileinfo< fi
(ewoc-data next-tin
))))
794 (setq tin next-tin next-tin
(ewoc-next c next-tin
)))
795 (if (or (cvs-fileinfo< (ewoc-data tin
) fi
)
796 (eq (cvs-fileinfo->type fi
) 'MESSAGE
))
797 ;; tin < fi < next-tin
798 (ewoc-enter-after c tin fi
)
800 (cvs-fileinfo-update (ewoc-data tin
) fi
)
801 (ewoc-invalidate c tin
)
802 ;; Move cursor back to where it belongs.
803 (when (bolp) (cvs-move-to-goal-column))
806 (defcustom cvs-cleanup-functions nil
807 "Functions to tweak the cleanup process.
808 The functions are called with a single argument (a FILEINFO) and should
809 return a non-nil value if that fileinfo should be removed."
811 :type
'(hook :options
(cvs-cleanup-removed)))
813 (defun cvs-cleanup-removed (fi)
814 "Non-nil if FI has been cvs-removed but still exists.
815 This is intended for use on `cvs-cleanup-functions' when you have cvs-removed
816 automatically generated files (which should hence not be under CVS control)
817 but can't commit the removal because the repository's owner doesn't understand
819 (and (or (eq (cvs-fileinfo->type fi
) 'REMOVED
)
820 (and (eq (cvs-fileinfo->type fi
) 'CONFLICT
)
821 (eq (cvs-fileinfo->subtype fi
) 'REMOVED
)))
822 (file-exists-p (cvs-fileinfo->full-path fi
))))
824 ;; called at the following times:
825 ;; - postparse ((eq cvs-auto-remove-handled t) cvs-auto-remove-directories nil)
826 ;; - pre-run ((eq cvs-auto-remove-handled 'delayed) nil t)
827 ;; - remove-handled (t (or cvs-auto-remove-directories 'handled) t)
828 ;; - cvs-cmd-do (nil nil t)
829 ;; - post-ignore (nil nil nil)
830 ;; - acknowledge (nil nil nil)
831 ;; - remove (nil nil nil)
832 (defun cvs-cleanup-collection (c rm-handled rm-dirs rm-msgs
)
833 "Remove undesired entries.
835 RM-HANDLED if non-nil means remove handled entries.
836 RM-DIRS behaves like `cvs-auto-remove-directories'.
837 RM-MSGS if non-nil means remove messages."
838 (let (last-fi first-dir
(rerun t
))
842 (setq last-fi
(cvs-create-fileinfo 'DEAD
"../" "" "")) ;place-holder
845 (let* ((type (cvs-fileinfo->type fi
))
846 (subtype (cvs-fileinfo->subtype fi
))
849 ;; remove temp messages and keep the others
850 (MESSAGE (not (or rm-msgs
(eq subtype
'TEMP
))))
854 (UP-TO-DATE (not rm-handled
))
856 (t (not (run-hook-with-args-until-success
857 'cvs-cleanup-functions fi
))))))
859 ;; mark dirs for removal
860 (when (and keep rm-dirs
861 (eq (cvs-fileinfo->type last-fi
) 'DIRCHANGE
)
862 (not (when first-dir
(setq first-dir nil
) t
))
863 (or (eq rm-dirs
'all
)
864 (not (cvs-string-prefix-p
865 (cvs-fileinfo->dir last-fi
)
866 (cvs-fileinfo->dir fi
)))
867 (and (eq type
'DIRCHANGE
) (eq rm-dirs
'empty
))
868 (eq subtype
'FOOTER
)))
869 (setf (cvs-fileinfo->type last-fi
) 'DEAD
)
871 (when keep
(setq last-fi fi
)))))
872 ;; remove empty last dir
875 (eq (cvs-fileinfo->type last-fi
) 'DIRCHANGE
))
876 (setf (cvs-fileinfo->type last-fi
) 'DEAD
)
879 (defun cvs-get-cvsroot ()
880 "Gets the CVSROOT for DIR."
881 (let ((cvs-cvsroot-file (expand-file-name "Root" "CVS")))
882 (or (cvs-file-to-string cvs-cvsroot-file t
)
887 (defun cvs-get-module ()
888 "Return the current CVS module.
889 This usually doesn't really work but is a handy initval in a prompt."
890 (let* ((repfile (expand-file-name "Repository" "CVS"))
891 (rep (cvs-file-to-string repfile t
)))
894 ((not (file-name-absolute-p rep
)) rep
)
896 (let* ((root (cvs-get-cvsroot))
897 (str (concat (file-name-as-directory (or root
"/")) " || " rep
)))
898 (if (and root
(string-match "\\(.*\\) || \\1\\(.*\\)\\'" str
))
900 (file-name-nondirectory rep
)))))))
905 ;;;; running a "cvs checkout".
909 (defun cvs-checkout (modules dir flags
)
910 "Run a 'cvs checkout MODULES' in DIR.
911 Feed the output to a *cvs* buffer, display it in the current window,
912 and run `cvs-mode' on it.
914 With a prefix argument, prompt for cvs FLAGS to use."
916 (list (cvs-string->strings
(read-string "Module(s): " (cvs-get-module)))
917 (read-directory-name "CVS Checkout Directory: "
918 nil default-directory nil
)
919 (cvs-add-branch-prefix
920 (cvs-flags-query 'cvs-checkout-flags
"cvs checkout flags"))))
922 (setf flags
(cvs-flags-query 'cvs-checkout-flags nil
'noquery
)))
923 (cvs-cmd-do "checkout" (or dir default-directory
)
924 (append flags modules
) nil
'new
927 (defun-cvs-mode (cvs-mode-checkout . NOARGS
) (dir)
928 "Run cvs checkout against the current branch.
929 The files are stored to DIR."
931 (let* ((branch (cvs-prefix-get 'cvs-branch-prefix
))
932 (prompt (format "CVS Checkout Directory for `%s%s': "
934 (if branch
(format " (branch: %s)" branch
)
936 (list (read-directory-name prompt nil default-directory nil
))))
937 (let ((modules (cvs-string->strings
(cvs-get-module)))
938 (flags (cvs-add-branch-prefix
939 (cvs-flags-query 'cvs-checkout-flags
"cvs checkout flags")))
940 (cvs-cvsroot (cvs-get-cvsroot)))
941 (cvs-checkout modules dir flags
)))
944 ;;;; The code for running a "cvs update" and friends in various ways.
947 (defun-cvs-mode (cvs-mode-revert-buffer . SIMPLE
)
948 (&optional ignore-auto noconfirm
)
949 "Rerun `cvs-examine' on the current directory with the default flags."
951 (cvs-examine default-directory t
))
953 (defun cvs-query-directory (msg)
954 ;; last-command-char = ?\r hints that the command was run via M-x
955 (if (and (cvs-buffer-p)
956 (not current-prefix-arg
)
957 (not (eq last-command-char ?
\r)))
959 (read-directory-name msg nil default-directory nil
)))
962 (defun cvs-quickdir (dir &optional flags noshow
)
963 "Open a *cvs* buffer on DIR without running cvs.
964 With a prefix argument, prompt for a directory to use.
965 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]),
966 prevents reuse of an existing *cvs* buffer.
967 Optional argument NOSHOW if non-nil means not to display the buffer.
969 (interactive (list (cvs-query-directory "CVS quickdir (directory): ")))
970 ;; FIXME: code duplication with cvs-cmd-do and cvs-parse-process
971 (let* ((dir (file-name-as-directory
972 (abbreviate-file-name (expand-file-name dir
))))
973 (new (> (prefix-numeric-value current-prefix-arg
) 8))
974 (cvsbuf (cvs-make-cvs-buffer dir new
))
976 ;; Check that dir is under CVS control.
977 (unless (file-directory-p dir
)
978 (error "%s is not a directory" dir
))
979 (unless (file-directory-p (expand-file-name "CVS" dir
))
980 (error "%s does not contain CVS controlled files" dir
))
982 (dolist (fi (cvs-fileinfo-from-entries ""))
983 (setq last
(cvs-addto-collection cvs-cookies fi last
)))
984 (cvs-cleanup-collection cvs-cookies
985 (eq cvs-auto-remove-handled t
)
986 cvs-auto-remove-directories
989 (let ((pop-up-windows nil
)) (pop-to-buffer cvsbuf
)))))
992 (defun cvs-examine (directory flags
&optional noshow
)
993 "Run a `cvs -n update' in the specified DIRECTORY.
994 That is, check what needs to be done, but don't change the disc.
995 Feed the output to a *cvs* buffer and run `cvs-mode' on it.
996 With a prefix argument, prompt for a directory and cvs FLAGS to use.
997 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]),
998 prevents reuse of an existing *cvs* buffer.
999 Optional argument NOSHOW if non-nil means not to display the buffer."
1000 (interactive (list (cvs-query-directory "CVS Examine (directory): ")
1001 (cvs-flags-query 'cvs-update-flags
"cvs -n update flags")))
1003 (setf flags
(cvs-flags-query 'cvs-update-flags nil
'noquery
)))
1004 (when find-file-visit-truename
(setq directory
(file-truename directory
)))
1005 (cvs-cmd-do "update" directory flags nil
1006 (> (prefix-numeric-value current-prefix-arg
) 8)
1009 :dont-change-disc t
))
1013 (defun cvs-update (directory flags
)
1014 "Run a `cvs update' in the current working DIRECTORY.
1015 Feed the output to a *cvs* buffer and run `cvs-mode' on it.
1016 With a \\[universal-argument] prefix argument, prompt for a directory to use.
1017 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]),
1018 prevents reuse of an existing *cvs* buffer.
1019 The prefix is also passed to `cvs-flags-query' to select the FLAGS
1021 (interactive (list (cvs-query-directory "CVS Update (directory): ")
1022 (cvs-flags-query 'cvs-update-flags
"cvs update flags")))
1024 (setf flags
(cvs-flags-query 'cvs-update-flags nil
'noquery
)))
1025 (cvs-cmd-do "update" directory flags nil
1026 (> (prefix-numeric-value current-prefix-arg
) 8)))
1030 (defun cvs-status (directory flags
&optional noshow
)
1031 "Run a `cvs status' in the current working DIRECTORY.
1032 Feed the output to a *cvs* buffer and run `cvs-mode' on it.
1033 With a prefix argument, prompt for a directory and cvs FLAGS to use.
1034 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]),
1035 prevents reuse of an existing *cvs* buffer.
1036 Optional argument NOSHOW if non-nil means not to display the buffer."
1037 (interactive (list (cvs-query-directory "CVS Status (directory): ")
1038 (cvs-flags-query 'cvs-status-flags
"cvs status flags")))
1040 (setf flags
(cvs-flags-query 'cvs-status-flags nil
'noquery
)))
1041 (cvs-cmd-do "status" directory flags nil
1042 (> (prefix-numeric-value current-prefix-arg
) 8)
1043 :noshow noshow
:dont-change-disc t
))
1045 (defun cvs-update-filter (proc string
)
1046 "Filter function for pcl-cvs.
1047 This function gets the output that CVS sends to stdout. It inserts
1048 the STRING into (process-buffer PROC) but it also checks if CVS is waiting
1049 for a lock file. If so, it inserts a message cookie in the *cvs* buffer."
1051 (with-current-buffer (process-buffer proc
)
1052 (let ((inhibit-read-only t
))
1054 ;; Insert the text, moving the process-marker.
1055 (goto-char (process-mark proc
))
1057 (set-marker (process-mark proc
) (point))
1058 ;; FIXME: Delete any old lock message
1059 ;;(if (tin-nth cookies 1)
1060 ;; (tin-delete cookies
1061 ;; (tin-nth cookies 1)))
1062 ;; Check if CVS is waiting for a lock.
1063 (beginning-of-line 0) ;Move to beginning of last complete line.
1064 (when (looking-at "^[ a-z]+: \\(.*waiting for .*lock in \\(.*\\)\\)$")
1065 (let ((msg (match-string 1))
1066 (lock (match-string 2)))
1067 (with-current-buffer cvs-buffer
1068 (set (make-local-variable 'cvs-lock-file
) lock
)
1069 ;; display the lock situation in the *cvs* buffer:
1072 (cvs-create-fileinfo
1075 (when (file-exists-p lock
)
1076 (substitute-command-keys
1077 "\n\t(type \\[cvs-mode-delete-lock] to delete it)")))
1079 (pop-to-buffer (current-buffer))
1080 (goto-char (point-max))
1085 ;;;; The cvs-mode and its associated commands.
1088 (cvs-prefix-define cvs-force-command
"" "" '("/F") cvs-qtypedesc-string1
)
1089 (defun-cvs-mode cvs-mode-force-command
(arg)
1090 "Force the next cvs command to operate on all the selected files.
1091 By default, cvs commands only operate on files on which the command
1092 \"makes sense\". This overrides the safety feature on the next cvs command.
1093 It actually behaves as a toggle. If prefixed by \\[universal-argument] \\[universal-argument],
1094 the override will persist until the next toggle."
1096 (cvs-prefix-set 'cvs-force-command arg
))
1098 (put 'cvs-mode
'mode-class
'special
)
1099 (define-derived-mode cvs-mode nil
"CVS"
1100 "Mode used for PCL-CVS, a frontend to CVS.
1101 Full documentation is in the Texinfo file."
1102 (setq mode-line-process
1103 '("" cvs-force-command cvs-ignore-marks-modif
1104 ":" (cvs-branch-prefix
1105 ("" cvs-branch-prefix
(cvs-secondary-branch-prefix
1106 ("->" cvs-secondary-branch-prefix
))))
1107 " " cvs-mode-line-process
))
1108 (if buffer-file-name
1109 (error "Use M-x cvs-quickdir to get a *cvs* buffer."))
1110 (buffer-disable-undo)
1111 ;;(set (make-local-variable 'goal-column) cvs-cursor-column)
1112 (set (make-local-variable 'revert-buffer-function
) 'cvs-mode-revert-buffer
)
1113 (setq truncate-lines t
)
1114 (cvs-prefix-make-local 'cvs-branch-prefix
)
1115 (cvs-prefix-make-local 'cvs-secondary-branch-prefix
)
1116 (cvs-prefix-make-local 'cvs-force-command
)
1117 (cvs-prefix-make-local 'cvs-ignore-marks-modif
)
1118 (make-local-variable 'cvs-mode-line-process
)
1119 (make-local-variable 'cvs-temp-buffers
))
1122 (defun cvs-buffer-p (&optional buffer
)
1123 "Return whether the (by default current) BUFFER is a `cvs-mode' buffer."
1125 (if buffer
(set-buffer buffer
))
1126 (and (eq major-mode
'cvs-mode
))))
1128 (defun cvs-buffer-check ()
1129 "Check that the current buffer follows cvs-buffer's conventions."
1130 (let ((buf (current-buffer))
1132 (or (and (setq check
'collection
)
1133 (eq (ewoc-buffer cvs-cookies
) buf
)
1134 (setq check
'cvs-temp-buffer
)
1135 (or (null cvs-temp-buffer
)
1136 (null (buffer-name cvs-temp-buffer
))
1137 (and (eq (with-current-buffer cvs-temp-buffer cvs-buffer
) buf
)
1138 (equal (with-current-buffer cvs-temp-buffer
1140 default-directory
)))
1142 (error "Inconsistent %s in buffer %s" check
(buffer-name buf
)))))
1145 (defun cvs-mode-quit ()
1146 "Quit PCL-CVS, killing the *cvs* buffer."
1148 (and (y-or-n-p "Quit pcl-cvs? ") (kill-buffer (current-buffer))))
1153 "Display help for various PCL-CVS commands."
1155 (if (eq last-command
'cvs-help
)
1156 (describe-function 'cvs-mode
) ; would need minor-mode for log-edit-mode
1158 (substitute-command-keys
1159 "`\\[cvs-help]':help `\\[cvs-mode-add]':add `\\[cvs-mode-commit]':commit \
1160 `\\[cvs-mode-diff-map]':diff* `\\[cvs-mode-log]':log \
1161 `\\[cvs-mode-remove]':remove `\\[cvs-mode-status]':status \
1162 `\\[cvs-mode-undo]':undo"))))
1164 ;; Move around in the buffer
1166 (defun cvs-move-to-goal-column ()
1167 (let* ((eol (line-end-position))
1168 (fpos (next-single-property-change (point) 'cvs-goal-column nil eol
)))
1172 (defun-cvs-mode cvs-mode-previous-line
(arg)
1173 "Go to the previous line.
1174 If a prefix argument is given, move by that many lines."
1176 (ewoc-goto-prev cvs-cookies arg
)
1177 (cvs-move-to-goal-column))
1179 (defun-cvs-mode cvs-mode-next-line
(arg)
1180 "Go to the next line.
1181 If a prefix argument is given, move by that many lines."
1183 (ewoc-goto-next cvs-cookies arg
)
1184 (cvs-move-to-goal-column))
1190 (defun-cvs-mode cvs-mode-mark
(&optional arg
)
1191 "Mark the fileinfo on the current line.
1192 If the fileinfo is a directory, all the contents of that directory are
1193 marked instead. A directory can never be marked."
1195 (let* ((tin (ewoc-locate cvs-cookies
))
1196 (fi (ewoc-data tin
)))
1197 (if (eq (cvs-fileinfo->type fi
) 'DIRCHANGE
)
1198 ;; it's a directory: let's mark all files inside
1201 (when (cvs-dir-member-p f dir
)
1202 (setf (cvs-fileinfo->marked f
)
1203 (not (if (eq arg
'toggle
) (cvs-fileinfo->marked f
) arg
)))
1204 t
)) ;Tell cookie to redisplay this cookie.
1206 (cvs-fileinfo->dir fi
))
1207 ;; not a directory: just do the obvious
1208 (setf (cvs-fileinfo->marked fi
)
1209 (not (if (eq arg
'toggle
) (cvs-fileinfo->marked fi
) arg
)))
1210 (ewoc-invalidate cvs-cookies tin
)
1211 (cvs-mode-next-line 1))))
1213 (defalias 'cvs-mouse-toggle-mark
'cvs-mode-toggle-mark
)
1214 (defun cvs-mode-toggle-mark (e)
1215 "Toggle the mark of the entry at point."
1216 (interactive (list last-input-event
))
1218 (posn-set-point (event-end e
))
1219 (cvs-mode-mark 'toggle
)))
1221 (defun-cvs-mode cvs-mode-unmark
()
1222 "Unmark the fileinfo on the current line."
1226 (defun-cvs-mode cvs-mode-mark-all-files
()
1229 (ewoc-map (lambda (cookie)
1230 (unless (eq (cvs-fileinfo->type cookie
) 'DIRCHANGE
)
1231 (setf (cvs-fileinfo->marked cookie
) t
)))
1234 (defun-cvs-mode (cvs-mode-mark-on-state . SIMPLE
) (state)
1235 "Mark all files in state STATE."
1243 (cvs-mode-marked nil nil
:read-only t
:one t
:noquery t
))))
1249 "Mark files in state" (if default
(concat " [" default
"]")) ": ")
1251 (list (downcase (symbol-name (car x
)))))
1253 nil t nil nil default
))))))
1254 (ewoc-map (lambda (fi)
1255 (when (eq (cvs-fileinfo->type fi
) state
)
1256 (setf (cvs-fileinfo->marked fi
) t
)))
1259 (defun-cvs-mode cvs-mode-mark-matching-files
(regex)
1260 "Mark all files matching REGEX."
1261 (interactive "sMark files matching: ")
1262 (ewoc-map (lambda (cookie)
1263 (when (and (not (eq (cvs-fileinfo->type cookie
) 'DIRCHANGE
))
1264 (string-match regex
(cvs-fileinfo->file cookie
)))
1265 (setf (cvs-fileinfo->marked cookie
) t
)))
1268 (defun-cvs-mode cvs-mode-unmark-all-files
()
1270 Directories are also unmarked, but that doesn't matter, since
1271 they should always be unmarked."
1273 (ewoc-map (lambda (cookie)
1274 (setf (cvs-fileinfo->marked cookie
) nil
)
1278 (defun-cvs-mode cvs-mode-unmark-up
()
1279 "Unmark the file on the previous line."
1281 (let ((tin (ewoc-goto-prev cvs-cookies
1)))
1283 (setf (cvs-fileinfo->marked
(ewoc-data tin
)) nil
)
1284 (ewoc-invalidate cvs-cookies tin
)))
1285 (cvs-move-to-goal-column))
1287 (defconst cvs-ignore-marks-alternatives
1288 '(("toggle-marks" .
"/TM")
1289 ("force-marks" .
"/FM")
1290 ("ignore-marks" .
"/IM")))
1292 (cvs-prefix-define cvs-ignore-marks-modif
1293 "Prefix to decide whether to ignore marks or not."
1295 (mapcar 'cdr cvs-ignore-marks-alternatives
)
1296 (cvs-qtypedesc-create
1297 (lambda (str) (cdr (assoc str cvs-ignore-marks-alternatives
)))
1298 (lambda (obj) (car (rassoc obj cvs-ignore-marks-alternatives
)))
1299 (lambda () cvs-ignore-marks-alternatives
)
1302 (defun-cvs-mode cvs-mode-toggle-marks
(arg)
1303 "Toggle whether the next CVS command uses marks.
1304 See `cvs-prefix-set' for further description of the behavior.
1305 \\[universal-argument] 1 selects `force-marks',
1306 \\[universal-argument] 2 selects `ignore-marks',
1307 \\[universal-argument] 3 selects `toggle-marks'."
1309 (cvs-prefix-set 'cvs-ignore-marks-modif arg
))
1311 (defun cvs-ignore-marks-p (cmd &optional read-only
)
1312 (let ((default (if (member cmd cvs-invert-ignore-marks
)
1313 (not cvs-default-ignore-marks
)
1314 cvs-default-ignore-marks
))
1315 (modif (cvs-prefix-get 'cvs-ignore-marks-modif read-only
)))
1317 ((equal modif
"/IM") t
)
1318 ((equal modif
"/TM") (not default
))
1319 ((equal modif
"/FM") nil
)
1322 (defun cvs-mode-mark-get-modif (cmd)
1323 (if (cvs-ignore-marks-p cmd
'read-only
) "/IM" "/FM"))
1325 (defun cvs-get-marked (&optional ignore-marks ignore-contents
)
1326 "Return a list of all selected fileinfos.
1327 If there are any marked tins, and IGNORE-MARKS is nil, return them.
1328 Otherwise, if the cursor selects a directory, and IGNORE-CONTENTS is
1329 nil, return all files in it, else return just the directory.
1330 Otherwise return (a list containing) the file the cursor points to, or
1331 an empty list if it doesn't point to a file at all."
1333 (dolist (fi (if (and (boundp 'cvs-minor-current-files
)
1334 (consp cvs-minor-current-files
))
1337 (if (cvs-fileinfo-p f
) f
1338 (let ((f (file-relative-name f
)))
1339 (if (file-directory-p f
)
1340 (cvs-create-fileinfo
1341 'DIRCHANGE
(file-name-as-directory f
) "." "")
1342 (let ((dir (file-name-directory f
))
1343 (file (file-name-nondirectory f
)))
1344 (cvs-create-fileinfo
1345 'UNKNOWN
(or dir
"") file
""))))))
1346 cvs-minor-current-files
)
1347 (or (and (not ignore-marks
)
1348 (ewoc-collect cvs-cookies
'cvs-fileinfo-
>marked
))
1349 (list (ewoc-data (ewoc-locate cvs-cookies
))))))
1351 (if (or ignore-contents
(not (eq (cvs-fileinfo->type fi
) 'DIRCHANGE
)))
1353 ;; If a directory is selected, return members, if any.
1355 (append (ewoc-collect
1356 cvs-cookies
'cvs-dir-member-p
(cvs-fileinfo->dir fi
))
1360 (defun* cvs-mode-marked
(filter &optional cmd
1361 &key read-only one file noquery
)
1362 "Get the list of marked FIS.
1363 CMD is used to determine whether to use the marks or not.
1364 Only files for which FILTER is applicable are returned.
1365 If READ-ONLY is non-nil, the current toggling is left intact.
1366 If ONE is non-nil, marks are ignored and a single FI is returned.
1367 If FILE is non-nil, directory entries won't be selected."
1368 (unless cmd
(setq cmd
(symbol-name filter
)))
1369 (let* ((fis (cvs-get-marked (or one
(cvs-ignore-marks-p cmd read-only
))
1371 (cvs-applicable-p 'DIRCHANGE filter
))))
1372 (force (cvs-prefix-get 'cvs-force-command
))
1373 (fis (car (cvs-partition
1374 (lambda (fi) (cvs-applicable-p fi
(and (not force
) filter
)))
1376 (when (and (or (null fis
) (and one
(cdr fis
))) (not noquery
))
1377 (message (if (null fis
)
1378 "`%s' is not applicable to any of the selected files."
1379 "`%s' is only applicable to a single file.") cmd
)
1381 (setq fis
(list (cvs-insert-file
1382 (read-file-name (format "File to %s: " cmd
))))))
1383 (if one
(car fis
) fis
)))
1385 (defun cvs-enabledp (filter)
1386 "Determine whether FILTER applies to at least one of the selected files."
1387 (ignore-errors (cvs-mode-marked filter nil
:read-only t
:noquery t
)))
1389 (defun cvs-mode-files (&rest -cvs-mode-files-args
)
1392 (mapcar 'cvs-fileinfo-
>full-path
1393 (apply 'cvs-mode-marked -cvs-mode-files-args
)))))
1396 ;; Interface between Log-Edit and PCL-CVS
1399 (defun cvs-mode-commit-setup ()
1400 "Run `cvs-mode-commit' with setup."
1402 (cvs-mode-commit 'force
))
1404 (defcustom cvs-mode-commit-hook nil
1405 "Hook run after setting up the commit buffer."
1407 :options
'(cvs-mode-diff)
1410 (defun cvs-mode-commit (setup)
1411 "Check in all marked files, or the current file.
1412 The user will be asked for a log message in a buffer.
1413 The buffer's mode and name is determined by the \"message\" setting
1414 of `cvs-buffer-name-alist'.
1415 The POSTPROC specified there (typically `log-edit') is then called,
1416 passing it the SETUP argument."
1418 ;; It seems that the save-excursion that happens if I use the better
1419 ;; form of `(cvs-mode! (lambda ...))' screws up a couple things which
1420 ;; end up being rather annoying (like log-edit-mode's message being
1421 ;; displayed in the wrong minibuffer).
1423 (let ((buf (cvs-temp-buffer "message" 'normal
'nosetup
))
1424 (lbd list-buffers-directory
)
1425 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist
)))
1427 (funcall setupfun
'cvs-do-commit setup
'cvs-commit-filelist buf
)
1428 (set (make-local-variable 'cvs-minor-wrap-function
) 'cvs-commit-minor-wrap
)
1429 (set (make-local-variable 'list-buffers-directory
) lbd
)
1430 (run-hooks 'cvs-mode-commit-hook
)))
1432 (defun cvs-commit-minor-wrap (buf f
)
1433 (let ((cvs-ignore-marks-modif (cvs-mode-mark-get-modif "commit")))
1436 (defun cvs-commit-filelist ()
1437 (cvs-mode-files 'commit nil
:read-only t
:file t
:noquery t
))
1439 (defun cvs-do-commit (flags)
1440 "Do the actual commit, using the current buffer as the log message."
1441 (interactive (list (cvs-flags-query 'cvs-commit-flags
"cvs commit flags")))
1442 (let ((msg (buffer-substring-no-properties (point-min) (point-max))))
1444 ;;(pop-to-buffer cvs-buffer)
1445 (cvs-mode-do "commit" (list* "-m" msg flags
) 'commit
)))
1448 ;;;; Editing existing commit log messages.
1450 (defun cvs-edit-log-text-at-point ()
1453 (when (re-search-backward "^revision " nil t
)
1455 (if (looking-at "date:") (forward-line 1))
1456 (if (looking-at "branches:") (forward-line 1))
1459 (if (re-search-forward
1460 "^\\(-\\{28\\}\\|=\\{77\\}\\|revision [.0-9]+\\)$"
1465 (defvar cvs-edit-log-revision
)
1466 (defun cvs-mode-edit-log (rev &optional text
)
1467 "Edit the log message at point.
1468 This is best called from a `log-view-mode' buffer."
1471 (or (cvs-mode! (lambda () (cvs-prefix-get 'cvs-branch-prefix
)))
1472 (read-string "Revision to edit: "))
1473 (cvs-edit-log-text-at-point)))
1474 ;; It seems that the save-excursion that happens if I use the better
1475 ;; form of `(cvs-mode! (lambda ...))' screws up a couple things which
1476 ;; end up being rather annoying (like log-edit-mode's message being
1477 ;; displayed in the wrong minibuffer).
1479 (let ((buf (cvs-temp-buffer "message" 'normal
'nosetup
))
1480 (lbd list-buffers-directory
)
1481 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist
)))
1483 (funcall setupfun
'cvs-do-edit-log nil
'cvs-edit-log-filelist buf
)
1484 (when text
(erase-buffer) (insert text
))
1485 (set (make-local-variable 'cvs-edit-log-revision
) rev
)
1486 (set (make-local-variable 'cvs-minor-wrap-function
) 'cvs-edit-log-minor-wrap
)
1487 (set (make-local-variable 'list-buffers-directory
) lbd
)
1488 ;; (run-hooks 'cvs-mode-commit-hook)
1491 (defun cvs-edit-log-minor-wrap (buf f
)
1492 (let ((cvs-ignore-marks-modif (cvs-mode-mark-get-modif "commit")))
1495 (defun cvs-edit-log-filelist ()
1496 (cvs-mode-files nil nil
:read-only t
:file t
:noquery t
))
1498 (defun cvs-do-edit-log (rev)
1499 "Do the actual commit, using the current buffer as the log message."
1500 (interactive (list cvs-edit-log-revision
))
1501 (let ((msg (buffer-substring-no-properties (point-min) (point-max))))
1503 (cvs-mode-do "admin" (list (concat "-m" rev
":" msg
)) nil
)))
1507 ;;;; CVS Mode commands
1510 (defun-cvs-mode (cvs-mode-insert . NOARGS
) (file)
1511 "Insert an entry for a specific file into the current listing.
1512 This is typically used if the file is up-to-date (or has been added
1513 outside of PCL-CVS) and one wants to do some operation on it."
1515 (list (read-file-name
1517 ;; Can't use ignore-errors here because interactive
1518 ;; specs aren't byte-compiled.
1520 (file-name-as-directory
1523 (cvs-mode-marked nil nil
:read-only t
:one t
:noquery t
))))
1525 (cvs-insert-file file
))
1527 (defun cvs-insert-file (file)
1528 "Insert FILE (and its contents if it's a dir) and return its FI."
1529 (let ((file (file-relative-name (directory-file-name file
))) last
)
1530 (dolist (fi (cvs-fileinfo-from-entries file
))
1531 (setq last
(cvs-addto-collection cvs-cookies fi last
)))
1532 ;; There should have been at least one entry.
1533 (goto-char (ewoc-location last
))
1536 (defun cvs-mark-fis-dead (fis)
1537 ;; Helper function, introduced because of the need for macro-expansion.
1539 (setf (cvs-fileinfo->type fi
) 'DEAD
)))
1541 (defun-cvs-mode (cvs-mode-add . SIMPLE
) (flags)
1542 "Add marked files to the cvs repository.
1543 With prefix argument, prompt for cvs flags."
1544 (interactive (list (cvs-flags-query 'cvs-add-flags
"cvs add flags")))
1545 (let ((fis (cvs-mode-marked 'add
))
1546 (needdesc nil
) (dirs nil
))
1547 ;; find directories and look for fis needing a description
1550 ((file-directory-p (cvs-fileinfo->full-path fi
)) (push fi dirs
))
1551 ((eq (cvs-fileinfo->type fi
) 'UNKNOWN
) (setq needdesc t
))))
1552 ;; prompt for description if necessary
1553 (let* ((msg (if (and needdesc
1554 (or current-prefix-arg
(not cvs-add-default-message
)))
1555 (read-from-minibuffer "Enter description: ")
1556 (or cvs-add-default-message
"")))
1557 (flags (list* "-m" msg flags
))
1559 ;; setup postprocessing for the directory entries
1561 `((cvs-run-process (list "-n" "update")
1563 '(cvs-parse-process t
))
1564 (cvs-mark-fis-dead ',dirs
)))))
1565 (cvs-mode-run "add" flags fis
:postproc postproc
))))
1567 (defun-cvs-mode (cvs-mode-diff . DOUBLE
) (flags)
1568 "Diff the selected files against the repository.
1569 This command compares the files in your working area against the
1570 revision which they are based upon."
1572 (list (cvs-add-branch-prefix
1573 (cvs-add-secondary-branch-prefix
1574 (cvs-flags-query 'cvs-diff-flags
"cvs diff flags")))))
1575 (cvs-mode-do "diff" flags
'diff
1576 :show t
)) ;; :ignore-exit t
1578 (defun-cvs-mode (cvs-mode-diff-head . SIMPLE
) (flags)
1579 "Diff the selected files against the head of the current branch.
1580 See ``cvs-mode-diff'' for more info."
1581 (interactive (list (cvs-flags-query 'cvs-diff-flags
"cvs diff flags")))
1582 (cvs-mode-diff-1 (cons "-rHEAD" flags
)))
1584 (defun-cvs-mode (cvs-mode-diff-repository . SIMPLE
) (flags)
1585 "Diff the files for changes in the repository since last co/update/commit.
1586 See ``cvs-mode-diff'' for more info."
1587 (interactive (list (cvs-flags-query 'cvs-diff-flags
"cvs diff flags")))
1588 (cvs-mode-diff-1 (cons "-rBASE" (cons "-rHEAD" flags
))))
1590 (defun-cvs-mode (cvs-mode-diff-yesterday . SIMPLE
) (flags)
1591 "Diff the selected files against yesterday's head of the current branch.
1592 See ``cvs-mode-diff'' for more info."
1593 (interactive (list (cvs-flags-query 'cvs-diff-flags
"cvs diff flags")))
1594 (cvs-mode-diff-1 (cons "-Dyesterday" flags
)))
1596 (defun-cvs-mode (cvs-mode-diff-vendor . SIMPLE
) (flags)
1597 "Diff the selected files against the head of the vendor branch.
1598 See ``cvs-mode-diff'' for more info."
1599 (interactive (list (cvs-flags-query 'cvs-diff-flags
"cvs diff flags")))
1600 (cvs-mode-diff-1 (cons (concat "-r" cvs-vendor-branch
) flags
)))
1602 ;; sadly, this is not provided by cvs, so we have to roll our own
1603 (defun-cvs-mode (cvs-mode-diff-backup . SIMPLE
) (flags)
1604 "Diff the files against the backup file.
1605 This command can be used on files that are marked with \"Merged\"
1606 or \"Conflict\" in the *cvs* buffer."
1607 (interactive (list (cvs-flags-query 'cvs-diff-flags
"diff flags")))
1608 (unless (listp flags
) (error "flags should be a list of strings"))
1610 (let* ((marked (cvs-get-marked (cvs-ignore-marks-p "diff")))
1611 (fis (car (cvs-partition 'cvs-fileinfo-
>backup-file marked
))))
1613 (error "No files with a backup file selected!"))
1614 ;; let's extract some info into the environment for `buffer-name'
1615 (let* ((dir (cvs-fileinfo->dir
(car fis
)))
1616 (file (cvs-fileinfo->file
(car fis
))))
1617 (set-buffer (cvs-temp-buffer "diff")))
1618 (message "cvs diff backup...")
1619 (cvs-execute-single-file-list fis
'cvs-diff-backup-extractor
1620 cvs-diff-program flags
))
1621 (message "cvs diff backup... Done."))
1623 (defun cvs-diff-backup-extractor (fileinfo)
1624 "Return the filename and the name of the backup file as a list.
1625 Signal an error if there is no backup file."
1626 (let ((backup-file (cvs-fileinfo->backup-file fileinfo
)))
1628 (error "%s has no backup file" (cvs-fileinfo->full-path fileinfo
)))
1629 (list backup-file
(cvs-fileinfo->full-path fileinfo
))))
1634 (defun cvs-emerge-diff (b1 b2
) (emerge-buffers b1 b2 b1
))
1635 (defun cvs-emerge-merge (b1 b2 base out
)
1636 (emerge-buffers-with-ancestor b1 b2 base
(find-file-noselect out
)))
1642 (defvar ediff-after-quit-destination-buffer
)
1643 (defvar ediff-after-quit-hook-internal
)
1644 (defvar cvs-transient-buffers
)
1645 (defun cvs-ediff-startup-hook ()
1646 (add-hook 'ediff-after-quit-hook-internal
1648 (cvs-ediff-exit-hook
1649 ',ediff-after-quit-destination-buffer
',cvs-transient-buffers
))
1652 (defun cvs-ediff-exit-hook (cvs-buf tmp-bufs
)
1653 ;; kill the temp buffers (and their associated windows)
1654 (dolist (tb tmp-bufs
)
1655 (when (and tb
(buffer-live-p tb
) (not (buffer-modified-p tb
)))
1656 (let ((win (get-buffer-window tb t
)))
1658 (when (window-live-p win
) (ignore-errors (delete-window win
))))))
1659 ;; switch back to the *cvs* buffer
1660 (when (and cvs-buf
(buffer-live-p cvs-buf
)
1661 (not (get-buffer-window cvs-buf t
)))
1662 (ignore-errors (switch-to-buffer cvs-buf
))))
1664 (defun cvs-ediff-diff (b1 b2
)
1665 (let ((ediff-after-quit-destination-buffer (current-buffer))
1666 (startup-hook '(cvs-ediff-startup-hook)))
1667 (ediff-buffers b1 b2 startup-hook
'ediff-revision
)))
1669 (defun cvs-ediff-merge (b1 b2 base out
)
1670 (let ((ediff-after-quit-destination-buffer (current-buffer))
1671 (startup-hook '(cvs-ediff-startup-hook)))
1672 (ediff-merge-buffers-with-ancestor
1673 b1 b2 base startup-hook
1674 'ediff-merge-revisions-with-ancestor
1678 ;; Interactive merge/diff support.
1681 (defun cvs-retrieve-revision (fileinfo rev
)
1682 "Retrieve the given REVision of the file in FILEINFO into a new buffer."
1683 (let* ((file (cvs-fileinfo->full-path fileinfo
))
1684 (buffile (concat file
"." rev
)))
1685 (or (find-buffer-visiting buffile
)
1686 (with-current-buffer (create-file-buffer buffile
)
1687 (message "Retrieving revision %s..." rev
)
1688 ;; Discard stderr output to work around the CVS+SSH+libc
1689 ;; problem when stdout and stderr are the same.
1690 (let ((res (apply 'call-process cvs-program nil
'(t nil
) nil
1692 ;; If `rev' is HEAD, don't pass it at all:
1693 ;; the default behavior is to get the head
1694 ;; of the current branch whereas "-r HEAD"
1695 ;; stupidly gives you the head of the trunk.
1696 (append (unless (equal rev
"HEAD") (list "-r" rev
))
1698 (when (and res
(not (and (equal 0 res
))))
1699 (error "Something went wrong retrieving revision %s: %s" rev res
))
1700 (set-buffer-modified-p nil
)
1701 (let ((buffer-file-name (expand-file-name file
)))
1703 (toggle-read-only 1)
1704 (message "Retrieving revision %s... Done" rev
)
1705 (current-buffer))))))
1707 (eval-and-compile (autoload 'smerge-ediff
"smerge-mode"))
1709 ;; FIXME: The user should be able to specify ancestor/head/backup and we should
1710 ;; provide sensible defaults when merge info is unavailable (rather than rely
1711 ;; on smerge-ediff). Also provide sane defaults for need-merge files.
1712 (defun-cvs-mode cvs-mode-imerge
()
1713 "Merge interactively appropriate revisions of the selected file."
1715 (let ((fi (cvs-mode-marked 'merge nil
:one t
:file t
)))
1716 (let ((merge (cvs-fileinfo->merge fi
))
1717 (file (cvs-fileinfo->full-path fi
))
1718 (backup-file (cvs-fileinfo->backup-file fi
)))
1719 (if (not (and merge backup-file
))
1720 (let ((buf (find-file-noselect file
)))
1721 (message "Missing merge info or backup file, using VC.")
1722 (with-current-buffer buf
1724 (let* ((ancestor-buf (cvs-retrieve-revision fi
(car merge
)))
1725 (head-buf (cvs-retrieve-revision fi
(cdr merge
)))
1726 (backup-buf (let ((auto-mode-alist nil
))
1727 (find-file-noselect backup-file
)))
1728 ;; this binding is used by cvs-ediff-startup-hook
1729 (cvs-transient-buffers (list ancestor-buf backup-buf head-buf
)))
1730 (with-current-buffer backup-buf
1731 (let ((buffer-file-name (expand-file-name file
)))
1733 (funcall (cdr cvs-idiff-imerge-handlers
)
1734 backup-buf head-buf ancestor-buf file
))))))
1736 (cvs-flags-define cvs-idiff-version
1737 (list "BASE" cvs-vendor-branch cvs-vendor-branch
"BASE" "BASE")
1738 "version: " cvs-qtypedesc-tag
)
1740 (defun-cvs-mode (cvs-mode-idiff . NOARGS
) (&optional rev1 rev2
)
1741 "Diff interactively current file to revisions."
1743 (let* ((rev1 (cvs-prefix-get 'cvs-branch-prefix
))
1744 (rev2 (and rev1
(cvs-prefix-get 'cvs-secondary-branch-prefix
))))
1745 (list (or rev1
(cvs-flags-query 'cvs-idiff-version
))
1747 (let ((fi (cvs-mode-marked 'diff
"idiff" :one t
:file t
)))
1748 (let* ((file (cvs-fileinfo->full-path fi
))
1749 (rev1-buf (cvs-retrieve-revision fi
(or rev1
"BASE")))
1750 (rev2-buf (if rev2
(cvs-retrieve-revision fi rev2
)))
1751 ;; this binding is used by cvs-ediff-startup-hook
1752 (cvs-transient-buffers (list rev1-buf rev2-buf
)))
1753 (funcall (car cvs-idiff-imerge-handlers
)
1754 rev1-buf
(or rev2-buf
(find-file-noselect file
))))))
1756 (defun-cvs-mode (cvs-mode-idiff-other . NOARGS
) ()
1757 "Diff interactively current file to revisions."
1759 (let* ((rev1 (cvs-prefix-get 'cvs-branch-prefix
))
1760 (rev2 (and rev1
(cvs-prefix-get 'cvs-secondary-branch-prefix
)))
1761 (fis (cvs-mode-marked 'diff
"idiff" :file t
)))
1762 (when (> (length fis
) 2)
1763 (error "idiff-other cannot be applied to more than 2 files at a time"))
1764 (let* ((fi1 (car fis
))
1765 (rev1-buf (if rev1
(cvs-retrieve-revision fi1 rev1
)
1766 (find-file-noselect (cvs-fileinfo->full-path fi1
))))
1769 (let ((fi2 (nth 1 fis
)))
1771 (if rev2
(cvs-retrieve-revision fi2 rev2
)
1772 (find-file-noselect (cvs-fileinfo->full-path fi2
)))))
1773 (error "idiff-other doesn't know what other file/buffer to use"))
1774 (let* (;; this binding is used by cvs-ediff-startup-hook
1775 (cvs-transient-buffers (list rev1-buf rev2-buf
)))
1776 (funcall (car cvs-idiff-imerge-handlers
)
1777 rev1-buf rev2-buf
)))))
1780 (defun cvs-is-within-p (fis dir
)
1781 "Non-nil if buffer is inside one of FIS (in DIR)."
1782 (when (stringp buffer-file-name
)
1783 (setq buffer-file-name
(expand-file-name buffer-file-name
))
1785 (dolist (fi (or fis
(list (cvs-create-fileinfo 'DIRCHANGE
"" "." ""))))
1786 (when (cvs-string-prefix-p
1787 (expand-file-name (cvs-fileinfo->full-path fi
) dir
)
1792 (defun* cvs-mode-run
(cmd flags fis
1793 &key
(buf (cvs-temp-buffer))
1794 dont-change-disc cvsargs postproc
)
1795 "Generic cvs-mode-<foo> function.
1796 Executes `cvs CVSARGS CMD FLAGS FIS'.
1797 BUF is the buffer to be used for cvs' output.
1798 DONT-CHANGE-DISC non-nil indicates that the command will not change the
1799 contents of files. This is only used by the parser.
1800 POSTPROC is a list of expressions to be evaluated at the very end (after
1801 parsing if applicable). It will be prepended with `progn' if necessary."
1802 (let ((def-dir default-directory
))
1803 ;; Save the relevant buffers
1804 (save-some-buffers nil
(lambda () (cvs-is-within-p fis def-dir
))))
1805 (unless (listp flags
) (error "flags should be a list of strings"))
1806 ;; Some w32 versions of CVS don't like an explicit . too much.
1807 (when (and (car fis
) (null (cdr fis
))
1808 (eq (cvs-fileinfo->type
(car fis
)) 'DIRCHANGE
)
1809 ;; (equal (cvs-fileinfo->file (car fis)) ".")
1810 (equal (cvs-fileinfo->dir
(car fis
)) ""))
1812 (let* ((single-dir (or (not (listp cvs-execute-single-dir
))
1813 (member cmd cvs-execute-single-dir
)))
1814 (parse (member cmd cvs-parse-known-commands
))
1815 (args (append cvsargs
(list cmd
) flags
))
1816 (after-mode (nth 2 (cdr (assoc cmd cvs-buffer-name-alist
)))))
1817 (cvs-cleanup-collection cvs-cookies
;cleanup remaining messages
1818 (eq cvs-auto-remove-handled
'delayed
) nil t
)
1819 (when (fboundp after-mode
)
1820 (setq postproc
(append postproc
`((,after-mode
)))))
1823 (when (member cmd
'("status" "update")) ;FIXME: Yuck!!
1824 ;; absence of `cvs update' output has a specific meaning.
1825 (or fis
(list (cvs-create-fileinfo 'DIRCHANGE
"" "." ""))))))
1826 (push `(cvs-parse-process ',dont-change-disc nil
',old-fis
) postproc
)))
1827 (let ((msg (cvs-header-msg args fis
)))
1828 (cvs-update-header msg
'add
)
1829 (push `(with-current-buffer cvs-buffer
1830 (cvs-update-header ',msg nil
))
1832 (setq postproc
(if (cdr postproc
) (cons 'progn postproc
) (car postproc
)))
1833 (with-current-buffer buf
1834 (let ((inhibit-read-only t
)) (erase-buffer))
1835 (message "Running cvs %s ..." cmd
)
1836 (cvs-run-process args fis postproc single-dir
))))
1839 (defun* cvs-mode-do
(cmd flags filter
1840 &key show dont-change-disc cvsargs postproc
)
1841 "Generic cvs-mode-<foo> function.
1842 Executes `cvs CVSARGS CMD FLAGS' on the selected files.
1843 FILTER is passed to `cvs-applicable-p' to only apply the command to
1844 files for which it makes sense.
1845 SHOW indicates that CMD should be not be run in the default temp buffer and
1846 should be shown to the user. The buffer and mode to be used is determined
1847 by `cvs-buffer-name-alist'.
1848 DONT-CHANGE-DISC non-nil indicates that the command will not change the
1849 contents of files. This is only used by the parser."
1850 (cvs-mode-run cmd flags
(cvs-mode-marked filter cmd
)
1851 :buf
(cvs-temp-buffer (when show cmd
))
1852 :dont-change-disc dont-change-disc
1854 :postproc postproc
))
1856 (defun-cvs-mode (cvs-mode-status . SIMPLE
) (flags)
1857 "Show cvs status for all marked files.
1858 With prefix argument, prompt for cvs flags."
1859 (interactive (list (cvs-flags-query 'cvs-status-flags
"cvs status flags")))
1860 (cvs-mode-do "status" flags nil
:dont-change-disc t
:show t
1861 :postproc
(when (eq cvs-auto-remove-handled
'status
)
1862 '((with-current-buffer ,(current-buffer)
1863 (cvs-mode-remove-handled))))))
1865 (defun-cvs-mode (cvs-mode-tree . SIMPLE
) (flags)
1866 "Call cvstree using the file under the point as a keyfile."
1867 (interactive (list (cvs-flags-query 'cvs-status-flags
"cvs status flags")))
1868 (cvs-mode-run "status" (cons "-v" flags
) (cvs-mode-marked nil
"status")
1869 :buf
(cvs-temp-buffer "tree")
1871 :postproc
'((cvs-status-cvstrees))))
1875 (defun-cvs-mode (cvs-mode-log . NOARGS
) (flags)
1876 "Display the cvs log of all selected files.
1877 With prefix argument, prompt for cvs flags."
1878 (interactive (list (cvs-add-branch-prefix
1879 (cvs-flags-query 'cvs-log-flags
"cvs log flags"))))
1880 (cvs-mode-do "log" flags nil
:show t
))
1883 (defun-cvs-mode (cvs-mode-update . NOARGS
) (flags)
1884 "Update all marked files.
1885 With a prefix argument, prompt for cvs flags."
1887 (list (cvs-add-branch-prefix
1888 (cvs-add-secondary-branch-prefix
1889 (cvs-flags-query 'cvs-update-flags
"cvs update flags")
1891 (cvs-mode-do "update" flags
'update
))
1894 (defun-cvs-mode (cvs-mode-examine . NOARGS
) (flags)
1895 "Re-examine all marked files.
1896 With a prefix argument, prompt for cvs flags."
1898 (list (cvs-add-branch-prefix
1899 (cvs-add-secondary-branch-prefix
1900 (cvs-flags-query 'cvs-update-flags
"cvs -n update flags")
1902 (cvs-mode-do "update" flags nil
:cvsargs
'("-n") :dont-change-disc t
))
1905 (defun-cvs-mode cvs-mode-ignore
(&optional pattern
)
1906 "Arrange so that CVS ignores the selected files.
1907 This command ignores files that are not flagged as `Unknown'."
1909 (dolist (fi (cvs-mode-marked 'ignore
))
1910 (cvs-append-to-ignore (cvs-fileinfo->dir fi
) (cvs-fileinfo->file fi
)
1911 (eq (cvs-fileinfo->subtype fi
) 'NEW-DIR
))
1912 (setf (cvs-fileinfo->type fi
) 'DEAD
))
1913 (cvs-cleanup-collection cvs-cookies nil nil nil
))
1916 (defun cvs-append-to-ignore (dir str
&optional old-dir
)
1917 "Add STR to the .cvsignore file in DIR.
1918 If OLD-DIR is non-nil, then this is a directory that we don't want
1919 to hear about anymore."
1920 (with-current-buffer
1921 (find-file-noselect (expand-file-name ".cvsignore" dir
))
1922 (when (ignore-errors
1923 (and buffer-read-only
1924 (eq 'CVS
(vc-backend buffer-file-name
))
1925 (not (vc-editable-p buffer-file-name
))))
1926 ;; CVSREAD=on special case
1927 (vc-checkout buffer-file-name t
))
1928 (goto-char (point-max))
1929 (unless (bolp) (insert "\n"))
1930 (insert str
(if old-dir
"/\n" "\n"))
1931 (if cvs-sort-ignore-file
(sort-lines nil
(point-min) (point-max)))
1935 (defun cvs-mode-find-file-other-window (e)
1936 "Select a buffer containing the file in another window."
1937 (interactive (list last-input-event
))
1938 (cvs-mode-find-file e t
))
1941 (defun cvs-mode-display-file (e)
1942 "Show a buffer containing the file in another window."
1943 (interactive (list last-input-event
))
1944 (cvs-mode-find-file e
'dont-select
))
1947 (defun cvs-mode-view-file (e)
1949 (interactive (list last-input-event
))
1950 (cvs-mode-find-file e nil t
))
1953 (defun cvs-mode-view-file-other-window (e)
1955 (interactive (list last-input-event
))
1956 (cvs-mode-find-file e t t
))
1959 (defun cvs-find-modif (fi)
1961 (call-process cvs-program nil
(current-buffer) nil
1962 "-f" "diff" (cvs-fileinfo->file fi
))
1963 (goto-char (point-min))
1964 (if (re-search-forward "^\\([0-9]+\\)" nil t
)
1965 (string-to-number (match-string 1))
1969 (defun cvs-mode-find-file (e &optional other view
)
1970 "Select a buffer containing the file.
1971 With a prefix, opens the buffer in an OTHER window."
1972 (interactive (list last-input-event current-prefix-arg
))
1973 ;; If the event moves point, check that it moves it to a valid location.
1974 (when (and (/= (point) (progn (posn-set-point (event-end e
)) (point)))
1975 (not (memq (get-text-property (1- (line-end-position))
1977 '(cvs-header-face cvs-filename-face
))))
1978 (error "Not a file name"))
1980 (lambda (&optional rev
)
1981 (interactive (list (cvs-prefix-get 'cvs-branch-prefix
)))
1982 (let* ((cvs-buf (current-buffer))
1983 (fi (cvs-mode-marked nil nil
:one t
)))
1984 (if (eq (cvs-fileinfo->type fi
) 'DIRCHANGE
)
1985 (let ((odir default-directory
))
1986 (setq default-directory
1987 (cvs-expand-dir-name (cvs-fileinfo->dir fi
)))
1988 (cond ((eq other
'dont-select
)
1989 (display-buffer (find-file-noselect default-directory
)))
1990 (other (dired-other-window default-directory
))
1991 (t (dired default-directory
)))
1992 (set-buffer cvs-buf
)
1993 (setq default-directory odir
))
1994 (let ((buf (if rev
(cvs-retrieve-revision fi rev
)
1995 (find-file-noselect (cvs-fileinfo->full-path fi
)))))
1996 (funcall (cond ((eq other
'dont-select
) 'display-buffer
)
1998 (if view
'view-buffer-other-window
1999 'switch-to-buffer-other-window
))
2000 (t (if view
'view-buffer
'switch-to-buffer
)))
2002 (when (and cvs-find-file-and-jump
(cvs-applicable-p fi
'diff-base
))
2003 (goto-line (cvs-find-modif fi
)))
2007 (defun-cvs-mode (cvs-mode-undo . SIMPLE
) (flags)
2008 "Undo local changes to all marked files.
2009 The file is removed and `cvs update FILE' is run."
2010 ;;"With prefix argument, prompt for cvs FLAGS."
2011 (interactive (list nil
));; (cvs-flags-query 'cvs-undo-flags "undo flags")
2012 (if current-prefix-arg
(call-interactively 'cvs-mode-revert-to-rev
)
2013 (let* ((fis (cvs-do-removal 'undo
"update" 'all
))
2014 (removedp (lambda (fi)
2015 (or (eq (cvs-fileinfo->type fi
) 'REMOVED
)
2016 (and (eq (cvs-fileinfo->type fi
) 'CONFLICT
)
2017 (eq (cvs-fileinfo->subtype fi
) 'REMOVED
)))))
2018 (fis-split (cvs-partition removedp fis
))
2019 (fis-removed (car fis-split
))
2020 (fis-other (cdr fis-split
)))
2021 (if (null fis-other
)
2022 (when fis-removed
(cvs-mode-run "add" nil fis-removed
))
2023 (cvs-mode-run "update" flags fis-other
2026 `((with-current-buffer ,(current-buffer)
2027 (cvs-mode-run "add" nil
',fis-removed
)))))))))
2030 (defun-cvs-mode (cvs-mode-revert-to-rev . NOARGS
) (rev)
2031 "Revert the selected files to an old revision."
2033 (list (or (cvs-prefix-get 'cvs-branch-prefix
)
2034 (let ((current-prefix-arg '(4)))
2035 (cvs-flags-query 'cvs-idiff-version
)))))
2036 (let* ((fis (cvs-mode-marked 'revert
"revert" :file t
))
2037 (tag (concat "tmp_pcl_tag_" (make-temp-name "")))
2038 (untag `((with-current-buffer ,(current-buffer)
2039 (cvs-mode-run "tag" (list "-d" ',tag
) ',fis
))))
2040 (update `((with-current-buffer ,(current-buffer)
2041 (cvs-mode-run "update" (list "-j" ',tag
"-j" ',rev
) ',fis
2042 :postproc
',untag
)))))
2043 (cvs-mode-run "tag" (list tag
) fis
:postproc update
)))
2046 (defun-cvs-mode cvs-mode-delete-lock
()
2047 "Delete the lock file that CVS is waiting for.
2048 Note that this can be dangerous. You should only do this
2049 if you are convinced that the process that created the lock is dead."
2051 (let* ((default-directory (cvs-expand-dir-name cvs-lock-file
))
2052 (locks (directory-files default-directory nil cvs-lock-file-regexp
)))
2054 ((not locks
) (error "No lock files found"))
2055 ((yes-or-no-p (concat "Really delete locks in " cvs-lock-file
"? "))
2056 (dolist (lock locks
)
2057 (cond ((file-directory-p lock
) (delete-directory lock
))
2058 ((file-exists-p lock
) (delete-file lock
))))))))
2061 (defun-cvs-mode cvs-mode-remove-handled
()
2062 "Remove all lines that are handled.
2063 Empty directories are removed."
2065 (cvs-cleanup-collection cvs-cookies
2066 t
(or cvs-auto-remove-directories
'handled
) t
))
2069 (defun-cvs-mode cvs-mode-acknowledge
()
2070 "Remove all marked files from the buffer."
2072 (dolist (fi (cvs-get-marked (cvs-ignore-marks-p "acknowledge") t
))
2073 (setf (cvs-fileinfo->type fi
) 'DEAD
))
2074 (cvs-cleanup-collection cvs-cookies nil nil nil
))
2076 (defun cvs-do-removal (filter &optional cmd all
)
2078 Returns a list of FIS that should be `cvs remove'd."
2079 (let* ((files (cvs-mode-marked filter cmd
:file t
:read-only t
))
2080 (fis (cdr (cvs-partition (lambda (fi)
2081 (eq (cvs-fileinfo->type fi
) 'UNKNOWN
))
2082 (cvs-mode-marked filter cmd
))))
2083 (silent (or (not cvs-confirm-removals
)
2084 (cvs-every (lambda (fi)
2085 (or (not (file-exists-p
2086 (cvs-fileinfo->full-path fi
)))
2087 (cvs-applicable-p fi
'safe-rm
)))
2089 (tmpbuf (cvs-temp-buffer)))
2090 (when (and (not silent
) (equal cvs-confirm-removals
'list
))
2091 (with-current-buffer tmpbuf
2092 (let ((inhibit-read-only t
))
2093 (cvs-insert-strings (mapcar 'cvs-fileinfo-
>full-path fis
))
2094 (cvs-pop-to-buffer-same-frame (current-buffer))
2095 (shrink-window-if-larger-than-buffer))))
2099 (let ((nfiles (length files
))
2100 (verb (if (eq filter
'undo
) "Undo" "Delete")))
2102 (format "%s file: \"%s\" ? "
2104 (cvs-fileinfo->file
(car files
)))
2105 (format "%s %d files? "
2108 (cvs-bury-buffer tmpbuf cvs-buffer
))))
2109 (progn (message "Aborting") nil
)
2111 (let* ((type (cvs-fileinfo->type fi
))
2112 (file (cvs-fileinfo->full-path fi
)))
2113 (when (or all
(eq type
'UNKNOWN
))
2114 (when (file-exists-p file
) (delete-file file
))
2115 (unless all
(setf (cvs-fileinfo->type fi
) 'DEAD
) t
))))
2118 (defun-cvs-mode (cvs-mode-remove . SIMPLE
) (flags)
2119 "Remove all marked files.
2120 With prefix argument, prompt for cvs flags."
2121 (interactive (list (cvs-flags-query 'cvs-remove-flags
"cvs remove flags")))
2122 (let ((fis (cvs-do-removal 'remove
)))
2123 (if fis
(cvs-mode-run "remove" (cons "-f" flags
) fis
)
2124 (cvs-cleanup-collection cvs-cookies nil nil nil
))))
2127 (defvar cvs-tag-name
"")
2128 (defun-cvs-mode (cvs-mode-tag . SIMPLE
) (tag &optional flags
)
2129 "Run `cvs tag TAG' on all selected files.
2130 With prefix argument, prompt for cvs flags.
2131 By default this can only be used on directories.
2132 Use \\[cvs-mode-force-command] or change `cvs-force-dir-tag' if you need
2133 to use it on individual files."
2135 (list (setq cvs-tag-name
2136 (cvs-query-read cvs-tag-name
"Tag name: " cvs-qtypedesc-tag
))
2137 (cvs-flags-query 'cvs-tag-flags
"tag flags")))
2138 (cvs-mode-do "tag" (append flags
(list tag
))
2139 (when cvs-force-dir-tag
'tag
)))
2141 (defun-cvs-mode (cvs-mode-untag . SIMPLE
) (tag &optional flags
)
2142 "Run `cvs tag -d TAG' on all selected files.
2143 With prefix argument, prompt for cvs flags."
2145 (list (setq cvs-tag-name
2146 (cvs-query-read cvs-tag-name
"Tag to delete: " cvs-qtypedesc-tag
))
2147 (cvs-flags-query 'cvs-tag-flags
"tag flags")))
2148 (cvs-mode-do "tag" (append '("-d") flags
(list tag
))
2149 (when cvs-force-dir-tag
'tag
)))
2152 ;; Byte compile files.
2154 (defun-cvs-mode cvs-mode-byte-compile-files
()
2155 "Run byte-compile-file on all selected files that end in '.el'."
2157 (let ((marked (cvs-get-marked (cvs-ignore-marks-p "byte-compile"))))
2159 (let ((filename (cvs-fileinfo->full-path fi
)))
2160 (when (string-match "\\.el\\'" filename
)
2161 (byte-compile-file filename
))))))
2163 ;; ChangeLog support.
2165 (defun-cvs-mode cvs-mode-add-change-log-entry-other-window
()
2166 "Add a ChangeLog entry in the ChangeLog of the current directory."
2168 (dolist (fi (cvs-mode-marked nil nil
))
2169 (let* ((default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi
)))
2170 (buffer-file-name (expand-file-name (cvs-fileinfo->file fi
))))
2171 (kill-local-variable 'change-log-default-name
)
2172 (save-excursion (add-change-log-entry-other-window)))))
2174 ;; interactive commands to set optional flags
2176 (defun cvs-mode-set-flags (flag)
2177 "Ask for new setting of cvs-FLAG-flags."
2179 (list (completing-read
2181 '("cvs" "diff" "update" "status" "log" "tag" ;"rtag"
2182 "commit" "remove" "undo" "checkout")
2184 (let* ((sym (intern (concat "cvs-" flag
"-flags"))))
2185 (let ((current-prefix-arg '(16)))
2186 (cvs-flags-query sym
(concat flag
" flags")))))
2190 ;;;; Utilities for the *cvs* buffer
2193 (defun cvs-dir-member-p (fileinfo dir
)
2194 "Return true if FILEINFO represents a file in directory DIR."
2195 (and (not (eq (cvs-fileinfo->type fileinfo
) 'DIRCHANGE
))
2196 (cvs-string-prefix-p dir
(cvs-fileinfo->dir fileinfo
))))
2198 (defun cvs-execute-single-file (fi extractor program constant-args
)
2199 "Internal function for `cvs-execute-single-file-list'."
2200 (let* ((arg-list (funcall extractor fi
))
2201 (inhibit-read-only t
))
2203 ;; Execute the command unless extractor returned t.
2204 (when (listp arg-list
)
2205 (let* ((args (append constant-args arg-list
)))
2207 (insert (format "=== %s %s\n\n"
2208 program
(cvs-strings->string args
)))
2210 ;; FIXME: return the exit status?
2211 (apply 'call-process program nil t t args
)
2212 (goto-char (point-max))))))
2214 ;; FIXME: make this run in the background ala cvs-run-process...
2215 (defun cvs-execute-single-file-list (fis extractor program constant-args
)
2216 "Run PROGRAM on all elements on FIS.
2217 CONSTANT-ARGS is a list of strings to pass as arguments to PROGRAM.
2218 The arguments given to the program will be CONSTANT-ARGS followed by
2219 the list that EXTRACTOR returns.
2221 EXTRACTOR will be called once for each file on FIS. It is given
2222 one argument, the cvs-fileinfo. It can return t, which means ignore
2223 this file, or a list of arguments to send to the program."
2225 (cvs-execute-single-file fi extractor program constant-args
)))
2228 (defun cvs-revert-if-needed (fis)
2229 (dolist (fileinfo fis
)
2230 (let* ((file (cvs-fileinfo->full-path fileinfo
))
2231 (buffer (find-buffer-visiting file
)))
2232 ;; For a revert to happen the user must be editing the file...
2233 (unless (or (null buffer
)
2234 (eq (cvs-fileinfo->type fileinfo
) 'MESSAGE
)
2235 ;; FIXME: check whether revert is really needed.
2236 ;; `(verify-visited-file-modtime buffer)' doesn't cut it
2237 ;; because it only looks at the time stamp (it ignores
2238 ;; read-write changes) which is not changed by `commit'.
2239 (buffer-modified-p buffer
))
2240 (with-current-buffer buffer
2242 (revert-buffer 'ignore-auto
'dont-ask
'preserve-modes
)
2243 ;; `preserve-modes' avoids changing the (minor) modes. But we
2244 ;; do want to reset the mode for VC, so we do it explicitly.
2246 (when (eq (cvs-fileinfo->type fileinfo
) 'CONFLICT
)
2247 (smerge-mode 1))))))))
2250 (defun cvs-change-cvsroot (newroot)
2251 "Change the cvsroot."
2252 (interactive "DNew repository: ")
2253 (if (or (file-directory-p (expand-file-name "CVSROOT" newroot
))
2254 (y-or-n-p (concat "Warning: no CVSROOT found inside repository."
2255 " Change cvs-cvsroot anyhow?")))
2256 (setq cvs-cvsroot newroot
)))
2259 ;;;; useful global settings
2263 (add-to-list 'completion-ignored-extensions
"CVS/")
2266 ;; Hook to allow calling PCL-CVS by visiting the /CVS subdirectory
2270 (defcustom cvs-dired-action
'cvs-quickdir
2271 "The action to be performed when opening a CVS directory.
2272 Sensible values are `cvs-examine', `cvs-status' and `cvs-quickdir'."
2274 :type
'(choice (const cvs-examine
) (const cvs-status
) (const cvs-quickdir
)))
2277 (defcustom cvs-dired-use-hook
'(4)
2278 "Whether or not opening a CVS directory should run PCL-CVS.
2279 nil means never do it.
2280 ALWAYS means to always do it unless a prefix argument is given to the
2281 command that prompted the opening of the directory.
2282 Anything else means to do it only if the prefix arg is equal to this value."
2284 :type
'(choice (const :tag
"Never" nil
)
2285 (const :tag
"Always" always
)
2286 (const :tag
"Prefix" (4))))
2289 (progn (defun cvs-dired-noselect (dir)
2290 "Run `cvs-examine' if DIR is a CVS administrative directory.
2291 The exact behavior is determined also by `cvs-dired-use-hook'."
2293 (setq dir
(directory-file-name dir
))
2294 (when (and (string= "CVS" (file-name-nondirectory dir
))
2295 (file-readable-p (expand-file-name "Entries" dir
))
2297 (if (eq cvs-dired-use-hook
'always
)
2298 (not current-prefix-arg
)
2299 (equal current-prefix-arg cvs-dired-use-hook
)))
2301 (funcall cvs-dired-action
(file-name-directory dir
) t t
))))))
2307 (add-hook 'vc-post-command-functions
'cvs-vc-command-advice
)
2309 (defun cvs-vc-command-advice (command file flags
)
2310 (when (and (equal command
"cvs")
2312 (while (and (stringp (car flags
))
2313 (string-match "\\`-" (car flags
)))
2315 ;; don't parse output we don't understand.
2316 (member (car flags
) cvs-parse-known-commands
))
2317 ;; Don't parse "update -p" output.
2318 (not (and (member (car flags
) '("update" "checkout"))
2319 (let ((found-p nil
))
2320 (dolist (flag flags found-p
)
2321 (if (equal flag
"-p") (setq found-p t
)))))))
2322 (save-current-buffer
2323 (let ((buffer (current-buffer))
2324 (dir default-directory
)
2326 (dolist (cvs-buf (buffer-list))
2327 (set-buffer cvs-buf
)
2328 ;; look for a corresponding pcl-cvs buffer
2329 (when (and (eq major-mode
'cvs-mode
)
2330 (cvs-string-prefix-p default-directory dir
))
2331 (let ((subdir (substring dir
(length default-directory
))))
2333 (set (make-local-variable 'cvs-buffer
) cvs-buf
)
2334 ;; `cvs -q add file' produces no useful output :-(
2335 (when (and (equal (car flags
) "add")
2336 (goto-char (point-min))
2337 (looking-at ".*to add this file permanently\n\\'"))
2338 (insert "cvs add: scheduling file `"
2339 (file-name-nondirectory file
)
2340 "' for addition\n"))
2341 ;; VC never (?) does `cvs -n update' so dcd=nil
2342 ;; should probably always be the right choice.
2343 (cvs-parse-process nil subdir
))))))))
2346 ;; Hook into write-buffer
2349 (defun cvs-mark-buffer-changed ()
2350 (let* ((file (expand-file-name buffer-file-name
))
2351 (version (and (fboundp 'vc-backend
)
2352 (eq (vc-backend file
) 'CVS
)
2353 (vc-workfile-version file
))))
2356 (dolist (cvs-buf (buffer-list))
2357 (set-buffer cvs-buf
)
2358 ;; look for a corresponding pcl-cvs buffer
2359 (when (and (eq major-mode
'cvs-mode
)
2360 (cvs-string-prefix-p default-directory file
))
2361 (let* ((file (substring file
(length default-directory
)))
2362 (fi (cvs-create-fileinfo
2363 (if (string= "0" version
)
2365 (or (file-name-directory file
) "")
2366 (file-name-nondirectory file
)
2367 "cvs-mark-buffer-changed")))
2368 (cvs-addto-collection cvs-cookies fi
))))))))
2370 (add-hook 'after-save-hook
'cvs-mark-buffer-changed
)
2375 ;; arch-tag: 8e3a7494-0453-4389-9ab3-a557ce9fab61
2376 ;;; pcvs.el ends here