1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
|
;;; 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.
;;; 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)
(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-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
(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 (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-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
(or (string= ancestor-rev "")
(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)
(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 ediff-pcl-cvs-internal (rev1 rev2 &optional startup-hooks)
;; Run Ediff on a pair of revisions of the current buffer.
;; If REV1 is "", use the latest revision.
;; If REV2 is "", use the current buffer as the second file to compare.
(let ((orig-buf (current-buffer))
orig-file-name buf1 buf2 file1 file2)
(or (setq orig-file-name (buffer-file-name (current-buffer)))
(error "Current buffer is not visiting any file"))
(if (string= rev1 "") (setq rev1 nil)) ; latest revision
(setq buf1 (ediff-pcl-cvs-view-revision orig-file-name rev1)
buf2 (if (string= rev2 "")
orig-buf
(ediff-pcl-cvs-view-revision orig-file-name rev2))
file1 (buffer-file-name buf1)
file2 (buffer-file-name buf2))
(setq startup-hooks
(cons (` (lambda ()
(delete-file (, file1))
(or (, (string= rev2 "")) (delete-file (, file2)))
))
startup-hooks))
(ediff-buffers buf1 buf2 startup-hooks 'ediff-revision)))
;; This function is the standard Ediff's interface to pcl-cvs.
;; Works like with other interfaces: runs ediff on versions of the file in the
;; current buffer.
(defun ediff-pcl-cvs-merge-internal (rev1 rev2 ancestor-rev
&optional
startup-hooks merge-buffer-file)
;; Ediff-merge appropriate revisions of the selected file.
;; If REV1 is "" then use the latest revision.
;; If REV2 is "" then merge current buffer's file with REV1.
;; If ANCESTOR-REV is "" then use current buffer's file as ancestor.
;; If ANCESTOR-REV is nil, then merge without the ancestor.
(let ((orig-buf (current-buffer))
orig-file-name buf1 buf2 ancestor-buf)
(or (setq orig-file-name (buffer-file-name (current-buffer)))
(error "Current buffer is not visiting any file"))
(if (string= rev1 "") (setq rev1 nil)) ; latest revision
(setq buf1 (ediff-pcl-cvs-view-revision orig-file-name rev1))
(setq buf2 (if (string= rev2 "")
orig-buf
(ediff-pcl-cvs-view-revision orig-file-name rev2)))
(if (stringp ancestor-rev)
(setq ancestor-buf
(if (string= ancestor-rev "")
orig-buf
(ediff-pcl-cvs-view-revision orig-file-name ancestor-rev))))
(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-buf
(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-pcl-cvs-view-revision (file rev)
;; if rev = "", get the latest revision
(let ((temp-name (make-temp-name
(concat ediff-temp-file-prefix
"ediff_" rev))))
(cvs-kill-buffer-visiting temp-name)
(if rev
(message "Retrieving revision %s..." rev)
(message "Retrieving latest revision..."))
(let ((res (call-process cvs-shell nil nil nil "-c"
(concat cvs-program " update -p "
(if rev
(concat "-r " rev " ")
"")
file
" > " temp-name))))
(if (and res (not (and (integerp res) (zerop res))))
(error "Failed to retrieve revision: %s" res))
(if rev
(message "Retrieving revision %s... Done." rev)
(message "Retrieving latest revision... Done."))
(find-file-noselect temp-name))))
(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
|
