|
0
|
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
|
|
|
2
|
|
70
|
3 ;; Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
|
|
0
|
4
|
|
|
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
|
|
|
6 ;; Created: February 2, 1994
|
|
|
7 ;; Keywords: comparing, merging, patching, version control.
|
|
|
8
|
|
80
|
9 (defconst ediff-version "2.64" "The current version of Ediff")
|
|
|
10 (defconst ediff-date "January 3, 1997" "Date of last update")
|
|
0
|
11
|
|
|
12
|
|
|
13 ;; This file is part of GNU Emacs.
|
|
|
14
|
|
|
15 ;; GNU Emacs is free software; you can redistribute it and/or modify
|
|
|
16 ;; it under the terms of the GNU General Public License as published by
|
|
|
17 ;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
18 ;; any later version.
|
|
|
19
|
|
|
20 ;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
21 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
22 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
23 ;; GNU General Public License for more details.
|
|
|
24
|
|
|
25 ;; You should have received a copy of the GNU General Public License
|
|
|
26 ;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
27 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
|
28 ;; Boston, MA 02111-1307, USA.
|
|
|
29
|
|
|
30 ;;; Commentary:
|
|
|
31
|
|
|
32 ;; Never read that diff output again!
|
|
|
33 ;; Apply patch interactively!
|
|
|
34 ;; Merge with ease!
|
|
|
35
|
|
|
36 ;; This package provides a convenient way of simultaneous browsing through
|
|
|
37 ;; the differences between a pair (or a triple) of files or buffers. The
|
|
|
38 ;; files being compared, file-A, file-B, and file-C (if applicable) are
|
|
|
39 ;; shown in separate windows (side by side, one above the another, or in
|
|
|
40 ;; separate frames), and the differences are highlighted as you step
|
|
|
41 ;; through them. You can also copy difference regions from one buffer to
|
|
|
42 ;; another (and recover old differences if you change your mind).
|
|
|
43
|
|
|
44 ;; Ediff also supports merging operations on files and buffers, including
|
|
|
45 ;; merging using ancestor versions. Both comparison and merging operations can
|
|
|
46 ;; be performed on directories, i.e., by pairwise comparison of files in those
|
|
|
47 ;; directories.
|
|
|
48
|
|
|
49 ;; In addition, Ediff can apply a patch to a file and then let you step
|
|
|
50 ;; though both files, the patched and the original one, simultaneously,
|
|
|
51 ;; difference-by-difference. You can even apply a patch right out of a
|
|
|
52 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
|
|
|
53 ;; Since Ediff lets you copy differences between buffers, you can, in
|
|
|
54 ;; effect, apply patches selectively (i.e., you can copy a difference
|
|
|
55 ;; region from file_orig to file, thereby undoing any particular patch that
|
|
|
56 ;; you don't like).
|
|
|
57
|
|
|
58 ;; Ediff is aware of version control, which lets the user compare
|
|
|
59 ;; files with their older versions. Ediff can also work with remote and
|
|
|
60 ;; compressed files. Details are given below.
|
|
|
61
|
|
|
62 ;; Finally, Ediff supports directory-level comparison, merging and patching.
|
|
|
63 ;; See the on-line manual for details.
|
|
|
64
|
|
|
65 ;; This package builds upon the ideas borrowed from emerge.el and several
|
|
|
66 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
|
|
|
67 ;; Ediff provides is also influenced by emerge.el.
|
|
|
68
|
|
|
69 ;; The present version of Ediff supersedes Emerge. It provides a superior user
|
|
|
70 ;; interface and has numerous major features not found in Emerge. In
|
|
|
71 ;; particular, it can do patching, and 2-way and 3-way file comparison,
|
|
|
72 ;; merging, and directory operations.
|
|
|
73
|
|
|
74
|
|
|
75
|
|
|
76 ;;; Bugs:
|
|
|
77
|
|
|
78 ;; 1. The undo command doesn't restore deleted regions well. That is, if
|
|
|
79 ;; you delete all characters in a difference region and then invoke
|
|
|
80 ;; `undo', the reinstated text will most likely be inserted outside of
|
|
|
81 ;; what Ediff thinks is the current difference region. (This problem
|
|
|
82 ;; doesn't seem to exist with XEmacs.)
|
|
|
83 ;;
|
|
|
84 ;; If at any point you feel that difference regions are no longer correct,
|
|
|
85 ;; you can hit '!' to recompute the differences.
|
|
|
86
|
|
|
87 ;; 2. On a monochrome display, the repertoire of faces with which to
|
|
|
88 ;; highlight fine differences is limited. By default, Ediff is using
|
|
|
89 ;; underlining. However, if the region is already underlined by some other
|
|
|
90 ;; overlays, there is no simple way to temporarily remove that residual
|
|
|
91 ;; underlining. This problem occurs when a buffer is highlighted with
|
|
|
92 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
|
|
|
93 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
|
|
|
94 ;; provide commands for unhighlighting buffers. You can either place these
|
|
|
95 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
|
|
|
96 ;; buffer used by Ediff) or you can execute them interactively, at any time
|
|
|
97 ;; and on any buffer.
|
|
|
98
|
|
|
99
|
|
|
100 ;;; Acknowledgements:
|
|
|
101
|
|
|
102 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
|
|
|
103 ;; Ediff would not have been possible without the help and encouragement of
|
|
|
104 ;; its many users. See Ediff on-line Info for the full list of those who
|
|
|
105 ;; helped. Improved defaults in Ediff file-name reading commands.
|
|
|
106
|
|
|
107 ;;; Code:
|
|
|
108
|
|
80
|
109 (provide 'ediff)
|
|
0
|
110
|
|
80
|
111 ;; Compiler pacifier
|
|
|
112 (eval-when-compile
|
|
|
113 (let ((load-path (cons "." load-path)))
|
|
|
114 (load "dired")
|
|
|
115 (or (featurep 'ediff-init)
|
|
|
116 (load "ediff-init.el" nil nil 'nosuffix))
|
|
|
117 (or (featurep 'ediff-mult)
|
|
|
118 (load "ediff-mult.el" nil nil 'nosuffix))
|
|
|
119 (or (featurep 'ediff-ptch)
|
|
|
120 (load "ediff-ptch.el" nil nil 'nosuffix))
|
|
|
121 (or (featurep 'ediff-vers)
|
|
|
122 (load "ediff-vers.el" nil nil 'nosuffix))
|
|
|
123 (load "pcl-cvs" 'noerror)
|
|
|
124 ))
|
|
|
125 ;; end pacifier
|
|
|
126
|
|
|
127 (require 'ediff-init)
|
|
|
128 (require 'ediff-mult) ; required because of the registry stuff
|
|
0
|
129
|
|
|
130 (defvar ediff-use-last-dir nil
|
|
|
131 "*If t, Ediff uses previous directory as default when reading file name.")
|
|
|
132
|
|
|
133 (defvar ediff-last-dir-A nil
|
|
|
134 "Last directory used by an Ediff command for file-A.")
|
|
|
135 (defvar ediff-last-dir-B nil
|
|
|
136 "Last directory used by an Ediff command for file-B.")
|
|
|
137 (defvar ediff-last-dir-C nil
|
|
|
138 "Last directory used by an Ediff command for file-C.")
|
|
|
139 (defvar ediff-last-dir-ancestor nil
|
|
|
140 "Last directory used by an Ediff command for the ancestor file.")
|
|
78
|
141 (defvar ediff-last-merge-autostore-dir
|
|
|
142 "Last directory used by an Ediff command as the output directory for merge.")
|
|
0
|
143
|
|
|
144 ;; Some defvars to reduce the number of compiler warnings
|
|
|
145 (defvar cvs-cookie-handle)
|
|
|
146 (defvar ediff-last-dir-patch)
|
|
|
147 (defvar ediff-patch-default-directory)
|
|
|
148 ;; end of compiler pacifier
|
|
|
149
|
|
|
150
|
|
|
151 ;; Used as a startup hook to set `_orig' patch file read-only.
|
|
|
152 (defun ediff-set-read-only-in-buf-A ()
|
|
|
153 (ediff-eval-in-buffer ediff-buffer-A
|
|
|
154 (toggle-read-only 1)))
|
|
|
155
|
|
|
156 ;; Return a plausible default for ediff's first file:
|
|
|
157 ;; In dired, return the file name under the point, unless it is a directory
|
|
|
158 ;; If the buffer has a file name, return that file name.
|
|
|
159 (defun ediff-get-default-file-name ()
|
|
|
160 (cond ((eq major-mode 'dired-mode)
|
|
|
161 (let ((f (dired-get-filename nil 'no-error)))
|
|
|
162 (if (and (stringp f) (not (file-directory-p f)))
|
|
|
163 f)))
|
|
|
164 ((buffer-file-name (current-buffer))
|
|
|
165 (file-name-nondirectory (buffer-file-name (current-buffer))))
|
|
|
166 ))
|
|
|
167
|
|
|
168 ;;; Compare files/buffers
|
|
|
169
|
|
|
170 ;;;###autoload
|
|
|
171 (defun ediff-files (file-A file-B &optional startup-hooks)
|
|
|
172 "Run Ediff on a pair of files, FILE-A and FILE-B."
|
|
|
173 (interactive
|
|
|
174 (let ((dir-A (if ediff-use-last-dir
|
|
|
175 ediff-last-dir-A
|
|
|
176 default-directory))
|
|
|
177 dir-B f)
|
|
|
178 (list (setq f (ediff-read-file-name
|
|
|
179 "File A to compare" dir-A
|
|
|
180 (ediff-get-default-file-name)))
|
|
|
181 (ediff-read-file-name "File B to compare"
|
|
|
182 (setq dir-B
|
|
|
183 (if ediff-use-last-dir
|
|
|
184 ediff-last-dir-B
|
|
|
185 (file-name-directory f)))
|
|
|
186 (progn
|
|
|
187 (setq file-name-history
|
|
|
188 (cons (ediff-abbreviate-file-name
|
|
|
189 (expand-file-name
|
|
|
190 (file-name-nondirectory f)
|
|
|
191 dir-B))
|
|
|
192 file-name-history))
|
|
|
193 f))
|
|
|
194 )))
|
|
|
195 (ediff-files-internal file-A
|
|
|
196 (if (file-directory-p file-B)
|
|
|
197 (expand-file-name
|
|
|
198 (file-name-nondirectory file-A) file-B)
|
|
|
199 file-B)
|
|
|
200 nil ; file-C
|
|
|
201 startup-hooks
|
|
|
202 'ediff-files))
|
|
|
203
|
|
|
204 ;;;###autoload
|
|
|
205 (defun ediff-files3 (file-A file-B file-C &optional startup-hooks)
|
|
|
206 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
|
|
|
207 (interactive
|
|
|
208 (let ((dir-A (if ediff-use-last-dir
|
|
|
209 ediff-last-dir-A
|
|
|
210 default-directory))
|
|
|
211 dir-B dir-C f ff)
|
|
|
212 (list (setq f (ediff-read-file-name
|
|
|
213 "File A to compare" dir-A
|
|
|
214 (ediff-get-default-file-name)))
|
|
|
215 (setq ff (ediff-read-file-name "File B to compare"
|
|
|
216 (setq dir-B
|
|
|
217 (if ediff-use-last-dir
|
|
|
218 ediff-last-dir-B
|
|
|
219 (file-name-directory f)))
|
|
|
220 (progn
|
|
|
221 (setq file-name-history
|
|
|
222 (cons
|
|
|
223 (ediff-abbreviate-file-name
|
|
|
224 (expand-file-name
|
|
|
225 (file-name-nondirectory f)
|
|
|
226 dir-B))
|
|
|
227 file-name-history))
|
|
|
228 f)))
|
|
|
229 (ediff-read-file-name "File C to compare"
|
|
|
230 (setq dir-C (if ediff-use-last-dir
|
|
|
231 ediff-last-dir-C
|
|
|
232 (file-name-directory ff)))
|
|
|
233 (progn
|
|
|
234 (setq file-name-history
|
|
|
235 (cons (ediff-abbreviate-file-name
|
|
|
236 (expand-file-name
|
|
|
237 (file-name-nondirectory ff)
|
|
|
238 dir-C))
|
|
|
239 file-name-history))
|
|
|
240 ff))
|
|
|
241 )))
|
|
|
242 (ediff-files-internal file-A
|
|
|
243 (if (file-directory-p file-B)
|
|
|
244 (expand-file-name
|
|
|
245 (file-name-nondirectory file-A) file-B)
|
|
|
246 file-B)
|
|
|
247 (if (file-directory-p file-C)
|
|
|
248 (expand-file-name
|
|
|
249 (file-name-nondirectory file-A) file-C)
|
|
|
250 file-C)
|
|
|
251 startup-hooks
|
|
|
252 'ediff-files3))
|
|
|
253
|
|
|
254 ;;;###autoload
|
|
|
255 (defalias 'ediff3 'ediff-files3)
|
|
|
256
|
|
|
257
|
|
|
258 ;; Visit FILE and arrange its buffer to Ediff's liking.
|
|
|
259 ;; FILE is actually a variable symbol that must contain a true file name.
|
|
|
260 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
|
|
|
261 ;; which FILE is read.
|
|
|
262 ;; LAST-DIR is the directory variable symbol where FILE's
|
|
|
263 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
|
|
|
264 ;; be assigned the hook to be executed after `ediff-startup' is finished.
|
|
|
265 ;; `ediff-find-file' arranges that the temp files it might create will be
|
|
|
266 ;; deleted.
|
|
|
267 (defun ediff-find-file (file-var buffer-name &optional last-dir hooks-var)
|
|
|
268 (let* ((file (symbol-value file-var))
|
|
|
269 (file-magic (find-file-name-handler file 'find-file-noselect))
|
|
|
270 (temp-file-name-prefix (file-name-nondirectory file)))
|
|
|
271 (cond ((not (file-readable-p file))
|
|
|
272 (error "File `%s' does not exist or is not readable" file))
|
|
|
273 ((file-directory-p file)
|
|
|
274 (error "File `%s' is a directory" file)))
|
|
|
275
|
|
|
276 ;; some of the commands, below, require full file name
|
|
|
277 (setq file (expand-file-name file))
|
|
|
278
|
|
|
279 ;; Record the directory of the file
|
|
|
280 (if last-dir
|
|
|
281 (set last-dir (expand-file-name (file-name-directory file))))
|
|
|
282
|
|
|
283 ;; Setup the buffer
|
|
|
284 (set buffer-name (find-file-noselect file))
|
|
|
285
|
|
|
286 (ediff-eval-in-buffer (symbol-value buffer-name)
|
|
|
287 (widen) ; Make sure the entire file is seen
|
|
70
|
288 (cond (file-magic ;; file has handler, such as jka-compr-handler or
|
|
|
289 ;; ange-ftp-hook-function--arrange for temp file
|
|
0
|
290 (ediff-verify-file-buffer 'magic)
|
|
|
291 (setq file
|
|
|
292 (ediff-make-temp-file
|
|
|
293 (current-buffer) temp-file-name-prefix))
|
|
|
294 (set hooks-var (cons (` (lambda () (delete-file (, file))))
|
|
|
295 (symbol-value hooks-var))))
|
|
|
296 ;; file processed via auto-mode-alist, a la uncompress.el
|
|
|
297 ((not (equal (file-truename file)
|
|
|
298 (file-truename (buffer-file-name))))
|
|
|
299 (setq file
|
|
|
300 (ediff-make-temp-file
|
|
|
301 (current-buffer) temp-file-name-prefix))
|
|
|
302 (set hooks-var (cons (` (lambda () (delete-file (, file))))
|
|
|
303 (symbol-value hooks-var))))
|
|
|
304 (t ;; plain file---just check that the file matches the buffer
|
|
|
305 (ediff-verify-file-buffer))))
|
|
|
306 (set file-var file)))
|
|
|
307
|
|
|
308 (defun ediff-files-internal (file-A file-B file-C startup-hooks job-name)
|
|
|
309 (let (buf-A buf-B buf-C)
|
|
|
310 (message "Reading file %s ... " file-A)
|
|
|
311 ;;(sit-for 0)
|
|
|
312 (ediff-find-file 'file-A 'buf-A 'ediff-last-dir-A 'startup-hooks)
|
|
|
313 (message "Reading file %s ... " file-B)
|
|
|
314 ;;(sit-for 0)
|
|
|
315 (ediff-find-file 'file-B 'buf-B 'ediff-last-dir-B 'startup-hooks)
|
|
|
316 (if (stringp file-C)
|
|
|
317 (progn
|
|
|
318 (message "Reading file %s ... " file-C)
|
|
|
319 ;;(sit-for 0)
|
|
|
320 (ediff-find-file
|
|
|
321 'file-C 'buf-C
|
|
|
322 (if (eq job-name 'ediff-merge-files-with-ancestor)
|
|
|
323 'ediff-last-dir-ancestor 'ediff-last-dir-C)
|
|
|
324 'startup-hooks)))
|
|
|
325 (ediff-setup buf-A file-A
|
|
|
326 buf-B file-B
|
|
|
327 buf-C file-C
|
|
|
328 startup-hooks
|
|
|
329 (list (cons 'ediff-job-name job-name)))))
|
|
|
330
|
|
|
331
|
|
|
332 ;;;###autoload
|
|
|
333 (defalias 'ediff 'ediff-files)
|
|
|
334
|
|
|
335
|
|
|
336 ;;;###autoload
|
|
|
337 (defun ediff-buffers (buffer-A buffer-B &optional startup-hooks job-name)
|
|
|
338 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
|
|
|
339 (interactive
|
|
|
340 (let (bf)
|
|
|
341 (list (setq bf (read-buffer "Buffer A to compare: "
|
|
|
342 (ediff-other-buffer "") t))
|
|
|
343 (read-buffer "Buffer B to compare: "
|
|
|
344 (progn
|
|
|
345 ;; realign buffers so that two visible bufs will be
|
|
|
346 ;; at the top
|
|
|
347 (save-window-excursion (other-window 1))
|
|
|
348 (ediff-other-buffer bf))
|
|
|
349 t))))
|
|
|
350 (or job-name (setq job-name 'ediff-buffers))
|
|
|
351 (ediff-buffers-internal buffer-A buffer-B nil startup-hooks job-name))
|
|
|
352
|
|
|
353 ;;;###autoload
|
|
|
354 (defalias 'ebuffers 'ediff-buffers)
|
|
|
355
|
|
|
356
|
|
|
357 ;;;###autoload
|
|
|
358 (defun ediff-buffers3 (buffer-A buffer-B buffer-C
|
|
|
359 &optional startup-hooks job-name)
|
|
|
360 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
|
|
|
361 (interactive
|
|
|
362 (let (bf bff)
|
|
|
363 (list (setq bf (read-buffer "Buffer A to compare: "
|
|
|
364 (ediff-other-buffer "") t))
|
|
|
365 (setq bff (read-buffer "Buffer B to compare: "
|
|
|
366 (progn
|
|
|
367 ;; realign buffers so that two visible
|
|
|
368 ;; bufs will be at the top
|
|
|
369 (save-window-excursion (other-window 1))
|
|
|
370 (ediff-other-buffer bf))
|
|
|
371 t))
|
|
|
372 (read-buffer "Buffer C to compare: "
|
|
|
373 (progn
|
|
|
374 ;; realign buffers so that three visible
|
|
|
375 ;; bufs will be at the top
|
|
|
376 (save-window-excursion (other-window 1))
|
|
|
377 (ediff-other-buffer (list bf bff)))
|
|
|
378 t)
|
|
|
379 )))
|
|
|
380 (or job-name (setq job-name 'ediff-buffers3))
|
|
|
381 (ediff-buffers-internal buffer-A buffer-B buffer-C startup-hooks job-name))
|
|
|
382
|
|
|
383 ;;;###autoload
|
|
|
384 (defalias 'ebuffers3 'ediff-buffers3)
|
|
|
385
|
|
|
386
|
|
|
387
|
|
|
388 (defun ediff-buffers-internal (buf-A buf-B buf-C startup-hooks job-name)
|
|
|
389 (let* ((buf-A-file-name (buffer-file-name (get-buffer buf-A)))
|
|
|
390 (buf-B-file-name (buffer-file-name (get-buffer buf-B)))
|
|
|
391 (buf-C-is-alive (ediff-buffer-live-p buf-C))
|
|
|
392 (buf-C-file-name (if buf-C-is-alive
|
|
|
393 (buffer-file-name (get-buffer buf-B))))
|
|
|
394 file-A file-B file-C)
|
|
|
395 (if (not (ediff-buffer-live-p buf-A))
|
|
|
396 (error "Buffer %S doesn't exist" buf-A))
|
|
|
397 (if (not (ediff-buffer-live-p buf-B))
|
|
|
398 (error "Buffer %S doesn't exist" buf-B))
|
|
|
399 (let ((ediff-job-name job-name))
|
|
|
400 (if (and ediff-3way-comparison-job
|
|
|
401 (not buf-C-is-alive))
|
|
|
402 (error "Buffer %S doesn't exist" buf-C)))
|
|
|
403 (if (stringp buf-A-file-name)
|
|
|
404 (setq buf-A-file-name (file-name-nondirectory buf-A-file-name)))
|
|
|
405 (if (stringp buf-B-file-name)
|
|
|
406 (setq buf-B-file-name (file-name-nondirectory buf-B-file-name)))
|
|
|
407 (if (stringp buf-C-file-name)
|
|
|
408 (setq buf-C-file-name (file-name-nondirectory buf-C-file-name)))
|
|
|
409
|
|
|
410 (setq file-A (ediff-make-temp-file buf-A buf-A-file-name)
|
|
|
411 file-B (ediff-make-temp-file buf-B buf-B-file-name))
|
|
|
412 (if buf-C-is-alive
|
|
|
413 (setq file-C (ediff-make-temp-file buf-C buf-C-file-name)))
|
|
|
414
|
|
|
415 (ediff-setup (get-buffer buf-A) file-A
|
|
|
416 (get-buffer buf-B) file-B
|
|
|
417 (if buf-C-is-alive (get-buffer buf-C))
|
|
|
418 file-C
|
|
|
419 (cons (` (lambda ()
|
|
|
420 (delete-file (, file-A))
|
|
|
421 (delete-file (, file-B))
|
|
|
422 (if (stringp (, file-C)) (delete-file (, file-C)))
|
|
|
423 ))
|
|
|
424 startup-hooks)
|
|
|
425 (list (cons 'ediff-job-name job-name))
|
|
|
426 )))
|
|
|
427
|
|
|
428
|
|
|
429 ;;; Directory and file group operations
|
|
|
430
|
|
|
431 ;; Get appropriate default name for directory:
|
|
|
432 ;; If ediff-use-last-dir, use ediff-last-dir-A.
|
|
|
433 ;; In dired mode, use the directory that is under the point (if any);
|
|
|
434 ;; otherwise, use default-directory
|
|
|
435 (defun ediff-get-default-directory-name ()
|
|
|
436 (cond (ediff-use-last-dir ediff-last-dir-A)
|
|
|
437 ((eq major-mode 'dired-mode)
|
|
|
438 (let ((f (dired-get-filename nil 'noerror)))
|
|
|
439 (if (and (stringp f) (file-directory-p f))
|
|
|
440 f
|
|
|
441 default-directory)))
|
|
|
442 (t default-directory)))
|
|
|
443
|
|
|
444
|
|
|
445 ;;;###autoload
|
|
|
446 (defun ediff-directories (dir1 dir2 regexp)
|
|
|
447 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
|
|
|
448 the same name in both. The third argument, REGEXP, is a regular expression that
|
|
|
449 can be used to filter out certain file names."
|
|
|
450 (interactive
|
|
|
451 (let ((dir-A (ediff-get-default-directory-name))
|
|
|
452 f)
|
|
|
453 (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
|
|
|
454 (ediff-read-file-name "Directory B to compare:"
|
|
|
455 (if ediff-use-last-dir
|
|
|
456 ediff-last-dir-B
|
|
|
457 (ediff-strip-last-dir f))
|
|
|
458 nil)
|
|
|
459 (read-string "Filter through regular expression: "
|
|
|
460 nil 'ediff-filtering-regexp-history)
|
|
|
461 )))
|
|
|
462 (ediff-directories-internal
|
|
|
463 dir1 dir2 nil regexp 'ediff-files 'ediff-directories
|
|
|
464 ))
|
|
|
465
|
|
|
466 ;;;###autoload
|
|
|
467 (defalias 'edirs 'ediff-directories)
|
|
|
468
|
|
|
469
|
|
|
470 ;;;###autoload
|
|
|
471 (defun ediff-directory-revisions (dir1 regexp)
|
|
|
472 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
|
|
|
473 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
474 names. Only the files that are under revision control are taken into account."
|
|
|
475 (interactive
|
|
|
476 (let ((dir-A (ediff-get-default-directory-name)))
|
|
|
477 (list (ediff-read-file-name
|
|
|
478 "Directory to compare with revision:" dir-A nil)
|
|
|
479 (read-string "Filter through regular expression: "
|
|
|
480 nil 'ediff-filtering-regexp-history)
|
|
|
481 )))
|
|
|
482 (ediff-directory-revisions-internal
|
|
|
483 dir1 regexp 'ediff-revision 'ediff-directory-revisions
|
|
|
484 ))
|
|
|
485
|
|
|
486 ;;;###autoload
|
|
|
487 (defalias 'edir-revisions 'ediff-directory-revisions)
|
|
|
488
|
|
|
489
|
|
|
490 ;;;###autoload
|
|
|
491 (defun ediff-directories3 (dir1 dir2 dir3 regexp)
|
|
|
492 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
|
|
|
493 have the same name in all three. The last argument, REGEXP, is a regular
|
|
|
494 expression that can be used to filter out certain file names."
|
|
|
495 (interactive
|
|
|
496 (let ((dir-A (ediff-get-default-directory-name))
|
|
|
497 f)
|
|
|
498 (list (setq f (ediff-read-file-name "Directory A to compare:" dir-A nil))
|
|
|
499 (setq f (ediff-read-file-name "Directory B to compare:"
|
|
|
500 (if ediff-use-last-dir
|
|
|
501 ediff-last-dir-B
|
|
|
502 (ediff-strip-last-dir f))
|
|
|
503 nil))
|
|
|
504 (ediff-read-file-name "Directory C to compare:"
|
|
|
505 (if ediff-use-last-dir
|
|
|
506 ediff-last-dir-C
|
|
|
507 (ediff-strip-last-dir f))
|
|
|
508 nil)
|
|
|
509 (read-string "Filter through regular expression: "
|
|
|
510 nil 'ediff-filtering-regexp-history)
|
|
|
511 )))
|
|
|
512 (ediff-directories-internal
|
|
|
513 dir1 dir2 dir3 regexp 'ediff-files3 'ediff-directories3
|
|
|
514 ))
|
|
|
515
|
|
|
516 ;;;###autoload
|
|
|
517 (defalias 'edirs3 'ediff-directories3)
|
|
|
518
|
|
|
519 ;;;###autoload
|
|
|
520 (defun ediff-merge-directories (dir1 dir2 regexp)
|
|
|
521 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
|
|
|
522 the same name in both. The third argument, REGEXP, is a regular expression that
|
|
|
523 can be used to filter out certain file names."
|
|
|
524 (interactive
|
|
|
525 (let ((dir-A (ediff-get-default-directory-name))
|
|
|
526 f)
|
|
|
527 (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
|
|
|
528 (ediff-read-file-name "Directory B to merge:"
|
|
|
529 (if ediff-use-last-dir
|
|
|
530 ediff-last-dir-B
|
|
|
531 (ediff-strip-last-dir f))
|
|
|
532 nil)
|
|
|
533 (read-string "Filter through regular expression: "
|
|
|
534 nil 'ediff-filtering-regexp-history)
|
|
|
535 )))
|
|
|
536 (ediff-directories-internal
|
|
|
537 dir1 dir2 nil regexp 'ediff-merge-files 'ediff-merge-directories
|
|
|
538 ))
|
|
|
539
|
|
|
540 ;;;###autoload
|
|
|
541 (defalias 'edirs-merge 'ediff-merge-directories)
|
|
|
542
|
|
|
543 ;;;###autoload
|
|
|
544 (defun ediff-merge-directories-with-ancestor (dir1 dir2 ancestor-dir regexp)
|
|
|
545 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
|
|
|
546 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
|
|
|
547 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
|
|
|
548 without ancestor. The fourth argument, REGEXP, is a regular expression that
|
|
|
549 can be used to filter out certain file names."
|
|
|
550 (interactive
|
|
|
551 (let ((dir-A (ediff-get-default-directory-name))
|
|
|
552 f)
|
|
|
553 (list (setq f (ediff-read-file-name "Directory A to merge:" dir-A nil))
|
|
|
554 (setq f (ediff-read-file-name "Directory B to merge:"
|
|
|
555 (if ediff-use-last-dir
|
|
|
556 ediff-last-dir-B
|
|
|
557 (ediff-strip-last-dir f))
|
|
|
558 nil))
|
|
|
559 (ediff-read-file-name "Ancestor directory:"
|
|
|
560 (if ediff-use-last-dir
|
|
|
561 ediff-last-dir-C
|
|
|
562 (ediff-strip-last-dir f))
|
|
|
563 nil)
|
|
|
564 (read-string "Filter through regular expression: "
|
|
|
565 nil 'ediff-filtering-regexp-history)
|
|
|
566 )))
|
|
|
567 (ediff-directories-internal
|
|
|
568 dir1 dir2 ancestor-dir regexp
|
|
|
569 'ediff-merge-files-with-ancestor 'ediff-merge-directories-with-ancestor
|
|
|
570 ))
|
|
|
571
|
|
|
572 ;;;###autoload
|
|
|
573 (defun ediff-merge-directory-revisions (dir1 regexp)
|
|
|
574 "Run Ediff on a directory, DIR1, merging its files with their revisions.
|
|
|
575 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
576 names. Only the files that are under revision control are taken into account."
|
|
|
577 (interactive
|
|
|
578 (let ((dir-A (ediff-get-default-directory-name)))
|
|
|
579 (list (ediff-read-file-name
|
|
|
580 "Directory to merge with revisions:" dir-A nil)
|
|
|
581 (read-string "Filter through regular expression: "
|
|
|
582 nil 'ediff-filtering-regexp-history)
|
|
|
583 )))
|
|
|
584 (ediff-directory-revisions-internal
|
|
|
585 dir1 regexp 'ediff-merge-revisions 'ediff-merge-directory-revisions
|
|
|
586 ))
|
|
|
587
|
|
|
588 ;;;###autoload
|
|
|
589 (defalias 'edir-merge-revisions 'ediff-merge-directory-revisions)
|
|
|
590
|
|
|
591 ;;;###autoload
|
|
|
592 (defun ediff-merge-directory-revisions-with-ancestor (dir1 regexp)
|
|
|
593 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
|
|
|
594 The second argument, REGEXP, is a regular expression that filters the file
|
|
|
595 names. Only the files that are under revision control are taken into account."
|
|
|
596 (interactive
|
|
|
597 (let ((dir-A (ediff-get-default-directory-name)))
|
|
|
598 (list (ediff-read-file-name
|
|
|
599 "Directory to merge with revisions and ancestors:" dir-A nil)
|
|
|
600 (read-string "Filter through regular expression: "
|
|
|
601 nil 'ediff-filtering-regexp-history)
|
|
|
602 )))
|
|
|
603 (ediff-directory-revisions-internal
|
|
|
604 dir1 regexp 'ediff-merge-revisions-with-ancestor
|
|
|
605 'ediff-merge-directory-revisions-with-ancestor
|
|
|
606 ))
|
|
|
607
|
|
|
608 ;;;###autoload
|
|
|
609 (defalias
|
|
|
610 'edir-merge-revisions-with-ancestor
|
|
|
611 'ediff-merge-directory-revisions-with-ancestor)
|
|
|
612
|
|
|
613 ;;;###autoload
|
|
|
614 (defalias 'edirs-merge-with-ancestor 'ediff-merge-directories-with-ancestor)
|
|
|
615
|
|
|
616 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
|
|
|
617 ;; on a pair of directories (three directories, in case of ancestor).
|
|
|
618 ;; The third argument, REGEXP, is a regular expression that can be used to
|
|
|
619 ;; filter out certain file names.
|
|
|
620 ;; JOBNAME is the symbol indicating the meta-job to be performed.
|
|
78
|
621 ;; MERGE-DIR is the directory in which to store merged files.
|
|
|
622 (defun ediff-directories-internal (dir1 dir2 dir3 regexp action jobname
|
|
0
|
623 &optional startup-hooks)
|
|
|
624 ;; ediff-read-file-name is set to attach a previously entered file name if
|
|
|
625 ;; the currently entered file is a directory. This code takes care of that.
|
|
|
626 (setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1))
|
|
|
627 dir2 (if (file-directory-p dir2) dir2 (file-name-directory dir2)))
|
|
|
628
|
|
|
629 (if (stringp dir3)
|
|
|
630 (setq dir3 (if (file-directory-p dir3) dir3 (file-name-directory dir3))))
|
|
|
631
|
|
|
632 (cond ((string= dir1 dir2)
|
|
|
633 (error "Directories A and B are the same: %s" dir1))
|
|
|
634 ((and (eq jobname 'ediff-directories3)
|
|
|
635 (string= dir1 dir3))
|
|
|
636 (error "Directories A and C are the same: %s" dir1))
|
|
|
637 ((and (eq jobname 'ediff-directories3)
|
|
|
638 (string= dir2 dir3))
|
|
|
639 (error "Directories B and C are the same: %s" dir1)))
|
|
|
640
|
|
|
641 (let (diffs ; var where ediff-intersect-directories returns the diff list
|
|
78
|
642 merge-autostore-dir
|
|
0
|
643 file-list meta-buf)
|
|
78
|
644 (if (and ediff-autostore-merges (ediff-merge-metajob jobname))
|
|
|
645 (setq merge-autostore-dir
|
|
|
646 (ediff-read-file-name "Directory to save merged files:"
|
|
|
647 (if ediff-use-last-dir
|
|
|
648 ediff-last-merge-autostore-dir
|
|
|
649 (ediff-strip-last-dir dir1))
|
|
|
650 nil)))
|
|
|
651 ;; verify we are not merging into an orig directory
|
|
|
652 (if (stringp merge-autostore-dir)
|
|
|
653 (cond ((and (stringp dir1) (string= merge-autostore-dir dir1))
|
|
|
654 (or (y-or-n-p "Merge directory same as directory A, sure? ")
|
|
|
655 (error "Directory merge aborted")))
|
|
|
656 ((and (stringp dir2) (string= merge-autostore-dir dir2))
|
|
|
657 (or (y-or-n-p "Merge directory same as directory B, sure? ")
|
|
|
658 (error "Directory merge aborted")))
|
|
|
659 ((and (stringp dir3) (string= merge-autostore-dir dir3))
|
|
|
660 (or (y-or-n-p
|
|
|
661 "Merge directory same as ancestor directory, sure? ")
|
|
|
662 (error "Directory merge aborted")))))
|
|
|
663
|
|
0
|
664 (setq file-list (ediff-intersect-directories
|
|
78
|
665 jobname 'diffs
|
|
|
666 regexp dir1 dir2 dir3 merge-autostore-dir))
|
|
0
|
667 (setq startup-hooks
|
|
|
668 ;; this sets various vars in the meta buffer inside
|
|
|
669 ;; ediff-prepare-meta-buffer
|
|
|
670 (cons (` (lambda ()
|
|
|
671 ;; tell what to do if the user clicks on a session record
|
|
|
672 (setq ediff-session-action-function (quote (, action)))
|
|
|
673 ;; set ediff-dir-difference-list
|
|
|
674 (setq ediff-dir-difference-list (quote (, diffs)))))
|
|
|
675 startup-hooks))
|
|
|
676 (setq meta-buf (ediff-prepare-meta-buffer
|
|
|
677 'ediff-filegroup-action
|
|
|
678 file-list
|
|
|
679 "*Ediff Session Group Panel"
|
|
|
680 'ediff-redraw-directory-group-buffer
|
|
|
681 jobname
|
|
|
682 startup-hooks))
|
|
|
683 (ediff-show-meta-buffer meta-buf)
|
|
|
684 ))
|
|
|
685
|
|
|
686 (defun ediff-directory-revisions-internal (dir1 regexp action jobname
|
|
|
687 &optional startup-hooks)
|
|
|
688 (setq dir1 (if (file-directory-p dir1) dir1 (file-name-directory dir1)))
|
|
78
|
689
|
|
|
690 (let (file-list meta-buf merge-autostore-dir)
|
|
|
691 (if (and ediff-autostore-merges (ediff-merge-metajob jobname))
|
|
|
692 (setq merge-autostore-dir
|
|
|
693 (ediff-read-file-name "Directory to save merged files:"
|
|
|
694 (if ediff-use-last-dir
|
|
|
695 ediff-last-merge-autostore-dir
|
|
|
696 (ediff-strip-last-dir dir1))
|
|
|
697 nil)))
|
|
|
698 ;; verify merge-autostore-dir != dir1
|
|
|
699 (if (and (stringp merge-autostore-dir)
|
|
|
700 (stringp dir1)
|
|
|
701 (string= merge-autostore-dir dir1))
|
|
|
702 (or (y-or-n-p
|
|
|
703 "Directory for saving merges is the same as directory A. Sure? ")
|
|
|
704 (error "Merge of directory revisions aborted")))
|
|
80
|
705
|
|
0
|
706 (setq file-list
|
|
78
|
707 (ediff-get-directory-files-under-revision
|
|
|
708 jobname regexp dir1 merge-autostore-dir))
|
|
0
|
709 (setq startup-hooks
|
|
|
710 ;; this sets various vars in the meta buffer inside
|
|
|
711 ;; ediff-prepare-meta-buffer
|
|
|
712 (cons (` (lambda ()
|
|
|
713 ;; tell what to do if the user clicks on a session record
|
|
|
714 (setq ediff-session-action-function (quote (, action)))
|
|
|
715 ))
|
|
|
716 startup-hooks))
|
|
|
717 (setq meta-buf (ediff-prepare-meta-buffer
|
|
|
718 'ediff-filegroup-action
|
|
|
719 file-list
|
|
|
720 "*Ediff Session Group Panel"
|
|
|
721 'ediff-redraw-directory-group-buffer
|
|
|
722 jobname
|
|
|
723 startup-hooks))
|
|
|
724 (ediff-show-meta-buffer meta-buf)
|
|
|
725 ))
|
|
|
726
|
|
|
727
|
|
|
728 ;;; Compare regions and windows
|
|
|
729
|
|
|
730 ;;;###autoload
|
|
|
731 (defun ediff-windows-wordwise (dumb-mode &optional wind-A wind-B startup-hooks)
|
|
|
732 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
|
|
|
733 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
|
|
|
734 follows:
|
|
|
735 If WIND-A is nil, use selected window.
|
|
|
736 If WIND-B is nil, use window next to WIND-A."
|
|
|
737 (interactive "P")
|
|
|
738 (ediff-windows dumb-mode wind-A wind-B
|
|
|
739 startup-hooks 'ediff-windows-wordwise 'word-mode))
|
|
|
740
|
|
|
741 ;;;###autoload
|
|
|
742 (defun ediff-windows-linewise (dumb-mode &optional wind-A wind-B startup-hooks)
|
|
|
743 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
|
|
|
744 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
|
|
|
745 follows:
|
|
|
746 If WIND-A is nil, use selected window.
|
|
|
747 If WIND-B is nil, use window next to WIND-A."
|
|
|
748 (interactive "P")
|
|
|
749 (ediff-windows dumb-mode wind-A wind-B
|
|
|
750 startup-hooks 'ediff-windows-linewise nil))
|
|
|
751
|
|
|
752 ;; Compare WIND-A and WIND-B, which are selected by clicking.
|
|
|
753 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
|
|
|
754 ;; works as follows:
|
|
|
755 ;; If WIND-A is nil, use selected window.
|
|
|
756 ;; If WIND-B is nil, use window next to WIND-A.
|
|
|
757 (defun ediff-windows (dumb-mode wind-A wind-B startup-hooks job-name word-mode)
|
|
|
758 (if (or dumb-mode (not (ediff-window-display-p)))
|
|
|
759 (setq wind-A (ediff-get-next-window wind-A nil)
|
|
|
760 wind-B (ediff-get-next-window wind-B wind-A))
|
|
|
761 (setq wind-A (ediff-get-window-by-clicking wind-A nil 1)
|
|
|
762 wind-B (ediff-get-window-by-clicking wind-B wind-A 2)))
|
|
|
763
|
|
|
764 (let ((buffer-A (window-buffer wind-A))
|
|
|
765 (buffer-B (window-buffer wind-B))
|
|
|
766 beg-A end-A beg-B end-B)
|
|
|
767
|
|
|
768 (save-excursion
|
|
|
769 (save-window-excursion
|
|
|
770 (sit-for 0) ; sync before using window-start/end -- a precaution
|
|
|
771 (select-window wind-A)
|
|
|
772 (setq beg-A (window-start)
|
|
|
773 end-A (window-end))
|
|
|
774 (select-window wind-B)
|
|
|
775 (setq beg-B (window-start)
|
|
|
776 end-B (window-end))))
|
|
|
777 (ediff-regions-internal
|
|
|
778 buffer-A beg-A end-A buffer-B beg-B end-B
|
|
|
779 startup-hooks job-name word-mode)))
|
|
|
780
|
|
|
781 ;;;###autoload
|
|
|
782 (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
|
|
|
783 "Run Ediff on a pair of regions in two different buffers.
|
|
|
784 Regions \(i.e., point and mark\) are assumed to be set in advance.
|
|
|
785 This function is effective only for relatively small regions, up to 200
|
|
|
786 lines. For large regions, use `ediff-regions-linewise'."
|
|
|
787 (interactive
|
|
|
788 (let (bf)
|
|
|
789 (list (setq bf (read-buffer "Region's A buffer: "
|
|
|
790 (ediff-other-buffer "") t))
|
|
|
791 (read-buffer "Region's B buffer: "
|
|
|
792 (progn
|
|
|
793 ;; realign buffers so that two visible bufs will be
|
|
|
794 ;; at the top
|
|
|
795 (save-window-excursion (other-window 1))
|
|
|
796 (ediff-other-buffer bf))
|
|
|
797 t))))
|
|
|
798 (if (not (ediff-buffer-live-p buffer-A))
|
|
|
799 (error "Buffer %S doesn't exist" buffer-A))
|
|
|
800 (if (not (ediff-buffer-live-p buffer-B))
|
|
|
801 (error "Buffer %S doesn't exist" buffer-B))
|
|
|
802
|
|
|
803
|
|
|
804 (let (reg-A-beg reg-A-end reg-B-beg reg-B-end)
|
|
|
805 (save-excursion
|
|
|
806 (set-buffer buffer-A)
|
|
|
807 (setq reg-A-beg (region-beginning)
|
|
|
808 reg-A-end (region-end))
|
|
|
809 (set-buffer buffer-B)
|
|
|
810 (setq reg-B-beg (region-beginning)
|
|
|
811 reg-B-end (region-end)))
|
|
|
812
|
|
|
813 (ediff-regions-internal
|
|
|
814 (get-buffer buffer-A) reg-A-beg reg-A-end
|
|
|
815 (get-buffer buffer-B) reg-B-beg reg-B-end
|
|
|
816 startup-hooks 'ediff-regions-wordwise 'word-mode)))
|
|
|
817
|
|
|
818 ;;;###autoload
|
|
|
819 (defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
|
|
|
820 "Run Ediff on a pair of regions in two different buffers.
|
|
|
821 Regions \(i.e., point and mark\) are assumed to be set in advance.
|
|
|
822 Each region is enlarged to contain full lines.
|
|
|
823 This function is effective for large regions, over 100-200
|
|
|
824 lines. For small regions, use `ediff-regions-wordwise'."
|
|
|
825 (interactive
|
|
|
826 (let (bf)
|
|
|
827 (list (setq bf (read-buffer "Region A's buffer: "
|
|
|
828 (ediff-other-buffer "") t))
|
|
|
829 (read-buffer "Region B's buffer: "
|
|
|
830 (progn
|
|
|
831 ;; realign buffers so that two visible bufs will be
|
|
|
832 ;; at the top
|
|
|
833 (save-window-excursion (other-window 1))
|
|
|
834 (ediff-other-buffer bf))
|
|
|
835 t))))
|
|
|
836 (if (not (ediff-buffer-live-p buffer-A))
|
|
|
837 (error "Buffer %S doesn't exist" buffer-A))
|
|
|
838 (if (not (ediff-buffer-live-p buffer-B))
|
|
|
839 (error "Buffer %S doesn't exist" buffer-B))
|
|
|
840
|
|
|
841 (let (reg-A-beg reg-A-end reg-B-beg reg-B-end)
|
|
|
842 (save-excursion
|
|
|
843 (set-buffer buffer-A)
|
|
|
844 (setq reg-A-beg (region-beginning)
|
|
|
845 reg-A-end (region-end))
|
|
|
846 ;; enlarge the region to hold full lines
|
|
|
847 (goto-char reg-A-beg)
|
|
|
848 (beginning-of-line)
|
|
|
849 (setq reg-A-beg (point))
|
|
|
850 (goto-char reg-A-end)
|
|
|
851 (end-of-line)
|
|
|
852 (or (eobp) (forward-char)) ; include the newline char
|
|
|
853 (setq reg-A-end (point))
|
|
|
854
|
|
|
855 (set-buffer buffer-B)
|
|
|
856 (setq reg-B-beg (region-beginning)
|
|
|
857 reg-B-end (region-end))
|
|
|
858 ;; enlarge the region to hold full lines
|
|
|
859 (goto-char reg-B-beg)
|
|
|
860 (beginning-of-line)
|
|
|
861 (setq reg-B-beg (point))
|
|
|
862 (goto-char reg-B-end)
|
|
|
863 (end-of-line)
|
|
|
864 (or (eobp) (forward-char)) ; include the newline char
|
|
|
865 (setq reg-B-end (point))
|
|
|
866 ) ; save excursion
|
|
|
867
|
|
|
868 (ediff-regions-internal
|
|
|
869 (get-buffer buffer-A) reg-A-beg reg-A-end
|
|
|
870 (get-buffer buffer-B) reg-B-beg reg-B-end
|
|
|
871 startup-hooks 'ediff-regions-linewise nil))) ; no word mode
|
|
|
872
|
|
|
873 ;; compare region beg-A to end-A of buffer-A
|
|
|
874 ;; to regions beg-B -- end-B in buffer-B.
|
|
|
875 (defun ediff-regions-internal (buffer-A beg-A end-A buffer-B beg-B end-B
|
|
|
876 startup-hooks job-name word-mode)
|
|
|
877 (let ((tmp-buffer (get-buffer-create ediff-tmp-buffer))
|
|
|
878 overl-A overl-B
|
|
|
879 file-A file-B)
|
|
|
880
|
|
|
881 ;; in case beg/end-A/B aren't markers--make them into markers
|
|
|
882 (ediff-eval-in-buffer buffer-A
|
|
|
883 (setq beg-A (move-marker (make-marker) beg-A)
|
|
|
884 end-A (move-marker (make-marker) end-A)))
|
|
|
885 (ediff-eval-in-buffer buffer-B
|
|
|
886 (setq beg-B (move-marker (make-marker) beg-B)
|
|
|
887 end-B (move-marker (make-marker) end-B)))
|
|
|
888
|
|
|
889 (if (and (eq buffer-A buffer-B)
|
|
|
890 (or (and (< beg-A end-B) (<= beg-B beg-A)) ; b-B b-A e-B
|
|
|
891 (and (< beg-B end-A) (<= end-A end-B)))) ; b-B e-A e-B
|
|
|
892 (progn
|
|
|
893 (with-output-to-temp-buffer ediff-msg-buffer
|
|
|
894 (princ "
|
|
|
895 You have requested to compare overlapping regions of the same buffer.
|
|
|
896
|
|
|
897 In this case, Ediff's highlighting may be confusing---in the same window,
|
|
|
898 you may see highlighted regions that belong to different regions.
|
|
|
899
|
|
|
900 Continue anyway? (y/n) "))
|
|
|
901
|
|
|
902 (if (y-or-n-p "Continue anyway? ")
|
|
|
903 ()
|
|
|
904 (error "%S aborted" job-name))))
|
|
|
905
|
|
|
906 ;; make file-A
|
|
|
907 (if word-mode
|
|
|
908 (ediff-wordify beg-A end-A buffer-A tmp-buffer)
|
|
|
909 (ediff-copy-to-buffer beg-A end-A buffer-A tmp-buffer))
|
|
|
910 (setq file-A (ediff-make-temp-file tmp-buffer "regA"))
|
|
|
911
|
|
|
912 ;; make file-B
|
|
|
913 (if word-mode
|
|
|
914 (ediff-wordify beg-B end-B buffer-B tmp-buffer)
|
|
|
915 (ediff-copy-to-buffer beg-B end-B buffer-B tmp-buffer))
|
|
|
916 (setq file-B (ediff-make-temp-file tmp-buffer "regB"))
|
|
|
917
|
|
|
918 (setq overl-A (ediff-make-bullet-proof-overlay beg-A end-A buffer-A))
|
|
|
919 (setq overl-B (ediff-make-bullet-proof-overlay beg-B end-B buffer-B))
|
|
|
920 (ediff-setup buffer-A file-A
|
|
|
921 buffer-B file-B
|
|
|
922 nil nil ; buffer & file C
|
|
|
923 (cons (` (lambda ()
|
|
|
924 (delete-file (, file-A))
|
|
|
925 (delete-file (, file-B))))
|
|
|
926 startup-hooks)
|
|
|
927 (list (cons 'ediff-word-mode word-mode)
|
|
|
928 (cons 'ediff-narrow-bounds (list overl-A overl-B))
|
|
|
929 (cons 'ediff-job-name job-name))
|
|
|
930 )
|
|
|
931 ))
|
|
|
932
|
|
|
933
|
|
|
934 ;;; Merge files and buffers
|
|
|
935
|
|
|
936 ;;;###autoload
|
|
|
937 (defalias 'ediff-merge 'ediff-merge-files)
|
|
|
938
|
|
|
939 (defsubst ediff-merge-on-startup ()
|
|
|
940 (ediff-do-merge 0)
|
|
|
941 (ediff-eval-in-buffer ediff-buffer-C
|
|
|
942 (set-buffer-modified-p nil)))
|
|
|
943
|
|
|
944 ;;;###autoload
|
|
|
945 (defun ediff-merge-files (file-A file-B &optional startup-hooks)
|
|
|
946 "Merge two files without ancestor."
|
|
|
947 (interactive
|
|
|
948 (let ((dir-A (if ediff-use-last-dir
|
|
|
949 ediff-last-dir-A
|
|
|
950 default-directory))
|
|
|
951 dir-B f)
|
|
|
952 (list (setq f (ediff-read-file-name
|
|
|
953 "File A to merge" dir-A
|
|
|
954 (ediff-get-default-file-name)))
|
|
|
955 (ediff-read-file-name "File B to merge"
|
|
|
956 (setq dir-B
|
|
|
957 (if ediff-use-last-dir
|
|
|
958 ediff-last-dir-B
|
|
|
959 (file-name-directory f)))
|
|
|
960 (progn
|
|
|
961 (setq file-name-history
|
|
|
962 (cons (ediff-abbreviate-file-name
|
|
|
963 (expand-file-name
|
|
|
964 (file-name-nondirectory f)
|
|
|
965 dir-B))
|
|
|
966 file-name-history))
|
|
|
967 f))
|
|
|
968 )))
|
|
|
969 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
|
|
|
970 (ediff-files-internal file-A
|
|
|
971 (if (file-directory-p file-B)
|
|
|
972 (expand-file-name
|
|
|
973 (file-name-nondirectory file-A) file-B)
|
|
|
974 file-B)
|
|
|
975 nil ; file-C
|
|
|
976 startup-hooks
|
|
|
977 'ediff-merge-files))
|
|
|
978
|
|
|
979 ;;;###autoload
|
|
|
980 (defun ediff-merge-files-with-ancestor (file-A file-B file-ancestor
|
|
|
981 &optional startup-hooks)
|
|
|
982 "Merge two files with ancestor."
|
|
|
983 (interactive
|
|
|
984 (let ((dir-A (if ediff-use-last-dir
|
|
|
985 ediff-last-dir-A
|
|
|
986 default-directory))
|
|
|
987 dir-B dir-ancestor f ff)
|
|
|
988 (list (setq f (ediff-read-file-name
|
|
|
989 "File A to merge" dir-A
|
|
|
990 (ediff-get-default-file-name)))
|
|
|
991 (setq ff (ediff-read-file-name "File B to merge"
|
|
|
992 (setq dir-B
|
|
|
993 (if ediff-use-last-dir
|
|
|
994 ediff-last-dir-B
|
|
|
995 (file-name-directory f)))
|
|
|
996 (progn
|
|
|
997 (setq file-name-history
|
|
|
998 (cons
|
|
|
999 (ediff-abbreviate-file-name
|
|
|
1000 (expand-file-name
|
|
|
1001 (file-name-nondirectory f)
|
|
|
1002 dir-B))
|
|
|
1003 file-name-history))
|
|
|
1004 f)))
|
|
|
1005 (ediff-read-file-name "Ancestor file"
|
|
|
1006 (setq dir-ancestor
|
|
|
1007 (if ediff-use-last-dir
|
|
|
1008 ediff-last-dir-ancestor
|
|
|
1009 (file-name-directory ff)))
|
|
|
1010 (progn
|
|
|
1011 (setq file-name-history
|
|
|
1012 (cons (ediff-abbreviate-file-name
|
|
|
1013 (expand-file-name
|
|
|
1014 (file-name-nondirectory ff)
|
|
|
1015 dir-ancestor))
|
|
|
1016 file-name-history))
|
|
|
1017 ff))
|
|
|
1018 )))
|
|
|
1019 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
|
|
|
1020 (ediff-files-internal file-A
|
|
|
1021 (if (file-directory-p file-B)
|
|
|
1022 (expand-file-name
|
|
|
1023 (file-name-nondirectory file-A) file-B)
|
|
|
1024 file-B)
|
|
|
1025 file-ancestor
|
|
|
1026 startup-hooks
|
|
|
1027 'ediff-merge-files-with-ancestor))
|
|
|
1028
|
|
|
1029 ;;;###autoload
|
|
|
1030 (defalias 'ediff-merge-with-ancestor 'ediff-merge-files-with-ancestor)
|
|
|
1031
|
|
|
1032 ;;;###autoload
|
|
|
1033 (defun ediff-merge-buffers (buffer-A buffer-B &optional startup-hooks job-name)
|
|
|
1034 "Merge buffers without ancestor."
|
|
|
1035 (interactive
|
|
|
1036 (let (bf)
|
|
|
1037 (list (setq bf (read-buffer "Buffer A to merge: "
|
|
|
1038 (ediff-other-buffer "") t))
|
|
|
1039 (read-buffer "Buffer B to merge: "
|
|
|
1040 (progn
|
|
|
1041 ;; realign buffers so that two visible bufs will be
|
|
|
1042 ;; at the top
|
|
|
1043 (save-window-excursion (other-window 1))
|
|
|
1044 (ediff-other-buffer bf))
|
|
|
1045 t))))
|
|
|
1046
|
|
|
1047 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
|
|
|
1048 (or job-name (setq job-name 'ediff-merge-buffers))
|
|
|
1049 (ediff-buffers-internal
|
|
|
1050 buffer-A buffer-B nil startup-hooks job-name))
|
|
|
1051
|
|
|
1052 ;;;###autoload
|
|
|
1053 (defun ediff-merge-buffers-with-ancestor (buffer-A
|
|
|
1054 buffer-B buffer-ancestor
|
|
|
1055 &optional startup-hooks job-name)
|
|
|
1056 "Merge buffers with ancestor."
|
|
|
1057 (interactive
|
|
|
1058 (let (bf bff)
|
|
|
1059 (list (setq bf (read-buffer "Buffer A to merge: "
|
|
|
1060 (ediff-other-buffer "") t))
|
|
|
1061 (setq bff (read-buffer "Buffer B to merge: "
|
|
|
1062 (progn
|
|
|
1063 ;; realign buffers so that two visible
|
|
|
1064 ;; bufs will be at the top
|
|
|
1065 (save-window-excursion (other-window 1))
|
|
|
1066 (ediff-other-buffer bf))
|
|
|
1067 t))
|
|
|
1068 (read-buffer "Ancestor buffer: "
|
|
|
1069 (progn
|
|
|
1070 ;; realign buffers so that three visible
|
|
|
1071 ;; bufs will be at the top
|
|
|
1072 (save-window-excursion (other-window 1))
|
|
|
1073 (ediff-other-buffer (list bf bff)))
|
|
|
1074 t)
|
|
|
1075 )))
|
|
|
1076
|
|
|
1077 (setq startup-hooks (cons 'ediff-merge-on-startup startup-hooks))
|
|
|
1078 (or job-name (setq job-name 'ediff-merge-buffers-with-ancestor))
|
|
|
1079 (ediff-buffers-internal
|
|
|
1080 buffer-A buffer-B buffer-ancestor startup-hooks job-name))
|
|
|
1081
|
|
|
1082
|
|
|
1083 ;;;###autoload
|
|
|
1084 (defun ediff-merge-revisions (&optional file startup-hooks)
|
|
|
1085 "Run Ediff by merging two revisions of a file.
|
|
|
1086 The file is the optional FILE argument or the file visited by the current
|
|
|
1087 buffer."
|
|
|
1088 (interactive)
|
|
|
1089 (if (stringp file) (find-file file))
|
|
|
1090 (let (rev1 rev2)
|
|
|
1091 (setq rev1
|
|
|
1092 (read-string
|
|
|
1093 (format
|
|
|
1094 "Version 1 to merge (default: %s's latest version): "
|
|
|
1095 (if (stringp file)
|
|
|
1096 (file-name-nondirectory file) "current buffer")))
|
|
|
1097 rev2
|
|
|
1098 (read-string
|
|
|
1099 (format
|
|
|
1100 "Version 2 to merge (default: %s): "
|
|
|
1101 (if (stringp file)
|
|
|
1102 (file-name-nondirectory file) "current buffer"))))
|
|
|
1103 (ediff-load-version-control)
|
|
|
1104 ;; ancestor-revision=nil
|
|
|
1105 (funcall
|
|
78
|
1106 (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
|
|
0
|
1107 rev1 rev2 nil startup-hooks)))
|
|
|
1108
|
|
|
1109
|
|
|
1110 ;;;###autoload
|
|
|
1111 (defun ediff-merge-revisions-with-ancestor (&optional file startup-hooks)
|
|
|
1112 "Run Ediff by merging two revisions of a file with a common ancestor.
|
|
80
|
1113 The file is the the optional FILE argument or the file visited by the current
|
|
0
|
1114 buffer."
|
|
|
1115 (interactive)
|
|
|
1116 (if (stringp file) (find-file file))
|
|
|
1117 (let (rev1 rev2 ancestor-rev)
|
|
|
1118 (setq rev1
|
|
|
1119 (read-string
|
|
|
1120 (format
|
|
|
1121 "Version 1 to merge (default: %s's latest version): "
|
|
|
1122 (if (stringp file)
|
|
|
1123 (file-name-nondirectory file) "current buffer")))
|
|
|
1124 rev2
|
|
|
1125 (read-string
|
|
|
1126 (format
|
|
|
1127 "Version 2 to merge (default: %s): "
|
|
|
1128 (if (stringp file)
|
|
|
1129 (file-name-nondirectory file) "current buffer")))
|
|
|
1130 ancestor-rev
|
|
|
1131 (read-string
|
|
|
1132 (format
|
|
|
1133 "Ancestor version (default: %s): "
|
|
|
1134 (if (stringp file)
|
|
|
1135 (file-name-nondirectory file) "current buffer"))))
|
|
|
1136 (ediff-load-version-control)
|
|
|
1137 (funcall
|
|
78
|
1138 (intern (format "ediff-%S-merge-internal" ediff-version-control-package))
|
|
0
|
1139 rev1 rev2 ancestor-rev startup-hooks)))
|
|
|
1140
|
|
|
1141 ;;;###autoload
|
|
|
1142 (defun run-ediff-from-cvs-buffer (pos)
|
|
|
1143 "Run Ediff-merge on appropriate revisions of the selected file.
|
|
|
1144 First run after `M-x cvs-update'. Then place the cursor on a lide describing a
|
|
|
1145 file and then run `run-ediff-from-cvs-buffer'."
|
|
|
1146 (interactive "d")
|
|
|
1147 (ediff-load-version-control)
|
|
|
1148 (let ((tin (tin-locate cvs-cookie-handle pos)))
|
|
|
1149 (if tin
|
|
|
1150 (cvs-run-ediff-on-file-descriptor tin)
|
|
|
1151 (error "There is no file to merge"))))
|
|
|
1152
|
|
|
1153
|
|
|
1154 ;;; Apply patch
|
|
|
1155
|
|
|
1156 ;;;###autoload
|
|
|
1157 (defun ediff-patch-file ()
|
|
|
1158 "Run Ediff by patching SOURCE-FILENAME."
|
|
|
1159 ;; This now returns the control buffer
|
|
|
1160 (interactive)
|
|
|
1161 (let (source-dir source-file patch-buf)
|
|
|
1162 (require 'ediff-ptch)
|
|
|
1163 (setq patch-buf (ediff-get-patch-buffer))
|
|
|
1164 (setq source-dir (cond (ediff-use-last-dir ediff-last-dir-patch)
|
|
|
1165 ((and (not ediff-patch-default-directory)
|
|
|
1166 (buffer-file-name patch-buf))
|
|
|
1167 (file-name-directory
|
|
|
1168 (expand-file-name
|
|
|
1169 (buffer-file-name patch-buf))))
|
|
|
1170 (t default-directory)))
|
|
|
1171 (setq source-file
|
|
|
1172 ;; the default is the directory, not the visited file name
|
|
|
1173 (ediff-read-file-name "Which file to patch? " source-dir source-dir))
|
|
|
1174 (ediff-dispatch-file-patching-job patch-buf source-file)))
|
|
|
1175
|
|
|
1176 ;;;###autoload
|
|
|
1177 (defun ediff-patch-buffer ()
|
|
|
1178 "Run Ediff by patching BUFFER-NAME."
|
|
|
1179 (interactive)
|
|
|
1180 (let (patch-buf)
|
|
|
1181 (require 'ediff-ptch)
|
|
|
1182 (setq patch-buf (ediff-get-patch-buffer))
|
|
|
1183 (ediff-patch-buffer-internal
|
|
|
1184 patch-buf
|
|
|
1185 (read-buffer "Which buffer to patch? "
|
|
|
1186 (cond ((eq patch-buf (current-buffer))
|
|
|
1187 (window-buffer (other-window 1)))
|
|
|
1188 (t (current-buffer)))
|
|
|
1189 'must-match))))
|
|
|
1190
|
|
|
1191 ;;;###autoload
|
|
|
1192 (defalias 'epatch 'ediff-patch-file)
|
|
|
1193 ;;;###autoload
|
|
|
1194 (defalias 'epatch-buffer 'ediff-patch-buffer)
|
|
|
1195
|
|
|
1196
|
|
|
1197
|
|
|
1198
|
|
|
1199 ;;; Versions Control functions
|
|
|
1200
|
|
|
1201 ;;;###autoload
|
|
|
1202 (defun ediff-revision (&optional file startup-hooks)
|
|
|
1203 "Run Ediff by comparing versions of a file.
|
|
|
1204 The file is an optional FILE argument or the file visited by the current
|
|
|
1205 buffer. Use `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
|
|
|
1206 ;; if buffer is non-nil, use that buffer instead of the current buffer
|
|
|
1207 (interactive "P")
|
|
|
1208 (if (stringp file) (find-file file))
|
|
|
1209 (let (rev1 rev2)
|
|
|
1210 (setq rev1
|
|
|
1211 (read-string
|
|
|
1212 (format "Version 1 to compare (default: %s's latest version): "
|
|
|
1213 (if (stringp file)
|
|
|
1214 (file-name-nondirectory file) "current buffer")))
|
|
|
1215 rev2
|
|
|
1216 (read-string
|
|
|
1217 (format "Version 2 to compare (default: %s): "
|
|
|
1218 (if (stringp file)
|
|
|
1219 (file-name-nondirectory file) "current buffer"))))
|
|
|
1220 (ediff-load-version-control)
|
|
|
1221 (funcall
|
|
78
|
1222 (intern (format "ediff-%S-internal" ediff-version-control-package))
|
|
0
|
1223 rev1 rev2 startup-hooks)
|
|
|
1224 ))
|
|
|
1225
|
|
|
1226
|
|
|
1227 ;; Test if version control package is loaded and load if not
|
|
|
1228 ;; Is SILENT is non-nil, don't report error if package is not found.
|
|
|
1229 (defun ediff-load-version-control (&optional silent)
|
|
|
1230 (require 'ediff-vers)
|
|
|
1231 (or (featurep ediff-version-control-package)
|
|
|
1232 (if (locate-library (symbol-name ediff-version-control-package))
|
|
|
1233 (progn
|
|
|
1234 (message "") ; kill the message from `locate-library'
|
|
|
1235 (require ediff-version-control-package))
|
|
|
1236 (or silent
|
|
|
1237 (error "Version control package %S.el not found. Use vc.el instead"
|
|
|
1238 ediff-version-control-package)))))
|
|
|
1239
|
|
|
1240
|
|
|
1241 ;;;###autoload
|
|
|
1242 (defun ediff-version ()
|
|
|
1243 "Return string describing the version of Ediff.
|
|
|
1244 When called interactively, displays the version."
|
|
|
1245 (interactive)
|
|
|
1246 (if (interactive-p)
|
|
|
1247 (message (ediff-version))
|
|
|
1248 (format "Ediff %s of %s" ediff-version ediff-date)))
|
|
|
1249
|
|
|
1250
|
|
|
1251 ;;;###autoload
|
|
78
|
1252 (defun ediff-documentation (&optional node)
|
|
|
1253 "Display Ediff's manual.
|
|
|
1254 With optional NODE, goes to that node."
|
|
0
|
1255 (interactive)
|
|
|
1256 (let ((ctl-window ediff-control-window)
|
|
|
1257 (ctl-buf ediff-control-buffer))
|
|
|
1258
|
|
|
1259 (ediff-skip-unsuitable-frames)
|
|
|
1260 (condition-case nil
|
|
|
1261 (progn
|
|
|
1262 (pop-to-buffer (get-buffer-create "*info*"))
|
|
|
1263 (info (if ediff-xemacs-p "ediff.info" "ediff"))
|
|
78
|
1264 (if node
|
|
|
1265 (Info-goto-node node)
|
|
|
1266 (message "Type `i' to search for a specific topic"))
|
|
|
1267 (raise-frame (selected-frame)))
|
|
0
|
1268 (error (beep 1)
|
|
|
1269 (with-output-to-temp-buffer ediff-msg-buffer
|
|
78
|
1270 (princ ediff-BAD-INFO))
|
|
0
|
1271 (if (window-live-p ctl-window)
|
|
|
1272 (progn
|
|
|
1273 (select-window ctl-window)
|
|
|
1274 (set-window-buffer ctl-window ctl-buf)))))))
|
|
|
1275
|
|
|
1276
|
|
|
1277
|
|
|
1278
|
|
|
1279 ;;; Local Variables:
|
|
|
1280 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
|
|
|
1281 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
|
|
78
|
1282 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
|
|
0
|
1283 ;;; End:
|
|
|
1284
|
|
|
1285 (require 'ediff-util)
|
|
|
1286
|
|
|
1287 ;;; ediff.el ends here
|
