[bpt/emacs.git] / lisp / ediff-vers.el

;;; ediff-vers.el --- version control interface to Ediff

;;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.

;; Author: Michael Kifer <kifer@cs.sunysb.edu>

;; 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
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.

;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
;; GNU General Public License for more details.

;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING.  If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.

;;; Commentary:

;;; Code:

;; Compiler pacifier
(defvar rcs-default-co-switches)
(defvar sc-mode)
(defvar cvs-shell)
(defvar cvs-program)
(defvar cvs-cookie-handle)
(defvar ediff-temp-file-prefix)

(and noninteractive
     (eval-when-compile
       (load "pcl-cvs" 'noerror)
       (load "rcs" 'noerror)
       ;; On 8+3 MS-DOS filesystems, generic-x.el is loaded
       ;; instead of (the missing) generic-sc.el.  Since the
       ;; version of Emacs which supports MS-DOS doesn't have
       ;; generic-sc, we simply avoid loading it.
       (or (and (fboundp 'msdos-long-file-names)
		(not (msdos-long-file-names)))
	   (load "generic-sc" 'noerror))
       (load "vc" 'noerror)))
;; end pacifier
      
;; VC.el support
(defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
;; Run Ediff on versions of the current buffer.
;; If REV2 is "" then compare current buffer with REV1.
;; If the current buffer is named `F', the version is named `F.~REV~'.
;; If `F.~REV~' already exists, it is used instead of being re-created.
  (let (file1 file2 rev1buf rev2buf)
    (save-window-excursion
      (save-excursion
	(vc-version-other-window rev1)
	(setq rev1buf (current-buffer)
	      file1 (buffer-file-name)))
      (save-excursion
	(or (string= rev2 "") 		; use current buffer
	    (vc-version-other-window rev2))
	(setq rev2buf (current-buffer)
	      file2 (buffer-file-name)))
      (setq startup-hooks
	    (cons `(lambda ()
		     (delete-file ,file1)
		     (or ,(string= rev2 "") (delete-file ,file2)))
		  startup-hooks)))
    (ediff-buffers
     rev1buf rev2buf
     startup-hooks
     'ediff-revision)))
    
;; RCS.el support
(defun rcs-ediff-view-revision (&optional rev)
;; View previous RCS revision of current file.
;; With prefix argument, prompts for a revision name.
  (interactive (list (if current-prefix-arg 
			 (read-string "Revision: "))))
  (let* ((filename (buffer-file-name (current-buffer)))
	 (switches (append '("-p")
			   (if rev (list (concat "-r" rev)) nil)))
	 (buff (concat (file-name-nondirectory filename) ".~" rev "~")))
    (message "Working ...")
    (setq filename (expand-file-name filename))
    (with-output-to-temp-buffer buff
      (ediff-with-current-buffer standard-output
	(fundamental-mode))
      (let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
	(delete-windows-on output-buffer)
	(save-excursion
	  (set-buffer output-buffer)
	  (apply 'call-process "co" nil t nil
		 ;; -q: quiet (no diagnostics)
		 (append switches rcs-default-co-switches
			 (list "-q" filename))))) 
      (message "")
      buff)))    
      
(defun ediff-rcs-get-output-buffer (file name)
  ;; Get a buffer for RCS output for FILE, make it writable and clean it up.
  ;; Optional NAME is name to use instead of `*RCS-output*'.
  ;; This is a modified version from rcs.el v1.1.  I use it here to make
  ;; Ediff immune to changes in rcs.el
  (let* ((default-major-mode 'fundamental-mode) ; no frills!
	 (buf (get-buffer-create name)))
    (save-excursion
      (set-buffer buf)
      (setq buffer-read-only nil
	    default-directory (file-name-directory (expand-file-name file)))
      (erase-buffer))
    buf))

(defun ediff-rcs-internal (rev1 rev2 &optional startup-hooks)
;; Run Ediff on versions of the current buffer.
;; If REV2 is "" then use current buffer.
  (let (rev2buf rev1buf)
    (save-window-excursion
      (setq rev2buf (if (string= rev2 "")
			(current-buffer)
		      (rcs-ediff-view-revision rev2))
	    rev1buf (rcs-ediff-view-revision rev1)))
	
    ;; rcs.el doesn't create temp version files, so we don't have to delete
    ;; anything in startup hooks to ediff-buffers
    (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
    ))


;; GENERIC-SC.el support

(defun generic-sc-get-latest-rev ()
  (cond ((eq sc-mode 'CCASE)
	 (eval "main/LATEST"))
	(t (eval ""))))

(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks)
;; Run Ediff on versions of the current buffer.
;; If REV2 is "" then compare current buffer with REV1.
;; If the current buffer is named `F', the version is named `F.~REV~'.
;; If `F.~REV~' already exists, it is used instead of being re-created.
  (let (rev1buf rev2buf)
    (save-excursion
      (if (or (not rev1) (string= rev1 ""))
	  (setq rev1 (generic-sc-get-latest-rev)))
      (sc-visit-previous-revision rev1)
      (setq rev1buf (current-buffer)))
    (save-excursion
      (or (string= rev2 "") 		; use current buffer
	  (sc-visit-previous-revision rev2))
      (setq rev2buf (current-buffer)))
    (ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))


;;; Merge with Version Control

(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev 
				     &optional startup-hooks merge-buffer-file)
;; If ANCESTOR-REV non-nil, merge with ancestor
  (let (buf1 buf2 ancestor-buf)
    (save-window-excursion
      (save-excursion
	(vc-version-other-window rev1)
	(setq buf1 (current-buffer)))
      (save-excursion
	(or (string= rev2 "")
	    (vc-version-other-window rev2))
	(setq buf2 (current-buffer)))
      (if ancestor-rev
	  (save-excursion
	    (if (string= ancestor-rev "")
		(setq ancestor-rev (vc-workfile-version buffer-file-name)))
	    (vc-version-other-window ancestor-rev)
	    (setq ancestor-buf (current-buffer))))
      (setq startup-hooks 
	    (cons 
	     `(lambda () 
		(delete-file ,(buffer-file-name buf1))
		(or ,(string= rev2 "")
		    (delete-file ,(buffer-file-name buf2)))
		(or ,(string= ancestor-rev "")
		    ,(not ancestor-rev)
		    (delete-file ,(buffer-file-name ancestor-buf)))
		)
	     startup-hooks)))
    (if ancestor-rev
	(ediff-merge-buffers-with-ancestor
	 buf1 buf2 ancestor-buf
	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
      (ediff-merge-buffers
       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
    ))

(defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev
				      &optional
				      startup-hooks merge-buffer-file)
  ;; If ANCESTOR-REV non-nil, merge with ancestor
  (let (buf1 buf2 ancestor-buf)
    (save-window-excursion
      (setq buf1 (rcs-ediff-view-revision rev1)
	    buf2 (if (string= rev2 "")
		     (current-buffer)
		   (rcs-ediff-view-revision rev2))
	    ancestor-buf (if ancestor-rev
			     (if (string= ancestor-rev "")
				 (current-buffer)
			       (rcs-ediff-view-revision ancestor-rev)))))
    ;; rcs.el doesn't create temp version files, so we don't have to delete
    ;; anything in startup hooks to ediff-buffers
    (if ancestor-rev
	(ediff-merge-buffers-with-ancestor
	 buf1 buf2 ancestor-buf
	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
      (ediff-merge-buffers
       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))

(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev
					     &optional
					     startup-hooks merge-buffer-file)
  ;; If ANCESTOR-REV non-nil, merge with ancestor
  (let (buf1 buf2 ancestor-buf)
    (save-excursion
      (if (string= rev1 "")
	  (setq rev1 (generic-sc-get-latest-rev)))
      (sc-visit-previous-revision rev1)
      (setq buf1 (current-buffer)))
    (save-excursion
      (or (string= rev2 "")
	  (sc-visit-previous-revision rev2))
      (setq buf2 (current-buffer)))
    (if ancestor-rev
	(save-excursion
	  (or (string= ancestor-rev "")
	      (sc-visit-previous-revision ancestor-rev))
	  (setq ancestor-buf (current-buffer))))
    (if ancestor-rev
	(ediff-merge-buffers-with-ancestor
	 buf1 buf2 ancestor-buf
	 startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
      (ediff-merge-buffers
       buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))


;; PCL-CVS.el support


(defun cvs-run-ediff-on-file-descriptor (tin)
;; This is a replacement for cvs-emerge-mode
;; Runs after cvs-update.
;; Ediff-merge appropriate revisions of the selected file.
  (let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
	 (type (cvs-fileinfo->type fileinfo))
	 (tmp-file
	  (cvs-retrieve-revision-to-tmpfile fileinfo))
	 (default-directory
	   (file-name-as-directory (cvs-fileinfo->dir fileinfo)))
	 ancestor-file)
    
    (or (memq type '(MERGED CONFLICT MODIFIED))
	(error
	 "Can only merge `Modified', `Merged' or `Conflict' files"))
    
    (cond ((memq type '(MERGED CONFLICT))
	   (setq ancestor-file
		 (cvs-retrieve-revision-to-tmpfile
		  fileinfo
		  ;; revision
		  (cvs-fileinfo->base-revision fileinfo)))
	   (ediff-merge-buffers-with-ancestor
	    (find-file-noselect tmp-file)
	    (find-file-noselect (cvs-fileinfo->backup-file fileinfo))
	    (find-file-noselect ancestor-file)
	    nil ; startup-hooks
	    'ediff-merge-revisions-with-ancestor))
	  ((eq type 'MODIFIED)
	   (ediff-buffers
	    (find-file-noselect tmp-file)
	    (find-file-noselect (cvs-fileinfo->full-path fileinfo))
	    nil ; startup-hooks
	    'ediff-revisions)))
    (if (stringp tmp-file) (delete-file tmp-file))
    (if (stringp ancestor-file) (delete-file ancestor-file))))

;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
;;; End:

(provide 'ediff-vers)

;;; ediff-vers.el ends here
Commit	Line	Data
8122a6da MK	1	;;; ediff-vers.el --- version control interface to Ediff
8122a6da MK	2
ddc90f39	3	;;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
8122a6da MK	4
	5	;; Author: Michael Kifer <kifer@cs.sunysb.edu>
	6
	7	;; This file is part of GNU Emacs.
	8
	9	;; GNU Emacs is free software; you can redistribute it and/or modify
	10	;; it under the terms of the GNU General Public License as published by
	11	;; the Free Software Foundation; either version 2, or (at your option)
	12	;; any later version.
	13
	14	;; GNU Emacs is distributed in the hope that it will be useful,
	15	;; but WITHOUT ANY WARRANTY; without even the implied warranty of
	16	;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	17	;; GNU General Public License for more details.
	18
	19	;; You should have received a copy of the GNU General Public License
	20	;; along with GNU Emacs; see the file COPYING. If not, write to the
	21	;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
	22	;; Boston, MA 02111-1307, USA.
	23
3afbc435	24	;;; Commentary:
8122a6da MK	25
8122a6da MK	26	;;; Code:
bbe6126c MK	27
	28	;; Compiler pacifier
	29	(defvar rcs-default-co-switches)
	30	(defvar sc-mode)
	31	(defvar cvs-shell)
	32	(defvar cvs-program)
	33	(defvar cvs-cookie-handle)
ddc90f39	34	(defvar ediff-temp-file-prefix)
bbe6126c	35
92c51e07 MK	36	(and noninteractive
	37	(eval-when-compile
	38	(load "pcl-cvs" 'noerror)
	39	(load "rcs" 'noerror)
c3f2772b EZ	40	;; On 8+3 MS-DOS filesystems, generic-x.el is loaded
	41	;; instead of (the missing) generic-sc.el. Since the
	42	;; version of Emacs which supports MS-DOS doesn't have
	43	;; generic-sc, we simply avoid loading it.
	44	(or (and (fboundp 'msdos-long-file-names)
	45	(not (msdos-long-file-names)))
	46	(load "generic-sc" 'noerror))
92c51e07	47	(load "vc" 'noerror)))
bbe6126c	48	;; end pacifier
8122a6da MK	49
8122a6da MK	50	;; VC.el support
92c51e07	51	(defun ediff-vc-internal (rev1 rev2 &optional startup-hooks)
8122a6da MK	52	;; Run Ediff on versions of the current buffer.
	53	;; If REV2 is "" then compare current buffer with REV1.
	54	;; If the current buffer is named `F', the version is named `F.~REV~'.
	55	;; If `F.~REV~' already exists, it is used instead of being re-created.
	56	(let (file1 file2 rev1buf rev2buf)
657f9cb8 MK	57	(save-window-excursion
	58	(save-excursion
	59	(vc-version-other-window rev1)
	60	(setq rev1buf (current-buffer)
	61	file1 (buffer-file-name)))
	62	(save-excursion
	63	(or (string= rev2 "") ; use current buffer
	64	(vc-version-other-window rev2))
	65	(setq rev2buf (current-buffer)
	66	file2 (buffer-file-name)))
	67	(setq startup-hooks
	68	(cons `(lambda ()
	69	(delete-file ,file1)
	70	(or ,(string= rev2 "") (delete-file ,file2)))
	71	startup-hooks)))
8122a6da MK	72	(ediff-buffers
	73	rev1buf rev2buf
	74	startup-hooks
	75	'ediff-revision)))
	76
	77	;; RCS.el support
	78	(defun rcs-ediff-view-revision (&optional rev)
	79	;; View previous RCS revision of current file.
	80	;; With prefix argument, prompts for a revision name.
	81	(interactive (list (if current-prefix-arg
	82	(read-string "Revision: "))))
	83	(let* ((filename (buffer-file-name (current-buffer)))
	84	(switches (append '("-p")
	85	(if rev (list (concat "-r" rev)) nil)))
	86	(buff (concat (file-name-nondirectory filename) ".~" rev "~")))
	87	(message "Working ...")
	88	(setq filename (expand-file-name filename))
	89	(with-output-to-temp-buffer buff
7de0717c DL	90	(ediff-with-current-buffer standard-output
7de0717c DL	91	(fundamental-mode))
8122a6da MK	92	(let ((output-buffer (ediff-rcs-get-output-buffer filename buff)))
	93	(delete-windows-on output-buffer)
	94	(save-excursion
	95	(set-buffer output-buffer)
	96	(apply 'call-process "co" nil t nil
	97	;; -q: quiet (no diagnostics)
	98	(append switches rcs-default-co-switches
	99	(list "-q" filename)))))
	100	(message "")
	101	buff)))
	102
	103	(defun ediff-rcs-get-output-buffer (file name)
	104	;; Get a buffer for RCS output for FILE, make it writable and clean it up.
	105	;; Optional NAME is name to use instead of `RCS-output'.
3af0304a	106	;; This is a modified version from rcs.el v1.1. I use it here to make
8122a6da MK	107	;; Ediff immune to changes in rcs.el
	108	(let* ((default-major-mode 'fundamental-mode) ; no frills!
	109	(buf (get-buffer-create name)))
	110	(save-excursion
	111	(set-buffer buf)
	112	(setq buffer-read-only nil
	113	default-directory (file-name-directory (expand-file-name file)))
	114	(erase-buffer))
	115	buf))
	116
92c51e07	117	(defun ediff-rcs-internal (rev1 rev2 &optional startup-hooks)
8122a6da MK	118	;; Run Ediff on versions of the current buffer.
8122a6da MK	119	;; If REV2 is "" then use current buffer.
657f9cb8 MK	120	(let (rev2buf rev1buf)
	121	(save-window-excursion
	122	(setq rev2buf (if (string= rev2 "")
	123	(current-buffer)
	124	(rcs-ediff-view-revision rev2))
	125	rev1buf (rcs-ediff-view-revision rev1)))
8122a6da MK	126
	127	;; rcs.el doesn't create temp version files, so we don't have to delete
	128	;; anything in startup hooks to ediff-buffers
	129	(ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)
	130	))
	131
	132
	133	;; GENERIC-SC.el support
	134
	135	(defun generic-sc-get-latest-rev ()
	136	(cond ((eq sc-mode 'CCASE)
	137	(eval "main/LATEST"))
	138	(t (eval ""))))
	139
92c51e07	140	(defun ediff-generic-sc-internal (rev1 rev2 &optional startup-hooks)
8122a6da MK	141	;; Run Ediff on versions of the current buffer.
	142	;; If REV2 is "" then compare current buffer with REV1.
	143	;; If the current buffer is named `F', the version is named `F.~REV~'.
	144	;; If `F.~REV~' already exists, it is used instead of being re-created.
	145	(let (rev1buf rev2buf)
	146	(save-excursion
	147	(if (or (not rev1) (string= rev1 ""))
	148	(setq rev1 (generic-sc-get-latest-rev)))
	149	(sc-visit-previous-revision rev1)
	150	(setq rev1buf (current-buffer)))
	151	(save-excursion
	152	(or (string= rev2 "") ; use current buffer
	153	(sc-visit-previous-revision rev2))
	154	(setq rev2buf (current-buffer)))
	155	(ediff-buffers rev1buf rev2buf startup-hooks 'ediff-revision)))
	156
	157
	158	;;; Merge with Version Control
	159
328b4b70 MK	160	(defun ediff-vc-merge-internal (rev1 rev2 ancestor-rev
328b4b70 MK	161	&optional startup-hooks merge-buffer-file)
8122a6da MK	162	;; If ANCESTOR-REV non-nil, merge with ancestor
8122a6da MK	163	(let (buf1 buf2 ancestor-buf)
657f9cb8 MK	164	(save-window-excursion
	165	(save-excursion
	166	(vc-version-other-window rev1)
	167	(setq buf1 (current-buffer)))
	168	(save-excursion
	169	(or (string= rev2 "")
	170	(vc-version-other-window rev2))
	171	(setq buf2 (current-buffer)))
	172	(if ancestor-rev
	173	(save-excursion
	174	(if (string= ancestor-rev "")
	175	(setq ancestor-rev (vc-workfile-version buffer-file-name)))
	176	(vc-version-other-window ancestor-rev)
	177	(setq ancestor-buf (current-buffer))))
	178	(setq startup-hooks
	179	(cons
	180	`(lambda ()
	181	(delete-file ,(buffer-file-name buf1))
	182	(or ,(string= rev2 "")
	183	(delete-file ,(buffer-file-name buf2)))
	184	(or ,(string= ancestor-rev "")
	185	,(not ancestor-rev)
	186	(delete-file ,(buffer-file-name ancestor-buf)))
	187	)
	188	startup-hooks)))
8122a6da MK	189	(if ancestor-rev
	190	(ediff-merge-buffers-with-ancestor
	191	buf1 buf2 ancestor-buf
328b4b70 MK	192	startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
	193	(ediff-merge-buffers
	194	buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
8122a6da MK	195	))
8122a6da MK	196
92c51e07	197	(defun ediff-rcs-merge-internal (rev1 rev2 ancestor-rev
328b4b70 MK	198	&optional
328b4b70 MK	199	startup-hooks merge-buffer-file)
8122a6da MK	200	;; If ANCESTOR-REV non-nil, merge with ancestor
8122a6da MK	201	(let (buf1 buf2 ancestor-buf)
657f9cb8 MK	202	(save-window-excursion
	203	(setq buf1 (rcs-ediff-view-revision rev1)
	204	buf2 (if (string= rev2 "")
	205	(current-buffer)
	206	(rcs-ediff-view-revision rev2))
	207	ancestor-buf (if ancestor-rev
	208	(if (string= ancestor-rev "")
	209	(current-buffer)
	210	(rcs-ediff-view-revision ancestor-rev)))))
8122a6da MK	211	;; rcs.el doesn't create temp version files, so we don't have to delete
	212	;; anything in startup hooks to ediff-buffers
	213	(if ancestor-rev
	214	(ediff-merge-buffers-with-ancestor
	215	buf1 buf2 ancestor-buf
328b4b70 MK	216	startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
	217	(ediff-merge-buffers
	218	buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
8122a6da	219
92c51e07	220	(defun ediff-generic-sc-merge-internal (rev1 rev2 ancestor-rev
328b4b70 MK	221	&optional
328b4b70 MK	222	startup-hooks merge-buffer-file)
8122a6da MK	223	;; If ANCESTOR-REV non-nil, merge with ancestor
	224	(let (buf1 buf2 ancestor-buf)
	225	(save-excursion
	226	(if (string= rev1 "")
	227	(setq rev1 (generic-sc-get-latest-rev)))
	228	(sc-visit-previous-revision rev1)
	229	(setq buf1 (current-buffer)))
	230	(save-excursion
	231	(or (string= rev2 "")
	232	(sc-visit-previous-revision rev2))
	233	(setq buf2 (current-buffer)))
	234	(if ancestor-rev
	235	(save-excursion
	236	(or (string= ancestor-rev "")
	237	(sc-visit-previous-revision ancestor-rev))
	238	(setq ancestor-buf (current-buffer))))
	239	(if ancestor-rev
	240	(ediff-merge-buffers-with-ancestor
	241	buf1 buf2 ancestor-buf
328b4b70 MK	242	startup-hooks 'ediff-merge-revisions-with-ancestor merge-buffer-file)
	243	(ediff-merge-buffers
	244	buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
8122a6da MK	245
	246
	247	;; PCL-CVS.el support
	248
8122a6da MK	249
	250	(defun cvs-run-ediff-on-file-descriptor (tin)
	251	;; This is a replacement for cvs-emerge-mode
328b4b70	252	;; Runs after cvs-update.
8122a6da MK	253	;; Ediff-merge appropriate revisions of the selected file.
	254	(let* ((fileinfo (tin-cookie cvs-cookie-handle tin))
	255	(type (cvs-fileinfo->type fileinfo))
	256	(tmp-file
	257	(cvs-retrieve-revision-to-tmpfile fileinfo))
c004db97	258	(default-directory
2eb4bdca	259	(file-name-as-directory (cvs-fileinfo->dir fileinfo)))
8122a6da MK	260	ancestor-file)
	261
	262	(or (memq type '(MERGED CONFLICT MODIFIED))
	263	(error
	264	"Can only merge `Modified', `Merged' or `Conflict' files"))
	265
	266	(cond ((memq type '(MERGED CONFLICT))
	267	(setq ancestor-file
	268	(cvs-retrieve-revision-to-tmpfile
	269	fileinfo
	270	;; revision
	271	(cvs-fileinfo->base-revision fileinfo)))
	272	(ediff-merge-buffers-with-ancestor
	273	(find-file-noselect tmp-file)
	274	(find-file-noselect (cvs-fileinfo->backup-file fileinfo))
	275	(find-file-noselect ancestor-file)
	276	nil ; startup-hooks
	277	'ediff-merge-revisions-with-ancestor))
	278	((eq type 'MODIFIED)
c004db97	279	(ediff-buffers
8122a6da MK	280	(find-file-noselect tmp-file)
	281	(find-file-noselect (cvs-fileinfo->full-path fileinfo))
	282	nil ; startup-hooks
c004db97	283	'ediff-revisions)))
8122a6da MK	284	(if (stringp tmp-file) (delete-file tmp-file))
	285	(if (stringp ancestor-file) (delete-file ancestor-file))))
	286
	287	;;; Local Variables:
	288	;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
e756eb9f MK	289	;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
e756eb9f MK	290	;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
8122a6da MK	291	;;; End:
	292
	293	(provide 'ediff-vers)
	294
	295	;;; ediff-vers.el ends here