comparison lisp/pcvs.el @ 30717:e6e5480e5b25

(cvs-menu): Don't move point. Use popup-menu. Set cvs-minor-current-files to the selected fileinfo. (cvs-get-marked): Accept fileinfos in cvs-minor-current-files. (cvs-mode-insert): Manually macroexpand `ignore-errors'.

30716:2e1c439e7b1b

;;      (Greg Klanderman) [e-mail]
;;      (Jari Aalto+mail.emacs) [e-mail]
;; Maintainer: (Stefan Monnier) monnier+lists/cvs/[e-mail]
;; Keywords: CVS, version control, release management
;; Version: $Name:  $
;; Revision: $Id: pcvs.el,v 1.6 2000/08/05 20:08:49 gerd Exp $

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by

;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only
;; for VC-dired.  As such, I've tried to make PCL-CVS and VC interoperate
;; seamlessly (I also use VC).

;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'.
;; There used to be a TeXinfo manual, but it's now so out of date that
;; it's not even worth looking at it.

;;; Todo:

;; ******** FIX THE DOCUMENTATION *********
;;
;; - proper `g' that passes safe args and uses either cvs-status or cvs-examine
;; - add toolbar entries
;; - marking
;;    marking directories should jump to just after the dir.
;;    allow (un)marking directories at a time with the mouse.

;;;;

(defun cvs-menu (e)
  "Popup the CVS menu."
  (interactive "e")
  (mouse-set-point e)
  (x-popup-menu e cvs-menu-map))

(defvar cvs-mode-line-process nil
  "Mode-line control for displaying info on cvs process status.")

an empty list if it doesn't point to a file at all.

Args: &optional IGNORE-MARKS IGNORE-CONTENTS."

  (let ((fis nil))
    (dolist (fi (if (boundp 'cvs-minor-current-files)
		    (mapcar
		     (lambda (f)
		       (let ((f (file-relative-name f)))
			 (if (file-directory-p f)
			     (cvs-create-fileinfo
			      'DIRCHANGE (file-name-as-directory f) "." "")
			   (let ((dir (file-name-directory f))
				 (file (file-name-nondirectory f)))
			     (cvs-create-fileinfo
			      'UNKNOWN (or dir "") file "")))))
		     cvs-minor-current-files)
		  (or (and (not ignore-marks)
			   (ewoc-collect cvs-cookies
					      'cvs-fileinfo->marked))
		      (list (ewoc-data (ewoc-locate cvs-cookies (point)))))))

(defun-cvs-mode (cvs-mode-insert . NOARGS) (file)
  "Insert an entry for a specific file."
  (interactive
   (list (read-file-name "File to insert: " nil nil nil
			 (ignore-errors
			   (cvs-fileinfo->dir
			    (car (cvs-mode-marked nil nil :read-only t)))))))
  (let ((file (file-relative-name (directory-file-name file))) last)
    (dolist (fi (cvs-fileinfo-from-entries file))
      (setq last (cvs-addto-collection cvs-cookies fi last)))))

(defun-cvs-mode (cvs-mode-add . SIMPLE) (flags)

30717:e6e5480e5b25

;;      (Greg Klanderman) [e-mail]
;;      (Jari Aalto+mail.emacs) [e-mail]
;; Maintainer: (Stefan Monnier) monnier+lists/cvs/[e-mail]
;; Keywords: CVS, version control, release management
;; Version: $Name:  $
;; Revision: $Id: pcvs.el,v 1.7 2000/08/06 09:18:00 gerd Exp $

;; This file is part of GNU Emacs.

;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by

;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only
;; for VC-dired.  As such, I've tried to make PCL-CVS and VC interoperate
;; seamlessly (I also use VC).

;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'.
;; There is a TeXinfo manual, which can be helpful to get started.

;;; Todo:

;; ******** FIX THE DOCUMENTATION *********
;; 
;; - hide fileinfos without getting rid of them (will require ewok work).
;; - proper `g' that passes safe args and uses either cvs-status or cvs-examine
;; - add toolbar entries
;; - marking
;;    marking directories should jump to just after the dir.
;;    allow (un)marking directories at a time with the mouse.

;;;;

(defun cvs-menu (e)
  "Popup the CVS menu."
  (interactive "e")
  (let ((cvs-minor-current-files
	 (list (ewoc-data (ewoc-locate
			   cvs-cookies (posn-point (event-end e)))))))
    (popup-menu cvs-menu-map e)))

(defvar cvs-mode-line-process nil
  "Mode-line control for displaying info on cvs process status.")

an empty list if it doesn't point to a file at all.

Args: &optional IGNORE-MARKS IGNORE-CONTENTS."

  (let ((fis nil))
    (dolist (fi (if (and (boundp 'cvs-minor-current-files)
			 (consp cvs-minor-current-files))
		    (mapcar
		     (lambda (f)
		       (if (cvs-fileinfo-p f) f
			 (let ((f (file-relative-name f)))
			   (if (file-directory-p f)
			       (cvs-create-fileinfo
				'DIRCHANGE (file-name-as-directory f) "." "")
			     (let ((dir (file-name-directory f))
				   (file (file-name-nondirectory f)))
			       (cvs-create-fileinfo
				'UNKNOWN (or dir "") file ""))))))
		     cvs-minor-current-files)
		  (or (and (not ignore-marks)
			   (ewoc-collect cvs-cookies
					      'cvs-fileinfo->marked))
		      (list (ewoc-data (ewoc-locate cvs-cookies (point)))))))

(defun-cvs-mode (cvs-mode-insert . NOARGS) (file)
  "Insert an entry for a specific file."
  (interactive
   (list (read-file-name "File to insert: " nil nil nil
			 ;; Can't use ignore-errors here because interactive
			 ;; specs aren't byte-compiled.
			 (condition-case nil
			     (cvs-fileinfo->dir
			      (car (cvs-mode-marked nil nil :read-only t)))
			   (error nil)))))
  (let ((file (file-relative-name (directory-file-name file))) last)
    (dolist (fi (cvs-fileinfo-from-entries file))
      (setq last (cvs-addto-collection cvs-cookies fi last)))))

(defun-cvs-mode (cvs-mode-add . SIMPLE) (flags)