|
0
|
1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
|
|
|
2
|
|
16
|
3 ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
|
|
0
|
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
|
|
|
24 ;;; Commentary:
|
|
|
25
|
|
|
26 ;; Users are encouraged to add functionality to this file.
|
|
|
27 ;; The present file contains all the infrastructure needed for that.
|
|
|
28 ;;
|
|
14
|
29 ;; Generally, to to implement a new multisession capability within Ediff,
|
|
0
|
30 ;; you need to tell it
|
|
|
31 ;;
|
|
|
32 ;; 1. How to display the session group buffer.
|
|
|
33 ;; This function must indicate which Ediff sessions are active (+) and
|
|
|
34 ;; which are finished (-).
|
|
|
35 ;; See ediff-redraw-directory-group-buffer for an example.
|
|
|
36 ;; In all likelihood, ediff-redraw-directory-group-buffer can be used
|
|
|
37 ;; directly or after a small modification.
|
|
|
38 ;; 2. What action to take when the user clicks button 2 or types v,e, or
|
|
|
39 ;; RET. See ediff-filegroup-action.
|
|
|
40 ;; 3. Provide a list of pairs or triples of file names (or buffers,
|
|
|
41 ;; depending on the particular Ediff operation you want to invoke)
|
|
|
42 ;; in the following format:
|
|
|
43 ;; (descriptor (obj1 obj2 obj3) (...) ...)
|
|
|
44 ;; Actually, the format of this list is pretty much up to the
|
|
|
45 ;; developer. The only thing is that it must be a list of lists,
|
|
|
46 ;; and the first list must describe the meta session, and subsequent
|
|
|
47 ;; elements must describe individual sessions.
|
|
|
48 ;; This descriptor must be a list of two, three, or four elements (nil
|
|
|
49 ;; or string). The function ediff-redraw-registry-buffer displays the
|
|
|
50 ;; second through last of these in the registry buffer.
|
|
|
51 ;; Also, keep in mind that the function ediff-prepare-meta-buffer
|
|
|
52 ;; (which see) prepends the session group buffer to the descriptor and
|
|
|
53 ;; nil in front of each subsequent list (i.e., the above list
|
|
|
54 ;; will become
|
|
|
55 ;; ((meta-buf descriptor) (nil obj1 obj2 obj3) (nil ...) ...)
|
|
|
56 ;; Ediff expects that your function (in 2 above) will arrange to
|
|
|
57 ;; replace this prepended nil (via setcar) with the actual ediff
|
|
|
58 ;; control buffer associated with an appropriate Ediff session.
|
|
|
59 ;; This is arranged through internal startup hooks that can be passed
|
|
|
60 ;; to any of Ediff major entries (such as ediff-files, epatch, etc.).
|
|
|
61 ;; See how this is done in ediff-filegroup-action.
|
|
|
62 ;;
|
|
|
63 ;; Session descriptions are of the form (obj1 obj2 obj3), which
|
|
|
64 ;; describe objects relevant to the session. Usually they are names of
|
|
|
65 ;; files, but sometimes they may be other things. For instance, obj3 is
|
|
|
66 ;; nil for jobs that involve only two files. For patch jobs, obj2 and
|
|
|
67 ;; obj3 are markers that specify the patch corresponding to the file
|
|
|
68 ;; (whose name is obj1).
|
|
|
69 ;; 4. Write a function that makes a call to ediff-prepare-meta-buffer
|
|
|
70 ;; passing all this info.
|
|
|
71 ;; You may be able to use ediff-directories-internal as a template.
|
|
|
72 ;; 5. If you intend to add several related pieces of functionality,
|
|
|
73 ;; you may want to keep the function in 4 as an internal version
|
|
|
74 ;; and then write several top-level interactive functions that call it
|
|
|
75 ;; with different parameters.
|
|
|
76 ;; See how ediff-directories, ediff-merge-directories, and
|
|
|
77 ;; ediff-merge-directories-with-ancestor all use
|
|
|
78 ;; ediff-directories-internal.
|
|
|
79 ;;
|
|
|
80 ;; A useful addition here could be session groups selected by patterns
|
|
|
81 ;; (which are different in each directory). For instance, one may want to
|
|
|
82 ;; compare files of the form abc{something}.c to files old{something}.d
|
|
|
83 ;; which may be in the same or different directories. Or, one may want to
|
|
|
84 ;; compare all files of the form {something} to files of the form {something}~.
|
|
|
85 ;;
|
|
|
86 ;; Implementing this requires writing an collating function, which should pair
|
|
|
87 ;; up appropriate files. It will also require a generalization of the functions
|
|
|
88 ;; that do the layout of the meta- and differences buffers and of
|
|
|
89 ;; ediff-filegroup-action.
|
|
|
90
|
|
|
91 ;;; Code:
|
|
|
92
|
|
14
|
93 (provide 'ediff-mult)
|
|
|
94
|
|
|
95 ;; compiler pacifier
|
|
|
96 (eval-when-compile
|
|
|
97 (let ((load-path (cons (expand-file-name ".") load-path)))
|
|
|
98 (or (featurep 'ediff-init)
|
|
|
99 (load "ediff-init.el" nil nil 'nosuffix))
|
|
|
100 (or (featurep 'ediff-util)
|
|
|
101 (load "ediff-util.el" nil nil 'nosuffix))
|
|
|
102 ))
|
|
|
103 ;; end pacifier
|
|
|
104
|
|
0
|
105 (require 'ediff-init)
|
|
14
|
106 (require 'ediff-util)
|
|
0
|
107
|
|
|
108 ;; meta-buffer
|
|
|
109 (ediff-defvar-local ediff-meta-buffer nil "")
|
|
|
110 (ediff-defvar-local ediff-parent-meta-buffer nil "")
|
|
|
111 ;; the registry buffer
|
|
|
112 (defvar ediff-registry-buffer nil)
|
|
|
113
|
|
|
114 (defconst ediff-meta-buffer-message "This is an Ediff Session Group Panel: %s
|
|
|
115
|
|
|
116 Useful commands:
|
|
|
117 button2, `v', RET over a session line: start that Ediff session
|
|
|
118 `M':\tin any session invoked from here, brings back this group panel
|
|
|
119 `R':\tdisplay the registry of active Ediff sessions
|
|
|
120 `h':\tmark session for hiding (toggle)
|
|
|
121 `x':\thide marked sessions; with prefix arg--unhide hidden sessions
|
|
|
122 `m':\tmark session for a non-hiding operation (toggle)
|
|
|
123 SPC:\tnext session
|
|
|
124 DEL:\tprevious session
|
|
|
125 `E':\tbrowse Ediff on-line manual
|
|
|
126 `q':\tquit this session group
|
|
|
127 ")
|
|
|
128
|
|
|
129 (ediff-defvar-local ediff-meta-buffer-map nil
|
|
|
130 "The keymap for the meta buffer.")
|
|
|
131 (defvar ediff-dir-diffs-buffer-map (make-sparse-keymap)
|
|
|
132 "The keymap to be installed in the buffer showing differences between
|
|
|
133 directories.")
|
|
|
134
|
|
|
135 ;; Variable specifying the action to take when the use invokes ediff in the
|
|
|
136 ;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action
|
|
|
137 (ediff-defvar-local ediff-meta-action-function nil "")
|
|
|
138 ;; Tells ediff-update-meta-buffer how to redraw it
|
|
|
139 (ediff-defvar-local ediff-meta-redraw-function nil "")
|
|
|
140 ;; Tells ediff-filegroup-action and similar procedures how to invoke Ediff for
|
|
|
141 ;; the sessions in a given session group
|
|
|
142 (ediff-defvar-local ediff-session-action-function nil "")
|
|
|
143
|
|
|
144 (ediff-defvar-local ediff-metajob-name nil "")
|
|
|
145
|
|
|
146 ;; buffer used to collect custom diffs from individual sessions in the group
|
|
|
147 (ediff-defvar-local ediff-meta-diff-buffer nil "")
|
|
|
148
|
|
|
149 ;; history var to use for filtering groups
|
|
|
150 (defvar ediff-filtering-regexp-history nil "")
|
|
|
151
|
|
|
152 ;; This has the form ((ctl-buf file1 file2) (stl-buf file1 file2) ...)
|
|
|
153 ;; If ctl-buf is nil, the file-pair wasn't processed yet. If it is
|
|
|
154 ;; killed-buffer object, the file pair has been processed. If it is a live
|
|
|
155 ;; buffer, this means ediff is still working on the pair
|
|
|
156 (ediff-defvar-local ediff-meta-list nil "")
|
|
|
157
|
|
|
158
|
|
|
159 ;; the difference list between directories in a directory session group
|
|
|
160 (ediff-defvar-local ediff-dir-difference-list nil "")
|
|
|
161 (ediff-defvar-local ediff-dir-diffs-buffer nil "")
|
|
|
162
|
|
|
163 ;; The registry of Ediff sessions. A list of control buffers.
|
|
|
164 (defvar ediff-session-registry nil)
|
|
|
165
|
|
|
166 (defvar ediff-registry-setup-hook nil
|
|
|
167 "*Hooks run just after the registry control panel is set up.")
|
|
|
168 (defvar ediff-session-group-setup-hook nil
|
|
|
169 "*Hooks run just after a meta-buffer controlling a session group, such as
|
|
|
170 ediff-directories, is run.")
|
|
12
|
171 (defvar ediff-quit-session-group-hook nil
|
|
|
172 "*Hooks run just before exiting a session group.")
|
|
0
|
173 (defvar ediff-show-registry-hook nil
|
|
|
174 "*Hooks run just after the registry buffer is shown.")
|
|
|
175 (defvar ediff-show-session-group-hook nil
|
|
|
176 "*Hooks run just after a session group buffer is shown.")
|
|
12
|
177 (defvar ediff-meta-buffer-keymap-setup-hook nil
|
|
|
178 "*Hooks run just after setting up the ediff-meta-buffer-map.
|
|
|
179 This keymap controls key bindings in the meta buffer and is a local variable.
|
|
|
180 This means that you can set different bindings for different kinds of meta
|
|
|
181 buffers.")
|
|
0
|
182
|
|
|
183 ;; buffer holding the multi-file patch. local to the meta buffer
|
|
|
184 (ediff-defvar-local ediff-meta-patchbufer nil "")
|
|
|
185
|
|
|
186 ;;; API for ediff-meta-list
|
|
|
187
|
|
|
188 ;; group buffer/regexp
|
|
|
189 (defun ediff-get-group-buffer (meta-list)
|
|
|
190 (nth 0 (car meta-list)))
|
|
12
|
191
|
|
0
|
192 (defun ediff-get-group-regexp (meta-list)
|
|
|
193 (nth 1 (car meta-list)))
|
|
|
194 ;; group objects
|
|
|
195 (defun ediff-get-group-objA (meta-list)
|
|
|
196 (nth 2 (car meta-list)))
|
|
|
197 (defun ediff-get-group-objB (meta-list)
|
|
|
198 (nth 3 (car meta-list)))
|
|
|
199 (defun ediff-get-group-objC (meta-list)
|
|
|
200 (nth 4 (car meta-list)))
|
|
12
|
201 (defun ediff-get-group-merge-autostore-dir (meta-list)
|
|
|
202 (nth 5 (car meta-list)))
|
|
|
203
|
|
0
|
204 ;; session buffer
|
|
|
205 (defun ediff-get-session-buffer (elt)
|
|
|
206 (nth 0 elt))
|
|
|
207 (defun ediff-get-session-status (elt)
|
|
|
208 (nth 1 elt))
|
|
|
209 (defun ediff-set-session-status (session-info new-status)
|
|
|
210 (setcar (cdr session-info) new-status))
|
|
|
211 ;; session objects
|
|
|
212 (defun ediff-get-session-objA (elt)
|
|
|
213 (nth 2 elt))
|
|
|
214 (defun ediff-get-session-objB (elt)
|
|
|
215 (nth 3 elt))
|
|
|
216 (defun ediff-get-session-objC (elt)
|
|
|
217 (nth 4 elt))
|
|
|
218 (defun ediff-get-session-objA-name (elt)
|
|
|
219 (car (nth 2 elt)))
|
|
|
220 (defun ediff-get-session-objB-name (elt)
|
|
|
221 (car (nth 3 elt)))
|
|
|
222 (defun ediff-get-session-objC-name (elt)
|
|
|
223 (car (nth 4 elt)))
|
|
|
224 ;; equality indicators
|
|
|
225 (defsubst ediff-get-file-eqstatus (elt)
|
|
|
226 (nth 1 elt))
|
|
|
227 (defsubst ediff-set-file-eqstatus (elt value)
|
|
|
228 (setcar (cdr elt) value))
|
|
|
229
|
|
|
230 ;; set up the keymap in the meta buffer
|
|
|
231 (defun ediff-setup-meta-map()
|
|
|
232 (setq ediff-meta-buffer-map (make-sparse-keymap))
|
|
|
233 (suppress-keymap ediff-meta-buffer-map)
|
|
|
234 (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer)
|
|
|
235 (define-key ediff-meta-buffer-map "R" 'ediff-show-registry)
|
|
|
236 (define-key ediff-meta-buffer-map "E" 'ediff-documentation)
|
|
|
237 (define-key ediff-meta-buffer-map "v" ediff-meta-action-function)
|
|
|
238 (define-key ediff-meta-buffer-map "\C-m" ediff-meta-action-function)
|
|
|
239 (define-key ediff-meta-buffer-map " " 'ediff-next-meta-item)
|
|
|
240 (define-key ediff-meta-buffer-map "\C-?" 'ediff-previous-meta-item)
|
|
|
241 (define-key ediff-meta-buffer-map [delete] 'ediff-previous-meta-item)
|
|
|
242 (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item)
|
|
|
243 (or (ediff-one-filegroup-metajob)
|
|
|
244 (define-key ediff-meta-buffer-map "=" 'ediff-meta-mark-equal-files))
|
|
|
245 (if ediff-no-emacs-help-in-control-buffer
|
|
|
246 (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item))
|
|
|
247 (if ediff-emacs-p
|
|
|
248 (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function)
|
|
|
249 (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function))
|
|
|
250
|
|
12
|
251 (use-local-map ediff-meta-buffer-map)
|
|
|
252 ;; modify ediff-meta-buffer-map here
|
|
|
253 (run-hooks 'ediff-meta-buffer-keymap-setup-hook))
|
|
0
|
254
|
|
|
255 (defun ediff-meta-mode ()
|
|
|
256 "This mode controls all operations on Ediff session groups.
|
|
|
257 It is entered through one of the following commands:
|
|
|
258 `ediff-directories'
|
|
|
259 `edirs'
|
|
|
260 `ediff-directories3'
|
|
|
261 `edirs3'
|
|
|
262 `ediff-merge-directories'
|
|
|
263 `edirs-merge'
|
|
|
264 `ediff-merge-directories-with-ancestor'
|
|
|
265 `edirs-merge-with-ancestor'
|
|
|
266 `ediff-directory-revisions'
|
|
|
267 `edir-revisions'
|
|
|
268 `ediff-merge-directory-revisions'
|
|
|
269 `edir-merge-revisions'
|
|
|
270 `ediff-merge-directory-revisions-with-ancestor'
|
|
|
271 `edir-merge-revisions-with-ancestor'
|
|
|
272
|
|
|
273 Commands:
|
|
|
274 \\{ediff-meta-buffer-map}"
|
|
|
275 (kill-all-local-variables)
|
|
|
276 (setq major-mode 'ediff-meta-mode)
|
|
|
277 (setq mode-name "MetaEdiff"))
|
|
|
278
|
|
|
279
|
|
|
280 ;; the keymap for the buffer showing directory differences
|
|
|
281 (suppress-keymap ediff-dir-diffs-buffer-map)
|
|
|
282 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
|
|
|
283 (define-key ediff-dir-diffs-buffer-map " " 'next-line)
|
|
|
284 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)
|
|
|
285 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line)
|
|
|
286 (define-key ediff-dir-diffs-buffer-map [backspace] 'previous-line)
|
|
|
287
|
|
|
288 (defun ediff-next-meta-item (count)
|
|
|
289 "Move to the next item in Ediff registry or session group buffer.
|
|
|
290 Moves in circular fashion. With numeric prefix arg, skip this many items."
|
|
|
291 (interactive "p")
|
|
|
292 (or count (setq count 1))
|
|
|
293 (while (< 0 count)
|
|
|
294 (setq count (1- count))
|
|
|
295 (ediff-next-meta-item1)))
|
|
|
296
|
|
|
297 ;; Move to the next meta item
|
|
|
298 (defun ediff-next-meta-item1 ()
|
|
|
299 (let (pos)
|
|
|
300 (setq pos (ediff-next-meta-overlay-start (point)))
|
|
|
301 ;;; ;; skip deleted
|
|
|
302 ;;; (while (memq (ediff-get-session-status
|
|
|
303 ;;; (ediff-get-meta-info (current-buffer) pos 'noerror))
|
|
|
304 ;;; '(?H ?I))
|
|
|
305 ;;; (setq pos (ediff-next-meta-overlay-start pos)))
|
|
|
306
|
|
|
307 (if pos (goto-char pos))
|
|
|
308 (if (eq ediff-metajob-name 'ediff-registry)
|
|
|
309 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
|
|
|
310 (search-forward "*Ediff" nil t))
|
|
|
311 (skip-chars-backward "a-zA-Z*"))
|
|
|
312 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
|
|
|
313 (backward-char 1)))))
|
|
|
314
|
|
|
315
|
|
|
316 (defun ediff-previous-meta-item (count)
|
|
|
317 "Move to the previous item in Ediff registry or session group buffer.
|
|
|
318 Moves in circular fashion. With numeric prefix arg, skip this many items."
|
|
|
319 (interactive "p")
|
|
|
320 (or count (setq count 1))
|
|
|
321 (while (< 0 count)
|
|
|
322 (setq count (1- count))
|
|
|
323 (ediff-previous-meta-item1)))
|
|
|
324
|
|
|
325 (defun ediff-previous-meta-item1 ()
|
|
|
326 (let (pos)
|
|
|
327 (setq pos (ediff-previous-meta-overlay-start (point)))
|
|
|
328 ;;; ;; skip deleted
|
|
|
329 ;;; (while (ediff-get-session-status
|
|
|
330 ;;; (ediff-get-meta-info (current-buffer) pos 'noerror))
|
|
|
331 ;;; (setq pos (ediff-previous-meta-overlay-start pos)))
|
|
|
332
|
|
|
333 (if pos (goto-char pos))
|
|
|
334 (if (eq ediff-metajob-name 'ediff-registry)
|
|
|
335 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
|
|
|
336 (search-forward "*Ediff" nil t))
|
|
|
337 (skip-chars-backward "a-zA-Z*"))
|
|
|
338 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
|
|
|
339 (backward-char 1)))
|
|
|
340 ))
|
|
|
341
|
|
12
|
342 (defsubst ediff-add-slash-if-directory (dir file)
|
|
|
343 (if (file-directory-p (concat dir file))
|
|
|
344 (file-name-as-directory file)
|
|
|
345 file))
|
|
0
|
346
|
|
|
347
|
|
12
|
348 ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
|
|
|
349 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
|
|
|
350 ;; Can be nil.
|
|
|
351 ;; REGEXP is a regexp used to filter out files in the directories.
|
|
0
|
352 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
|
|
|
353 ;; included in the intersection. However, a regular file that is a dir in dir3
|
|
|
354 ;; is included, since dir3 files are supposed to be ancestors for merging.
|
|
|
355 ;; Returns a list of the form:
|
|
|
356 ;; ((dir1 dir2 dir3) (f1 f2 f3) (f1 f2 f3) ...)
|
|
|
357 ;; dir3, f3 can be nil if intersecting only 2 directories.
|
|
|
358 ;; If COMPARISON-FUNC is given, use it. Otherwise, use string=
|
|
12
|
359 ;; DIFF-VAR contains the name of the variable in which to return the
|
|
|
360 ;; difference list (which represents the differences among the contents of
|
|
|
361 ;; directories). The diff list is of the form:
|
|
0
|
362 ;; ((dir1 dir2 dir3) (file . num) (file . num)...)
|
|
|
363 ;; where num encodes the set of dirs where the file is found:
|
|
|
364 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.
|
|
|
365 (defun ediff-intersect-directories (jobname
|
|
|
366 diff-var regexp dir1 dir2
|
|
12
|
367 &optional
|
|
|
368 dir3 merge-autostore-dir comparison-func)
|
|
0
|
369 (setq comparison-func (or comparison-func 'string=))
|
|
|
370 (let (lis1 lis2 lis3 common auxdir1 auxdir2 auxdir3 difflist)
|
|
|
371
|
|
|
372 (setq auxdir1 (file-name-as-directory dir1)
|
|
|
373 lis1 (directory-files auxdir1 nil regexp)
|
|
12
|
374 lis1 (delete "." lis1)
|
|
|
375 lis1 (delete ".." lis1)
|
|
|
376 lis1 (mapcar
|
|
|
377 (function
|
|
|
378 (lambda (elt)
|
|
|
379 (ediff-add-slash-if-directory auxdir1 elt)))
|
|
|
380 lis1)
|
|
0
|
381 auxdir2 (file-name-as-directory dir2)
|
|
14
|
382 lis2 (mapcar
|
|
12
|
383 (function
|
|
|
384 (lambda (elt)
|
|
|
385 (ediff-add-slash-if-directory auxdir2 elt)))
|
|
|
386 (directory-files auxdir2 nil regexp)))
|
|
0
|
387
|
|
|
388 (if (stringp dir3)
|
|
|
389 (setq auxdir3 (file-name-as-directory dir3)
|
|
14
|
390 lis3 (mapcar
|
|
12
|
391 (function
|
|
|
392 (lambda (elt)
|
|
|
393 (ediff-add-slash-if-directory auxdir3 elt)))
|
|
|
394 (directory-files auxdir3 nil regexp))))
|
|
0
|
395
|
|
12
|
396 (if (stringp merge-autostore-dir)
|
|
|
397 (setq merge-autostore-dir
|
|
|
398 (file-name-as-directory merge-autostore-dir)))
|
|
0
|
399 (setq common (ediff-intersection lis1 lis2 comparison-func))
|
|
12
|
400
|
|
|
401 ;; In merge with ancestor jobs, we don't intersect with lis3.
|
|
|
402 ;; If there is no ancestor, we'll offer to merge without the ancestor.
|
|
|
403 ;; So, we intersect with lis3 only when we are doing 3-way file comparison
|
|
|
404 (if (and lis3 (ediff-comparison-metajob3 jobname))
|
|
|
405 (setq common (ediff-intersection common lis3 comparison-func)))
|
|
0
|
406
|
|
|
407 ;; copying is needed because sort sorts via side effects
|
|
|
408 (setq common (sort (ediff-copy-list common) 'string-lessp))
|
|
|
409
|
|
|
410 ;; compute difference list
|
|
|
411 (setq difflist (ediff-set-difference
|
|
|
412 (ediff-union (ediff-union lis1 lis2 comparison-func)
|
|
|
413 lis3
|
|
|
414 comparison-func)
|
|
|
415 common
|
|
|
416 comparison-func)
|
|
|
417 difflist (delete "." difflist)
|
|
|
418 ;; copying is needed because sort sorts via side effects
|
|
|
419 difflist (sort (ediff-copy-list (delete ".." difflist))
|
|
|
420 'string-lessp))
|
|
|
421
|
|
|
422 (setq difflist (mapcar (function (lambda (elt) (cons elt 1))) difflist))
|
|
|
423
|
|
|
424 ;; check for files belonging to lis1/2/3
|
|
|
425 (mapcar (function (lambda (elt)
|
|
|
426 (if (member (car elt) lis1)
|
|
|
427 (setcdr elt (* (cdr elt) 2)))
|
|
|
428 (if (member (car elt) lis2)
|
|
|
429 (setcdr elt (* (cdr elt) 3)))
|
|
|
430 (if (member (car elt) lis3)
|
|
|
431 (setcdr elt (* (cdr elt) 5)))
|
|
|
432 ))
|
|
|
433 difflist)
|
|
|
434 (setq difflist (cons (list regexp auxdir1 auxdir2 auxdir3) difflist))
|
|
|
435
|
|
12
|
436 ;; return the difference list back to the calling function
|
|
0
|
437 (set diff-var difflist)
|
|
|
438
|
|
|
439 ;; return result
|
|
12
|
440 (cons (list regexp auxdir1 auxdir2 auxdir3 merge-autostore-dir)
|
|
|
441 (mapcar
|
|
|
442 (function
|
|
|
443 (lambda (elt)
|
|
|
444 (list (concat auxdir1 elt)
|
|
|
445 (concat auxdir2 elt)
|
|
|
446 (if lis3
|
|
|
447 (progn
|
|
|
448 ;; The following is done because:
|
|
|
449 ;; In merging with ancestor, we don't intersect
|
|
|
450 ;; with lis3. So, it is possible that elt is a
|
|
|
451 ;; file in auxdir1/2 but a directory in auxdir3
|
|
|
452 ;; Or elt may not exist in auxdir3 at all.
|
|
|
453 ;; In the first case, we add a slash at the end.
|
|
|
454 ;; In the second case, we insert nil.
|
|
|
455 (setq elt (ediff-add-slash-if-directory auxdir3 elt))
|
|
|
456 (if (file-exists-p (concat auxdir3 elt))
|
|
|
457 (concat auxdir3 elt)))))))
|
|
|
458 common))
|
|
0
|
459 ))
|
|
|
460
|
|
|
461 ;; find directory files that are under revision.
|
|
12
|
462 ;; Include subdirectories, since we may visit them recursively.
|
|
|
463 ;; DIR1 is the directory to inspect.
|
|
|
464 ;; OUTPUT-DIR is the directory where to auto-store the results of merges. Can
|
|
|
465 ;; be nil.
|
|
|
466 (defun ediff-get-directory-files-under-revision (jobname
|
|
|
467 regexp dir1
|
|
|
468 &optional merge-autostore-dir)
|
|
0
|
469 (let (lis1 elt common auxdir1)
|
|
|
470 (setq auxdir1 (file-name-as-directory dir1)
|
|
|
471 lis1 (directory-files auxdir1 nil regexp))
|
|
|
472
|
|
12
|
473 (if (stringp merge-autostore-dir)
|
|
|
474 (setq merge-autostore-dir
|
|
|
475 (file-name-as-directory merge-autostore-dir)))
|
|
|
476
|
|
0
|
477 (while lis1
|
|
|
478 (setq elt (car lis1)
|
|
|
479 lis1 (cdr lis1))
|
|
|
480 ;; take files under revision control
|
|
|
481 (cond ((file-directory-p (concat auxdir1 elt))
|
|
|
482 (setq common (cons elt common)))
|
|
|
483 ((file-exists-p (concat auxdir1 elt ",v"))
|
|
|
484 (setq common (cons elt common)))
|
|
|
485 ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))
|
|
|
486 (setq common (cons elt common)))
|
|
|
487 ) ; cond
|
|
|
488 ) ; while
|
|
|
489
|
|
|
490 (setq common (delete "." common)
|
|
12
|
491 common (delete ".." common)
|
|
|
492 common (delete "RCS" common))
|
|
0
|
493
|
|
|
494 ;; copying is needed because sort sorts via side effects
|
|
|
495 (setq common (sort (ediff-copy-list common) 'string-lessp))
|
|
|
496
|
|
|
497 ;; return result
|
|
12
|
498 (cons (list regexp auxdir1 nil nil merge-autostore-dir)
|
|
0
|
499 (mapcar (function (lambda (elt)
|
|
|
500 (list (concat auxdir1 elt)
|
|
|
501 nil nil)))
|
|
|
502 common))
|
|
|
503 ))
|
|
|
504
|
|
|
505
|
|
|
506 ;; If file groups selected by patterns will ever be implemented, this
|
|
|
507 ;; comparison function might become useful.
|
|
|
508 ;;;; uses external variables PAT1 PAT2 to compare str1/2
|
|
|
509 ;;;; patterns must be of the form ???*???? where ??? are strings of chars
|
|
|
510 ;;;; containing no *.
|
|
|
511 ;;(defun ediff-pattern= (str1 str2)
|
|
|
512 ;; (let (pos11 pos12 pos21 pos22 len1 len2)
|
|
|
513 ;; (setq pos11 0
|
|
|
514 ;; len (length epat1)
|
|
|
515 ;; pos12 len)
|
|
|
516 ;; (while (and (< pos11 len) (not (= (aref epat1 pos11) ?*)))
|
|
|
517 ;; (setq pos11 (1+ pos11)))
|
|
|
518 ;; (while (and (> pos12 0) (not (= (aref epat1 (1- pos12)) ?*)))
|
|
|
519 ;; (setq pos12 (1- pos12)))
|
|
|
520 ;;
|
|
|
521 ;; (setq pos21 0
|
|
|
522 ;; len (length epat2)
|
|
|
523 ;; pos22 len)
|
|
|
524 ;; (while (and (< pos21 len) (not (= (aref epat2 pos21) ?*)))
|
|
|
525 ;; (setq pos21 (1+ pos21)))
|
|
|
526 ;; (while (and (> pos22 0) (not (= (aref epat2 (1- pos22)) ?*)))
|
|
|
527 ;; (setq pos22 (1- pos22)))
|
|
|
528 ;;
|
|
|
529 ;; (if (and (> (length str1) pos12) (>= pos12 pos11) (> pos11 -1)
|
|
|
530 ;; (> (length str2) pos22) (>= pos22 pos21) (> pos21 -1))
|
|
|
531 ;; (string= (substring str1 pos11 pos12)
|
|
|
532 ;; (substring str2 pos21 pos22)))
|
|
|
533 ;; ))
|
|
|
534
|
|
|
535
|
|
|
536 ;; Prepare meta-buffer in accordance with the argument-function and
|
|
|
537 ;; redraw-function. Must return the created meta-buffer.
|
|
|
538 (defun ediff-prepare-meta-buffer (action-func meta-list
|
|
|
539 meta-buffer-name redraw-function
|
|
|
540 jobname &optional startup-hooks)
|
|
|
541 (let* ((meta-buffer-name
|
|
|
542 (ediff-unique-buffer-name meta-buffer-name "*"))
|
|
|
543 (meta-buffer (get-buffer-create meta-buffer-name)))
|
|
|
544 (ediff-eval-in-buffer meta-buffer
|
|
|
545
|
|
|
546 ;; comes first
|
|
|
547 (ediff-meta-mode)
|
|
|
548
|
|
|
549 (setq ediff-meta-action-function action-func
|
|
|
550 ediff-meta-redraw-function redraw-function
|
|
|
551 ediff-metajob-name jobname
|
|
|
552 ediff-meta-buffer meta-buffer)
|
|
|
553
|
|
|
554 ;; comes after ediff-meta-action-function is set
|
|
|
555 (ediff-setup-meta-map)
|
|
|
556
|
|
|
557 (if (eq ediff-metajob-name 'ediff-registry)
|
|
|
558 (progn
|
|
|
559 (setq ediff-registry-buffer meta-buffer
|
|
|
560 ediff-meta-list meta-list)
|
|
|
561 ;; this func is used only from registry buffer, not from other
|
|
|
562 ;; meta-buffs.
|
|
|
563 (define-key
|
|
|
564 ediff-meta-buffer-map "M" 'ediff-show-meta-buff-from-registry))
|
|
12
|
565 ;; Initialize the meta list -- don't do this for registry.
|
|
|
566 ;;
|
|
|
567 ;; We prepend '(nil nil) to all elts of meta-list, except the first.
|
|
|
568 ;; The first nil will later be replaced by the session buffer. The
|
|
|
569 ;; second is reserved for session status.
|
|
|
570 ;;
|
|
0
|
571 ;; (car ediff-meta-list) gets cons'ed with the session group buffer.
|
|
12
|
572 ;; Also, session objects A/B/C are turned into lists of the form
|
|
|
573 ;; (obj eq-indicator). Eq-indicator is either nil or =. Initialized to
|
|
|
574 ;; nil. If later it is discovered that this file is = to some other
|
|
|
575 ;; file in the same session, eq-indicator is changed to `='.
|
|
0
|
576 ;; For now, the eq-indicator is used only for 2 and 3-file jobs.
|
|
|
577 (setq ediff-meta-list
|
|
|
578 (cons (cons meta-buffer (car meta-list))
|
|
12
|
579 (mapcar
|
|
|
580 (function
|
|
|
581 (lambda (elt)
|
|
|
582 (cons nil
|
|
|
583 (cons nil
|
|
|
584 ;; convert each obj to (obj nil),
|
|
|
585 ;; where nil is the initial value
|
|
|
586 ;; for eq-indicator -- see above
|
|
|
587 (mapcar
|
|
|
588 (function (lambda (obj) (list obj nil)))
|
|
|
589 elt)))))
|
|
|
590 (cdr meta-list)))))
|
|
0
|
591
|
|
|
592 (or (eq meta-buffer ediff-registry-buffer)
|
|
|
593 (setq ediff-session-registry
|
|
|
594 (cons meta-buffer ediff-session-registry)))
|
|
|
595
|
|
|
596 ;; redraw-function uses ediff-meta-list
|
|
|
597 (funcall redraw-function ediff-meta-list)
|
|
|
598
|
|
|
599 ;; set read-only/non-modified
|
|
|
600 (setq buffer-read-only t)
|
|
|
601 (set-buffer-modified-p nil)
|
|
|
602
|
|
|
603 (run-hooks 'startup-hooks)
|
|
12
|
604
|
|
|
605 ;; Arrange to show directory contents differences
|
|
|
606 ;; Must be after run startup-hooks, since ediff-dir-difference-list is
|
|
0
|
607 ;; set inside these hooks
|
|
|
608 (if (eq action-func 'ediff-filegroup-action)
|
|
|
609 (progn
|
|
|
610 ;; put meta buffer in (car ediff-dir-difference-list)
|
|
|
611 (setq ediff-dir-difference-list
|
|
|
612 (cons (cons meta-buffer (car ediff-dir-difference-list))
|
|
|
613 (cdr ediff-dir-difference-list)))
|
|
|
614
|
|
|
615 (or (ediff-one-filegroup-metajob jobname)
|
|
|
616 (ediff-draw-dir-diffs ediff-dir-difference-list))
|
|
|
617 (define-key ediff-meta-buffer-map "h" 'ediff-mark-for-hiding)
|
|
|
618 (define-key
|
|
|
619 ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
|
|
|
620 (define-key ediff-meta-buffer-map "m" 'ediff-mark-for-operation)
|
|
|
621 (cond ((ediff-collect-diffs-metajob jobname)
|
|
|
622 (define-key
|
|
|
623 ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
|
|
|
624 ((ediff-patch-metajob jobname)
|
|
|
625 (define-key
|
|
|
626 ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
|
|
|
627 (define-key ediff-meta-buffer-map "u" 'ediff-up-meta-hierarchy)
|
|
|
628 (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
|
|
|
629
|
|
|
630 (if (eq ediff-metajob-name 'ediff-registry)
|
|
|
631 (run-hooks 'ediff-registry-setup-hook)
|
|
|
632 (run-hooks 'ediff-session-group-setup-hook))
|
|
|
633 ) ; eval in meta-buffer
|
|
|
634 meta-buffer))
|
|
|
635
|
|
|
636
|
|
|
637 ;; this is a setup function for ediff-directories
|
|
|
638 ;; must return meta-buffer
|
|
|
639 (defun ediff-redraw-directory-group-buffer (meta-list)
|
|
|
640 ;; extract directories
|
|
|
641 (let ((meta-buf (ediff-get-group-buffer meta-list))
|
|
|
642 (empty t)
|
|
|
643 (sessionNum 0)
|
|
|
644 regexp elt session-buf f1 f2 f3 pt
|
|
12
|
645 merge-autostore-dir
|
|
0
|
646 point tmp-list buffer-read-only)
|
|
|
647 (ediff-eval-in-buffer meta-buf
|
|
|
648 (setq point (point))
|
|
|
649 (erase-buffer)
|
|
|
650 (insert (format ediff-meta-buffer-message
|
|
|
651 (ediff-abbrev-jobname ediff-metajob-name)))
|
|
|
652
|
|
12
|
653 (setq regexp (ediff-get-group-regexp meta-list)
|
|
|
654 merge-autostore-dir (ediff-get-group-merge-autostore-dir meta-list))
|
|
0
|
655
|
|
|
656 (cond ((ediff-collect-diffs-metajob)
|
|
|
657 (insert
|
|
|
658 " `P':\tcollect custom diffs of all marked sessions\n"))
|
|
|
659 ((ediff-patch-metajob)
|
|
|
660 (insert
|
|
|
661 " `P':\tshow patch appropriately for the context (session or group)\n")))
|
|
|
662 (insert
|
|
|
663 " `u':\tshow parent session group\n")
|
|
|
664 (or (ediff-one-filegroup-metajob)
|
|
|
665 (insert
|
|
|
666 " `D':\tshow differences among directories\n"
|
|
|
667 " `=':\tmark identical files in each session\n\n"))
|
|
|
668
|
|
|
669 (if (and (stringp regexp) (> (length regexp) 0))
|
|
16
|
670 (insert
|
|
|
671 (format "\n*** Filter-through regular expression: %s\n" regexp)))
|
|
12
|
672 (if (and ediff-autostore-merges (ediff-merge-metajob)
|
|
|
673 (stringp merge-autostore-dir))
|
|
|
674 (insert (format
|
|
|
675 "\nMerges are automatically stored in directory: %s\n"
|
|
|
676 merge-autostore-dir)))
|
|
0
|
677 (insert "\n
|
|
|
678 Size Last modified Name
|
|
|
679 -----------------------------------------------------------------------
|
|
|
680
|
|
|
681 ")
|
|
|
682
|
|
|
683 ;; discard info on directories and regexp
|
|
|
684 (setq meta-list (cdr meta-list)
|
|
|
685 tmp-list meta-list)
|
|
|
686 (while (and tmp-list empty)
|
|
|
687 (if (and (car tmp-list)
|
|
|
688 (not (eq (ediff-get-session-status (car tmp-list)) ?I)))
|
|
|
689 (setq empty nil))
|
|
|
690 (setq tmp-list (cdr tmp-list)))
|
|
|
691
|
|
|
692 (if empty
|
|
|
693 (insert
|
|
|
694 " ****** ****** This session group has no members\n"))
|
|
|
695
|
|
|
696 ;; now organize file names like this:
|
|
|
697 ;; use-mark sizeA dateA sizeB dateB filename
|
|
|
698 ;; make sure directories are displayed with a trailing slash.
|
|
|
699 (while meta-list
|
|
|
700 (setq elt (car meta-list)
|
|
|
701 meta-list (cdr meta-list)
|
|
|
702 sessionNum (1+ sessionNum))
|
|
|
703 (if (eq (ediff-get-session-status elt) ?I)
|
|
|
704 ()
|
|
|
705 (setq session-buf (ediff-get-session-buffer elt)
|
|
|
706 f1 (ediff-get-session-objA elt)
|
|
|
707 f2 (ediff-get-session-objB elt)
|
|
|
708 f3 (ediff-get-session-objC elt))
|
|
|
709 (setq pt (point))
|
|
|
710 ;; insert markers
|
|
|
711 (insert (cond ((null session-buf) " ") ; virgin session
|
|
|
712 ((ediff-buffer-live-p session-buf) "+") ;active session
|
|
|
713 (t "-"))) ; finished session
|
|
|
714 (insert (cond ((ediff-get-session-status elt)) ; session has status,
|
|
|
715 ;;; e.g., ?H, ?I
|
|
|
716 (t " "))) ; normal session
|
|
|
717 (insert " Session " (int-to-string sessionNum) ":\n")
|
|
|
718 (ediff-meta-insert-file-info f1)
|
|
|
719 (ediff-meta-insert-file-info f2)
|
|
|
720 (ediff-meta-insert-file-info f3)
|
|
|
721 (ediff-set-meta-overlay pt (point) elt)))
|
|
|
722 (set-buffer-modified-p nil)
|
|
|
723 (goto-char point)
|
|
|
724 meta-buf)))
|
|
|
725
|
|
|
726 ;; Check if this is a problematic session.
|
|
|
727 ;; Return nil if not. Otherwise, return symbol representing the problem
|
|
|
728 ;; At present, problematic sessions occur only in -with-ancestor comparisons
|
|
12
|
729 ;; when the ancestor is a directory rather than a file, or when there is no
|
|
|
730 ;; suitable ancestor file in the ancestor directory
|
|
0
|
731 (defun ediff-problematic-session-p (session)
|
|
|
732 (let ((f1 (ediff-get-session-objA-name session))
|
|
|
733 (f2 (ediff-get-session-objB-name session))
|
|
|
734 (f3 (ediff-get-session-objC-name session)))
|
|
|
735 (cond ((and (stringp f1) (not (file-directory-p f1))
|
|
|
736 (stringp f2) (not (file-directory-p f2))
|
|
12
|
737 ;; either invalid file name or a directory
|
|
|
738 (or (not (stringp f3)) (file-directory-p f3))
|
|
0
|
739 (ediff-ancestor-metajob))
|
|
|
740 ;; more may be added later
|
|
|
741 'ancestor-is-dir)
|
|
|
742 (t nil))))
|
|
|
743
|
|
|
744 (defun ediff-meta-insert-file-info (fileinfo)
|
|
12
|
745 (let ((fname (car fileinfo))
|
|
0
|
746 (feq (ediff-get-file-eqstatus fileinfo))
|
|
12
|
747 file-modtime file-size)
|
|
0
|
748
|
|
14
|
749 (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits
|
|
12
|
750 ((not (ediff-file-remote-p fname))
|
|
|
751 (if (file-exists-p fname)
|
|
|
752 ;; set real size and modtime
|
|
|
753 (setq file-size (ediff-file-size fname)
|
|
|
754 file-modtime (ediff-file-modtime fname))
|
|
|
755 (setq file-size -2))) ; file doesn't exist
|
|
|
756 ( t (setq file-size -1))) ; remote file
|
|
0
|
757 (if (stringp fname)
|
|
|
758 (insert
|
|
|
759 (format
|
|
|
760 "%s %s %-20s %s\n"
|
|
|
761 (if feq "=" " ") ; equality indicator
|
|
12
|
762 (format "%10s" (cond ((= file-size -1) "--")
|
|
|
763 ((< file-size -1) "--")
|
|
|
764 (t file-size)))
|
|
|
765 (cond ((= file-size -1) "*remote file*")
|
|
|
766 ((< file-size -1) "*file doesn't exist*")
|
|
|
767 (t (ediff-format-date (decode-time file-modtime))))
|
|
|
768
|
|
|
769 ;; dir names in meta lists have training slashes, so we just
|
|
|
770 ;; abbreviate the file name, if file exists
|
|
|
771 (if (and (not (stringp fname)) (< file-size -1))
|
|
|
772 "-------" ; file doesn't exist
|
|
|
773 (ediff-abbreviate-file-name fname)))))))
|
|
0
|
774
|
|
|
775 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
|
|
|
776 (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")
|
|
|
777 (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec"))
|
|
|
778 "Months' associative array.")
|
|
|
779
|
|
12
|
780 ;; returns 2char string
|
|
|
781 (defsubst ediff-fill-leading-zero (num)
|
|
|
782 (if (< num 10)
|
|
|
783 (format "0%d" num)
|
|
|
784 (number-to-string num)))
|
|
|
785
|
|
0
|
786 ;; TIME is like the output of decode-time
|
|
|
787 (defun ediff-format-date (time)
|
|
|
788 (format "%s %2d %4d %s:%s:%s"
|
|
|
789 (cdr (assoc (nth 4 time) ediff-months)) ; month
|
|
|
790 (nth 3 time) ; day
|
|
|
791 (nth 5 time) ; year
|
|
|
792 (ediff-fill-leading-zero (nth 2 time)) ; hour
|
|
|
793 (ediff-fill-leading-zero (nth 1 time)) ; min
|
|
|
794 (ediff-fill-leading-zero (nth 0 time)) ; sec
|
|
|
795 ))
|
|
|
796
|
|
|
797 (defun ediff-draw-dir-diffs (diff-list)
|
|
|
798 (if (null diff-list) (error "Lost difference info on these directories"))
|
|
|
799 (let* ((buf-name (ediff-unique-buffer-name
|
|
|
800 "*Ediff File Group Differences" "*"))
|
|
|
801 (regexp (ediff-get-group-regexp diff-list))
|
|
|
802 (dir1 (ediff-abbreviate-file-name (ediff-get-group-objA diff-list)))
|
|
|
803 (dir2 (ediff-abbreviate-file-name (ediff-get-group-objB diff-list)))
|
|
|
804 (dir3 (ediff-get-group-objC diff-list))
|
|
|
805 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3)))
|
|
|
806 (meta-buf (ediff-get-group-buffer diff-list))
|
|
|
807 (underline (make-string 26 ?-))
|
|
|
808 file code
|
|
|
809 buffer-read-only)
|
|
|
810 ;; skip the directory part
|
|
|
811 (setq diff-list (cdr diff-list))
|
|
|
812 (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))
|
|
|
813 (ediff-eval-in-buffer ediff-dir-diffs-buffer
|
|
|
814 (use-local-map ediff-dir-diffs-buffer-map)
|
|
|
815 (erase-buffer)
|
|
|
816 (setq ediff-meta-buffer meta-buf)
|
|
|
817 (insert "\t\t*** Directory Differences ***\n")
|
|
|
818 (insert "
|
|
|
819 Useful commands:
|
|
|
820 `q': hide this buffer
|
|
|
821 SPC: next line
|
|
|
822 DEL: previous line\n\n")
|
|
|
823
|
|
|
824 (if (and (stringp regexp) (> (length regexp) 0))
|
|
16
|
825 (insert
|
|
|
826 (format "\n*** Filter-through regular expression: %s\n" regexp)))
|
|
0
|
827 (insert "\n")
|
|
|
828 (insert (format "\n%-27s%-26s"
|
|
|
829 (ediff-truncate-string-left
|
|
|
830 (ediff-abbreviate-file-name
|
|
|
831 (file-name-as-directory dir1))
|
|
|
832 25)
|
|
|
833 (ediff-truncate-string-left
|
|
|
834 (ediff-abbreviate-file-name
|
|
|
835 (file-name-as-directory dir2))
|
|
|
836 25)))
|
|
|
837 (if dir3
|
|
|
838 (insert (format " %-25s\n"
|
|
|
839 (ediff-truncate-string-left
|
|
|
840 (ediff-abbreviate-file-name
|
|
|
841 (file-name-as-directory dir3))
|
|
|
842 25)))
|
|
|
843 (insert "\n"))
|
|
|
844 (insert (format "%s%s" underline underline))
|
|
|
845 (if (stringp dir3)
|
|
|
846 (insert (format "%s\n\n" underline))
|
|
|
847 (insert "\n\n"))
|
|
|
848
|
|
|
849 (if (null diff-list)
|
|
|
850 (insert "\n\t*** No differences ***\n"))
|
|
|
851
|
|
|
852 (while diff-list
|
|
|
853 (setq file (car (car diff-list))
|
|
|
854 code (cdr (car diff-list))
|
|
|
855 diff-list (cdr diff-list))
|
|
|
856 (if (= (mod code 2) 0) ; dir1
|
|
|
857 (insert (format "%-27s"
|
|
|
858 (ediff-truncate-string-left
|
|
|
859 (ediff-abbreviate-file-name
|
|
|
860 (if (file-directory-p (concat dir1 file))
|
|
|
861 (file-name-as-directory file)
|
|
|
862 file))
|
|
|
863 24)))
|
|
|
864 (insert (format "%-27s" "---")))
|
|
|
865 (if (= (mod code 3) 0) ; dir2
|
|
|
866 (insert (format "%-26s"
|
|
|
867 (ediff-truncate-string-left
|
|
|
868 (ediff-abbreviate-file-name
|
|
|
869 (if (file-directory-p (concat dir2 file))
|
|
|
870 (file-name-as-directory file)
|
|
|
871 file))
|
|
|
872 24)))
|
|
|
873 (insert (format "%-26s" "---")))
|
|
|
874 (if (stringp dir3)
|
|
|
875 (if (= (mod code 5) 0) ; dir3
|
|
|
876 (insert (format " %-25s"
|
|
|
877 (ediff-truncate-string-left
|
|
|
878 (ediff-abbreviate-file-name
|
|
|
879 (if (file-directory-p (concat dir3 file))
|
|
|
880 (file-name-as-directory file)
|
|
|
881 file))
|
|
|
882 24)))
|
|
|
883 (insert (format " %-25s" "---"))))
|
|
|
884 (insert "\n"))
|
|
|
885 (setq buffer-read-only t)
|
|
|
886 (set-buffer-modified-p nil)) ; eval in diff buffer
|
|
|
887 ))
|
|
|
888
|
|
|
889 (defun ediff-bury-dir-diffs-buffer ()
|
|
|
890 "Bury the directory difference buffer. Display the meta buffer instead."
|
|
|
891 (interactive)
|
|
|
892 (let ((buf ediff-meta-buffer)
|
|
|
893 wind)
|
|
|
894 (bury-buffer)
|
|
|
895 (if (setq wind (ediff-get-visible-buffer-window buf))
|
|
|
896 (select-window wind)
|
|
|
897 (set-window-buffer (selected-window) buf))))
|
|
|
898
|
|
|
899 ;; executes in dir session group buffer
|
|
|
900 ;; show buffer differences
|
|
|
901 (defun ediff-show-dir-diffs ()
|
|
|
902 "Display differences among the directories involved in session group."
|
|
|
903 (interactive)
|
|
|
904 (if (ediff-one-filegroup-metajob)
|
|
|
905 (error "This command is inapplicable in the present context"))
|
|
|
906 (or (ediff-buffer-live-p ediff-dir-diffs-buffer)
|
|
|
907 (ediff-draw-dir-diffs ediff-dir-difference-list))
|
|
|
908 (let ((buf ediff-dir-diffs-buffer))
|
|
|
909 (other-window 1)
|
|
|
910 (set-window-buffer (selected-window) buf)
|
|
|
911 (goto-char (point-min))))
|
|
|
912
|
|
|
913 (defun ediff-up-meta-hierarchy ()
|
|
|
914 "Go to the parent session group buffer."
|
|
|
915 (interactive)
|
|
|
916 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
|
|
|
917 (ediff-show-meta-buffer ediff-parent-meta-buffer)
|
|
|
918 (error "This session group has no parent")))
|
|
|
919
|
|
|
920
|
|
|
921 ;; argument is ignored
|
|
|
922 (defun ediff-redraw-registry-buffer (&optional ignore)
|
|
|
923 (ediff-eval-in-buffer ediff-registry-buffer
|
|
|
924 (let ((point (point))
|
|
|
925 elt bufAname bufBname bufCname cur-diff total-diffs pt
|
|
|
926 job-name meta-list registry-list buffer-read-only)
|
|
|
927 (erase-buffer)
|
|
|
928 (insert "This is a registry of all active Ediff sessions.
|
|
|
929
|
|
|
930 Useful commands:
|
|
|
931 button2, `v', RET over a session record: switch to that session
|
|
|
932 `M' over a session record: display the associated session group
|
|
|
933 `R' in any Ediff session: display session registry
|
|
|
934 SPC:\tnext session
|
|
|
935 DEL:\tprevious session
|
|
|
936 `E':\tbrowse Ediff on-line manual
|
|
|
937 `q':\tbury registry
|
|
|
938
|
|
|
939
|
|
|
940 \t\tActive Ediff Sessions:
|
|
|
941 \t\t----------------------
|
|
|
942
|
|
|
943 ")
|
|
|
944 ;; purge registry list from dead buffers
|
|
|
945 (mapcar (function (lambda (elt)
|
|
|
946 (if (not (ediff-buffer-live-p elt))
|
|
|
947 (setq ediff-session-registry
|
|
|
948 (delq elt ediff-session-registry)))))
|
|
|
949 ediff-session-registry)
|
|
|
950
|
|
|
951 (if (null ediff-session-registry)
|
|
|
952 (insert " ******* No active Ediff sessions *******\n"))
|
|
|
953
|
|
|
954 (setq registry-list ediff-session-registry)
|
|
|
955 (while registry-list
|
|
|
956 (setq elt (car registry-list)
|
|
|
957 registry-list (cdr registry-list))
|
|
|
958
|
|
|
959 (if (ediff-buffer-live-p elt)
|
|
|
960 (if (ediff-eval-in-buffer elt
|
|
|
961 (setq job-name ediff-metajob-name
|
|
|
962 meta-list ediff-meta-list)
|
|
|
963 (and ediff-metajob-name
|
|
|
964 (not (eq ediff-metajob-name 'ediff-registry))))
|
|
|
965 (progn
|
|
|
966 (setq pt (point))
|
|
|
967 (insert (format " *group*\t%s: %s\n"
|
|
|
968 (buffer-name elt)
|
|
|
969 (ediff-abbrev-jobname job-name)))
|
|
|
970 (insert (format "\t\t %s %s %s\n"
|
|
|
971 (ediff-abbreviate-file-name
|
|
|
972 (ediff-get-group-objA meta-list))
|
|
|
973 (ediff-abbreviate-file-name
|
|
|
974 (if (stringp
|
|
|
975 (ediff-get-group-objB meta-list))
|
|
|
976 (ediff-get-group-objB meta-list)
|
|
|
977 ""))
|
|
|
978 (ediff-abbreviate-file-name
|
|
|
979 (if (stringp
|
|
|
980 (ediff-get-group-objC meta-list))
|
|
|
981 (ediff-get-group-objC meta-list)
|
|
|
982 ""))))
|
|
|
983 (ediff-set-meta-overlay pt (point) elt))
|
|
|
984 (progn
|
|
|
985 (ediff-eval-in-buffer elt
|
|
|
986 (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
|
|
|
987 (buffer-name ediff-buffer-A)
|
|
|
988 "!!!killed buffer!!!")
|
|
|
989 bufBname (if (ediff-buffer-live-p ediff-buffer-B)
|
|
|
990 (buffer-name ediff-buffer-B)
|
|
|
991 "!!!killed buffer!!!")
|
|
|
992 bufCname (cond ((not (ediff-3way-job))
|
|
|
993 "")
|
|
|
994 ((ediff-buffer-live-p ediff-buffer-C)
|
|
|
995 (buffer-name ediff-buffer-C))
|
|
|
996 (t "!!!killed buffer!!!")))
|
|
|
997 (setq total-diffs (format "%-4d" ediff-number-of-differences)
|
|
|
998 cur-diff
|
|
|
999 (cond ((= ediff-current-difference -1) " _")
|
|
|
1000 ((= ediff-current-difference
|
|
|
1001 ediff-number-of-differences)
|
|
|
1002 " $")
|
|
|
1003 (t (format
|
|
|
1004 "%4d" (1+ ediff-current-difference))))
|
|
|
1005 job-name ediff-job-name))
|
|
|
1006 ;; back in the meta buf
|
|
|
1007 (setq pt (point))
|
|
|
1008 (insert cur-diff "/" total-diffs "\t"
|
|
|
1009 (buffer-name elt)
|
|
|
1010 (format ": %s" (ediff-abbrev-jobname job-name)))
|
|
|
1011 (insert
|
|
|
1012 "\n\t\t " bufAname " " bufBname " " bufCname "\n")
|
|
|
1013 (ediff-set-meta-overlay pt (point) elt))))
|
|
|
1014 ) ; while
|
|
|
1015 (set-buffer-modified-p nil)
|
|
|
1016 (goto-char point)
|
|
|
1017 )))
|
|
|
1018
|
|
|
1019 ;; sets overlay around a meta record with 'ediff-meta-info property PROP
|
|
|
1020 (defun ediff-set-meta-overlay (b e prop)
|
|
|
1021 (let (overl)
|
|
|
1022 (setq overl (ediff-make-overlay b e))
|
|
|
1023 (if ediff-emacs-p
|
|
|
1024 (ediff-overlay-put overl 'mouse-face 'highlight)
|
|
|
1025 (ediff-overlay-put overl 'highlight t))
|
|
|
1026 (ediff-overlay-put overl 'ediff-meta-info prop)))
|
|
|
1027
|
|
|
1028 (defun ediff-mark-for-hiding (unmark)
|
|
|
1029 "Mark session for hiding. With prefix arg, unmark."
|
|
|
1030 (interactive "P")
|
|
|
1031 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1032 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1033 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
|
|
|
1034 (info (ediff-get-meta-info meta-buf pos))
|
|
|
1035 (session-buf (ediff-get-session-buffer info)))
|
|
|
1036
|
|
|
1037 (if (eq (ediff-get-session-status info) ?H)
|
|
|
1038 (setq unmark t))
|
|
|
1039 (if unmark
|
|
|
1040 (ediff-set-session-status info nil)
|
|
|
1041 (if (ediff-buffer-live-p session-buf)
|
|
|
1042 (error "Can't hide active session, %s" (buffer-name session-buf)))
|
|
|
1043 (ediff-set-session-status info ?H))
|
|
|
1044 (or unmark
|
|
|
1045 (ediff-next-meta-item 1))
|
|
|
1046 (ediff-update-meta-buffer meta-buf)
|
|
|
1047 ))
|
|
|
1048
|
|
|
1049 (defun ediff-mark-for-operation (unmark)
|
|
|
1050 "Mark session for a group operation. With prefix arg, unmark."
|
|
|
1051 (interactive "P")
|
|
|
1052 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1053 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1054 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
|
|
|
1055 (info (ediff-get-meta-info meta-buf pos)))
|
|
|
1056
|
|
|
1057 (if (eq (ediff-get-session-status info) ?*)
|
|
|
1058 (setq unmark t))
|
|
|
1059 (if unmark
|
|
|
1060 (ediff-set-session-status info nil)
|
|
|
1061 (ediff-set-session-status info ?*))
|
|
|
1062 (or unmark
|
|
|
1063 (ediff-next-meta-item 1))
|
|
|
1064 (ediff-update-meta-buffer meta-buf)
|
|
|
1065 ))
|
|
|
1066
|
|
|
1067 (defun ediff-hide-marked-sessions (unhide)
|
|
|
1068 "Hide marked sessions. With prefix arg, unhide."
|
|
|
1069 (interactive "P")
|
|
|
1070 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
|
|
|
1071 (meta-list (cdr ediff-meta-list))
|
|
|
1072 (from (if unhide ?I ?H))
|
|
|
1073 (to (if unhide ?H ?I))
|
|
|
1074 (numMarked 0)
|
|
|
1075 active-sessions-exist session-buf elt)
|
|
|
1076 (while meta-list
|
|
|
1077 (setq elt (car meta-list)
|
|
|
1078 meta-list (cdr meta-list)
|
|
|
1079 session-buf (ediff-get-session-buffer elt))
|
|
|
1080
|
|
|
1081 (if (eq (ediff-get-session-status elt) from)
|
|
|
1082 (progn
|
|
|
1083 (setq numMarked (1+ numMarked))
|
|
|
1084 (if (and (eq to ?I) (buffer-live-p session-buf))
|
|
|
1085 ;; shouldn't hide active sessions
|
|
|
1086 (setq active-sessions-exist t)
|
|
|
1087 (ediff-set-session-status elt to)))))
|
|
|
1088 (if (> numMarked 0)
|
|
|
1089 (ediff-update-meta-buffer grp-buf)
|
|
|
1090 (beep)
|
|
|
1091 (if unhide
|
|
|
1092 (message "Nothing to reveal...")
|
|
|
1093 (message "Nothing to hide...")))
|
|
|
1094 (if active-sessions-exist
|
|
|
1095 (message "Note: didn't hide active sessions!"))
|
|
|
1096 ))
|
|
|
1097
|
|
|
1098 ;; Apply OPERATION to marked sessions. Operation expects one argument of type
|
|
|
1099 ;; meta-list member (not the first one), i.e., a regular session description.
|
|
|
1100 ;; Returns number of marked sessions on which operation was performed
|
|
|
1101 (defun ediff-operate-on-marked-sessions (operation)
|
|
|
1102 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
|
|
|
1103 (meta-list (cdr ediff-meta-list))
|
|
|
1104 (marksym ?*)
|
|
|
1105 (numMarked 0)
|
|
|
1106 (sessionNum 0)
|
|
|
1107 elt)
|
|
|
1108 (while meta-list
|
|
|
1109 (setq elt (car meta-list)
|
|
|
1110 meta-list (cdr meta-list)
|
|
|
1111 sessionNum (1+ sessionNum))
|
|
|
1112 (if (eq (ediff-get-session-status elt) marksym)
|
|
|
1113 (save-excursion
|
|
|
1114 (setq numMarked (1+ numMarked))
|
|
|
1115 (funcall operation elt sessionNum))))
|
|
|
1116 (ediff-update-meta-buffer grp-buf) ; just in case
|
|
|
1117 numMarked
|
|
|
1118 ))
|
|
|
1119
|
|
|
1120 (defun ediff-append-custom-diff (session sessionNum)
|
|
|
1121 (or (ediff-collect-diffs-metajob)
|
|
|
1122 (error "Sorry, I don't do this for everyone..."))
|
|
|
1123 (let ((session-buf (ediff-get-session-buffer session))
|
|
|
1124 (meta-diff-buff ediff-meta-diff-buffer)
|
|
|
1125 (metajob ediff-metajob-name)
|
|
|
1126 tmp-buf custom-diff-buf)
|
|
|
1127 (if (ediff-buffer-live-p session-buf)
|
|
|
1128 (ediff-eval-in-buffer session-buf
|
|
|
1129 (if (eq ediff-control-buffer session-buf) ; individual session
|
|
|
1130 (progn
|
|
|
1131 (ediff-compute-custom-diffs-maybe)
|
|
|
1132 (setq custom-diff-buf ediff-custom-diff-buffer)))))
|
|
|
1133
|
|
|
1134 (or (ediff-buffer-live-p meta-diff-buff)
|
|
|
1135 (error "Ediff: something wrong--no multiple diffs buffer"))
|
|
|
1136
|
|
|
1137 (cond ((ediff-buffer-live-p custom-diff-buf)
|
|
|
1138 (save-excursion
|
|
|
1139 (set-buffer meta-diff-buff)
|
|
|
1140 (goto-char (point-max))
|
|
|
1141 (insert-buffer custom-diff-buf)
|
|
|
1142 (insert "\n")))
|
|
|
1143 ((memq metajob '(ediff-directories
|
|
|
1144 ediff-merge-directories
|
|
|
1145 ediff-merge-directories-with-ancestor))
|
|
|
1146 ;; get diffs by calling shell command on ediff-custom-diff-program
|
|
|
1147 (save-excursion
|
|
|
1148 (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
|
|
|
1149 (erase-buffer)
|
|
|
1150 (shell-command
|
|
|
1151 (format "%s %s %s %s"
|
|
|
1152 ediff-custom-diff-program ediff-custom-diff-options
|
|
|
1153 (ediff-get-session-objA-name session)
|
|
|
1154 (ediff-get-session-objB-name session))
|
|
|
1155 t))
|
|
|
1156 (save-excursion
|
|
|
1157 (set-buffer meta-diff-buff)
|
|
|
1158 (goto-char (point-max))
|
|
|
1159 (insert-buffer tmp-buf)
|
|
|
1160 (insert "\n")))
|
|
|
1161 (t
|
|
|
1162 (error "Can't make context diff for Session %d" sessionNum )))
|
|
|
1163 ))
|
|
|
1164
|
|
|
1165 (defun ediff-collect-custom-diffs ()
|
|
|
1166 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
|
|
|
1167 This operation is defined only for `ediff-directories' and
|
|
|
1168 `ediff-directory-revisions', since its intent is to produce
|
|
|
1169 multifile patches. For `ediff-directory-revisions', we insist that
|
|
|
1170 all marked sessions must be active."
|
|
|
1171 (interactive)
|
|
|
1172 (or (ediff-buffer-live-p ediff-meta-diff-buffer)
|
|
|
1173 (setq ediff-meta-diff-buffer
|
|
|
1174 (get-buffer-create
|
|
|
1175 (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
|
|
|
1176 (ediff-eval-in-buffer ediff-meta-diff-buffer
|
|
|
1177 (erase-buffer))
|
|
|
1178 (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
|
|
|
1179 ;; did something
|
|
|
1180 (display-buffer ediff-meta-diff-buffer 'not-this-window)
|
|
|
1181 (beep)
|
|
|
1182 (message "No marked sessions found")))
|
|
|
1183
|
|
|
1184 (defun ediff-meta-show-patch ()
|
|
|
1185 "Show the multi-file patch associated with this group session."
|
|
|
1186 (interactive)
|
|
|
1187 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1188 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1189 (info (ediff-get-meta-info meta-buf pos 'noerror))
|
|
|
1190 (patchbuffer ediff-meta-patchbufer))
|
|
|
1191 (if (ediff-buffer-live-p patchbuffer)
|
|
|
1192 (ediff-eval-in-buffer patchbuffer
|
|
|
1193 (save-restriction
|
|
|
1194 (if (not info)
|
|
|
1195 (widen)
|
|
|
1196 (narrow-to-region
|
|
|
1197 (ediff-get-session-objB-name info)
|
|
|
1198 (ediff-get-session-objC-name info)))
|
|
|
1199 (set-buffer (get-buffer-create ediff-tmp-buffer))
|
|
|
1200 (erase-buffer)
|
|
|
1201 (insert-buffer patchbuffer)
|
|
|
1202 (display-buffer ediff-tmp-buffer 'not-this-window)
|
|
|
1203 ))
|
|
|
1204 (error "The patch buffer wasn't found"))))
|
|
|
1205
|
|
|
1206
|
|
|
1207 ;; This function executes in meta buffer. It knows where event happened.
|
|
|
1208 (defun ediff-filegroup-action ()
|
|
|
1209 "Execute appropriate action for the selected session."
|
|
|
1210 (interactive)
|
|
|
1211 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1212 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1213 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
|
|
|
1214 (info (ediff-get-meta-info meta-buf pos))
|
|
14
|
1215 merge-autostore-dir
|
|
0
|
1216 session-buf file1 file2 file3 regexp)
|
|
|
1217
|
|
|
1218 (setq session-buf (ediff-get-session-buffer info)
|
|
|
1219 file1 (ediff-get-session-objA-name info)
|
|
|
1220 file2 (ediff-get-session-objB-name info)
|
|
|
1221 file3 (ediff-get-session-objC-name info))
|
|
|
1222
|
|
|
1223 ;; make sure we don't start on hidden sessions
|
|
|
1224 ;; ?H means marked for hiding. ?I means invalid (hidden).
|
|
|
1225 (if (memq (ediff-get-session-status info) '(?I))
|
|
|
1226 (progn
|
|
|
1227 (beep)
|
|
|
1228 (if (y-or-n-p "This session is marked as hidden, unmark? ")
|
|
|
1229 (progn
|
|
|
1230 (ediff-set-session-status info nil)
|
|
|
1231 (ediff-update-meta-buffer meta-buf))
|
|
|
1232 (error "Aborted"))))
|
|
|
1233
|
|
|
1234 (ediff-eval-in-buffer meta-buf
|
|
12
|
1235 (setq merge-autostore-dir
|
|
|
1236 (ediff-get-group-merge-autostore-dir ediff-meta-list))
|
|
0
|
1237 (goto-char pos) ; if the user clicked on session--move point there
|
|
|
1238 ;; First handle sessions involving directories (which are themselves
|
|
|
1239 ;; session groups)
|
|
|
1240 ;; After that handle individual sessions
|
|
|
1241 (cond ((and (file-directory-p file1)
|
|
|
1242 (stringp file2) (file-directory-p file2)
|
|
|
1243 (if (stringp file3) (file-directory-p file1) t))
|
|
|
1244 ;; do ediff/ediff-merge on subdirectories
|
|
|
1245 (if (ediff-buffer-live-p session-buf)
|
|
|
1246 (ediff-show-meta-buffer session-buf)
|
|
|
1247 (setq regexp (read-string "Filter through regular expression: "
|
|
|
1248 nil 'ediff-filtering-regexp-history))
|
|
|
1249 (ediff-directories-internal
|
|
|
1250 file1 file2 file3 regexp
|
|
|
1251 ediff-session-action-function
|
|
|
1252 ediff-metajob-name
|
|
|
1253 ;; make it update car info after startup
|
|
|
1254 (` (list (lambda ()
|
|
|
1255 ;; child session group should know its parent
|
|
|
1256 (setq ediff-parent-meta-buffer
|
|
|
1257 (quote (, ediff-meta-buffer)))
|
|
|
1258 ;; and parent will know its child
|
|
|
1259 (setcar (quote (, info)) ediff-meta-buffer)))))))
|
|
|
1260
|
|
|
1261 ;; Do ediff-revision on a subdirectory
|
|
|
1262 ((and (ediff-one-filegroup-metajob)
|
|
|
1263 (ediff-revision-metajob)
|
|
|
1264 (file-directory-p file1))
|
|
|
1265 (if (ediff-buffer-live-p session-buf)
|
|
|
1266 (ediff-show-meta-buffer session-buf)
|
|
|
1267 (setq regexp (read-string "Filter through regular expression: "
|
|
|
1268 nil 'ediff-filtering-regexp-history))
|
|
|
1269 (ediff-directory-revisions-internal
|
|
|
1270 file1 regexp
|
|
|
1271 ediff-session-action-function ediff-metajob-name
|
|
|
1272 ;; make it update car info after startup
|
|
|
1273 (` (list (lambda ()
|
|
|
1274 ;; child session group should know its parent
|
|
|
1275 (setq ediff-parent-meta-buffer
|
|
|
1276 (quote (, ediff-meta-buffer)))
|
|
|
1277 ;; and parent will know its child
|
|
|
1278 (setcar (quote (, info)) ediff-meta-buffer)))))))
|
|
|
1279
|
|
|
1280 ;; From here on---only individual session handlers
|
|
|
1281
|
|
|
1282 ;; handle an individual session with a live control buffer
|
|
|
1283 ((ediff-buffer-live-p session-buf)
|
|
|
1284 (ediff-eval-in-buffer session-buf
|
|
|
1285 (setq ediff-mouse-pixel-position (mouse-pixel-position))
|
|
|
1286 (ediff-recenter 'no-rehighlight)))
|
|
|
1287
|
|
|
1288 ((ediff-problematic-session-p info)
|
|
|
1289 (beep)
|
|
|
1290 (if (y-or-n-p
|
|
12
|
1291 "This session has no ancestor. Merge without the ancestor? ")
|
|
0
|
1292 (ediff-merge-files
|
|
|
1293 file1 file2
|
|
|
1294 ;; provide startup hooks
|
|
|
1295 (` (list (lambda ()
|
|
|
1296 (setq ediff-meta-buffer (, (current-buffer)))
|
|
12
|
1297 (setq ediff-merge-store-file
|
|
|
1298 (, (concat
|
|
|
1299 merge-autostore-dir
|
|
|
1300 "mrg_"
|
|
|
1301 (file-name-nondirectory file1))))
|
|
|
1302 ;; make ediff-startup pass
|
|
|
1303 ;; ediff-control-buffer back to the meta
|
|
|
1304 ;; level; see below
|
|
0
|
1305 (setcar
|
|
|
1306 (quote (, info)) ediff-control-buffer)))))
|
|
|
1307 (error "Aborted")))
|
|
|
1308 ((ediff-one-filegroup-metajob) ; needs 1 file arg
|
|
|
1309 (funcall ediff-session-action-function
|
|
|
1310 file1
|
|
|
1311 ;; provide startup hooks
|
|
|
1312 (` (list (lambda ()
|
|
|
1313 (setq ediff-meta-buffer (, (current-buffer)))
|
|
12
|
1314 (setq ediff-merge-store-file
|
|
|
1315 (, (concat
|
|
|
1316 merge-autostore-dir
|
|
|
1317 "mrg_"
|
|
|
1318 (file-name-nondirectory file1))))
|
|
|
1319 ;; make ediff-startup pass
|
|
|
1320 ;; ediff-control-buffer back to the meta
|
|
|
1321 ;; level; see below
|
|
0
|
1322 (setcar
|
|
|
1323 (quote (, info)) ediff-control-buffer))))))
|
|
|
1324 ((not (ediff-metajob3)) ; need 2 file args
|
|
|
1325 (funcall ediff-session-action-function
|
|
|
1326 file1 file2
|
|
|
1327 ;; provide startup hooks
|
|
|
1328 (` (list (lambda ()
|
|
|
1329 (setq ediff-meta-buffer (, (current-buffer)))
|
|
12
|
1330 (setq ediff-merge-store-file
|
|
|
1331 (, (concat
|
|
|
1332 merge-autostore-dir
|
|
|
1333 "mrg_"
|
|
|
1334 (file-name-nondirectory file1))))
|
|
|
1335 ;; make ediff-startup pass
|
|
0
|
1336 ;; ediff-control-buffer back to the meta
|
|
12
|
1337 ;; level; see below
|
|
0
|
1338 (setcar
|
|
|
1339 (quote (, info)) ediff-control-buffer))))))
|
|
|
1340 ((ediff-metajob3) ; need 3 file args
|
|
|
1341 (funcall ediff-session-action-function
|
|
|
1342 file1 file2 file3
|
|
|
1343 ;; arrange startup hooks
|
|
|
1344 (` (list (lambda ()
|
|
12
|
1345 (setq ediff-merge-store-file
|
|
|
1346 (, (concat
|
|
|
1347 merge-autostore-dir
|
|
|
1348 "mrg_"
|
|
|
1349 (file-name-nondirectory file1))))
|
|
0
|
1350 (setq ediff-meta-buffer (, (current-buffer)))
|
|
12
|
1351 ;; this arranges that ediff-startup will pass
|
|
|
1352 ;; the value of ediff-control-buffer back to
|
|
|
1353 ;; the meta level, to the record in the meta
|
|
|
1354 ;; list containing the information about the
|
|
|
1355 ;; session associated with that
|
|
|
1356 ;; ediff-control-buffer
|
|
0
|
1357 (setcar
|
|
|
1358 (quote (, info)) ediff-control-buffer))))))
|
|
|
1359 ) ; cond
|
|
|
1360 ) ; eval in meta-buf
|
|
|
1361 ))
|
|
|
1362
|
|
|
1363 (defun ediff-registry-action ()
|
|
|
1364 "Switch to a selected session."
|
|
|
1365 (interactive)
|
|
|
1366 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1367 (buf (ediff-event-buffer last-command-event))
|
|
|
1368 (ctl-buf (ediff-get-meta-info buf pos)))
|
|
|
1369
|
|
|
1370 (if (ediff-buffer-live-p ctl-buf)
|
|
|
1371 ;; check if this is ediff-control-buffer or ediff-meta-buffer
|
|
|
1372 (if (ediff-eval-in-buffer ctl-buf
|
|
|
1373 (eq (key-binding "q") 'ediff-quit-meta-buffer))
|
|
|
1374 ;; it's a meta-buffer -- last action should just display it
|
|
|
1375 (ediff-show-meta-buffer ctl-buf)
|
|
|
1376 ;; it's a session buffer -- invoke go back to session
|
|
|
1377 (ediff-eval-in-buffer ctl-buf
|
|
|
1378 (setq ediff-mouse-pixel-position (mouse-pixel-position))
|
|
|
1379 (ediff-recenter 'no-rehighlight)))
|
|
|
1380 (beep)
|
|
|
1381 (message "You've selected a stale session --- try again")
|
|
|
1382 (ediff-update-registry))
|
|
|
1383 (ediff-eval-in-buffer buf
|
|
|
1384 (goto-char pos))
|
|
|
1385 ))
|
|
|
1386
|
|
|
1387
|
|
|
1388 (defun ediff-show-meta-buffer (&optional meta-buf)
|
|
|
1389 "Show the session group buffer."
|
|
|
1390 (interactive)
|
|
|
1391 (let (wind frame silent)
|
|
|
1392 (if meta-buf (setq silent t))
|
|
|
1393
|
|
|
1394 (setq meta-buf (or meta-buf ediff-meta-buffer))
|
|
|
1395 (cond ((not (bufferp meta-buf))
|
|
|
1396 (error "This Ediff session is not part of a session group"))
|
|
|
1397 ((not (ediff-buffer-live-p meta-buf))
|
|
|
1398 (error
|
|
|
1399 "Can't find this session's group panel -- session itself is ok")))
|
|
|
1400
|
|
|
1401 (ediff-cleanup-meta-buffer meta-buf)
|
|
|
1402 (ediff-eval-in-buffer meta-buf
|
|
|
1403 (save-excursion
|
|
|
1404 (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
|
|
|
1405 (or silent
|
|
|
1406 (message
|
|
|
1407 "Already showing the group panel for this session"))
|
|
|
1408 (set-window-buffer wind meta-buf)
|
|
|
1409 (select-window wind))
|
|
|
1410 ((window-live-p (setq wind ediff-window-C)) ;in merge--merge buf
|
|
|
1411 (set-window-buffer ediff-window-C meta-buf)
|
|
|
1412 (select-window wind))
|
|
|
1413 ((window-live-p (setq wind ediff-window-A))
|
|
|
1414 (set-window-buffer ediff-window-A meta-buf)
|
|
|
1415 (select-window wind))
|
|
|
1416 ((window-live-p (setq wind ediff-window-B))
|
|
|
1417 (set-window-buffer ediff-window-B meta-buf)
|
|
|
1418 (select-window wind))
|
|
|
1419 ((and
|
|
|
1420 (setq wind
|
|
|
1421 (ediff-get-visible-buffer-window ediff-registry-buffer))
|
|
|
1422 (ediff-window-display-p))
|
|
|
1423 (select-window wind)
|
|
|
1424 (other-window 1)
|
|
|
1425 (set-window-buffer (selected-window) meta-buf))
|
|
|
1426 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
|
|
|
1427 (set-window-buffer (selected-window) meta-buf)))
|
|
|
1428 ))
|
|
|
1429 (if (and (ediff-window-display-p)
|
|
|
1430 (window-live-p
|
|
|
1431 (setq wind (ediff-get-visible-buffer-window meta-buf))))
|
|
|
1432 (progn
|
|
|
1433 (setq frame (window-frame wind))
|
|
|
1434 (raise-frame frame)
|
|
|
1435 (ediff-reset-mouse frame)))
|
|
|
1436 (run-hooks 'ediff-show-session-group-hook)
|
|
|
1437 ))
|
|
|
1438
|
|
|
1439 (defun ediff-show-meta-buff-from-registry ()
|
|
|
1440 "Display the session group buffer for a selected session group."
|
|
|
1441 (interactive)
|
|
|
1442 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1443 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1444 (info (ediff-get-meta-info meta-buf pos))
|
|
|
1445 (meta-or-session-buf info))
|
|
|
1446 (ediff-eval-in-buffer meta-or-session-buf
|
|
|
1447 (ediff-show-meta-buffer))))
|
|
|
1448
|
|
|
1449 ;;;###autoload
|
|
|
1450 (defun ediff-show-registry ()
|
|
|
1451 "Display Ediff's registry."
|
|
|
1452 (interactive)
|
|
|
1453 (ediff-update-registry)
|
|
|
1454 (if (not (ediff-buffer-live-p ediff-registry-buffer))
|
|
|
1455 (error "No active Ediff sessions or corrupted session registry"))
|
|
|
1456 (let (wind frame)
|
|
|
1457 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
|
|
|
1458 ;; explicitly
|
|
|
1459 (ediff-eval-in-buffer ediff-registry-buffer
|
|
|
1460 (save-excursion
|
|
|
1461 (cond ((setq wind
|
|
|
1462 (ediff-get-visible-buffer-window ediff-registry-buffer))
|
|
|
1463 (message "Already showing the registry")
|
|
|
1464 (set-window-buffer wind ediff-registry-buffer)
|
|
|
1465 (select-window wind))
|
|
|
1466 ((window-live-p ediff-window-C)
|
|
|
1467 (set-window-buffer ediff-window-C ediff-registry-buffer)
|
|
|
1468 (select-window ediff-window-C))
|
|
|
1469 ((window-live-p ediff-window-A)
|
|
|
1470 (set-window-buffer ediff-window-A ediff-registry-buffer)
|
|
|
1471 (select-window ediff-window-A))
|
|
|
1472 ((window-live-p ediff-window-B)
|
|
|
1473 (set-window-buffer ediff-window-B ediff-registry-buffer)
|
|
|
1474 (select-window ediff-window-B))
|
|
|
1475 ((and (setq wind
|
|
|
1476 (ediff-get-visible-buffer-window ediff-meta-buffer))
|
|
|
1477 (ediff-window-display-p))
|
|
|
1478 (select-window wind)
|
|
|
1479 (other-window 1)
|
|
|
1480 (set-window-buffer (selected-window) ediff-registry-buffer))
|
|
|
1481 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
|
|
|
1482 (set-window-buffer (selected-window) ediff-registry-buffer)))
|
|
|
1483 ))
|
|
|
1484 (if (ediff-window-display-p)
|
|
|
1485 (progn
|
|
|
1486 (setq frame
|
|
|
1487 (window-frame
|
|
|
1488 (ediff-get-visible-buffer-window ediff-registry-buffer)))
|
|
|
1489 (raise-frame frame)
|
|
|
1490 (ediff-reset-mouse frame)))
|
|
|
1491 (run-hooks 'ediff-show-registry-hook)
|
|
|
1492 ))
|
|
|
1493
|
|
|
1494 ;;;###autoload
|
|
|
1495 (defalias 'eregistry 'ediff-show-registry)
|
|
|
1496
|
|
|
1497 ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
|
|
|
1498 ;; parent meta-buf
|
|
|
1499 ;; Check if META-BUF exists before calling this function
|
|
|
1500 (defun ediff-update-meta-buffer (meta-buf)
|
|
|
1501 (ediff-eval-in-buffer (current-buffer)
|
|
|
1502 (if (ediff-buffer-live-p meta-buf)
|
|
|
1503 (ediff-eval-in-buffer meta-buf
|
|
|
1504 (funcall ediff-meta-redraw-function ediff-meta-list))
|
|
|
1505 )))
|
|
|
1506
|
|
|
1507 (defun ediff-update-registry ()
|
|
|
1508 (ediff-eval-in-buffer (current-buffer)
|
|
|
1509 (if (ediff-buffer-live-p ediff-registry-buffer)
|
|
|
1510 (ediff-redraw-registry-buffer)
|
|
|
1511 (ediff-prepare-meta-buffer
|
|
|
1512 'ediff-registry-action
|
|
|
1513 ediff-session-registry
|
|
|
1514 "*Ediff Registry"
|
|
|
1515 'ediff-redraw-registry-buffer
|
|
|
1516 'ediff-registry))
|
|
|
1517 ))
|
|
|
1518
|
|
12
|
1519 ;; If meta-buf exists, it is redrawn along with parent.
|
|
|
1520 ;; Otherwise, nothing happens.
|
|
0
|
1521 (defun ediff-cleanup-meta-buffer (meta-buffer)
|
|
|
1522 (if (ediff-buffer-live-p meta-buffer)
|
|
|
1523 (ediff-eval-in-buffer meta-buffer
|
|
|
1524 (ediff-update-meta-buffer meta-buffer)
|
|
|
1525 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
|
|
|
1526 (ediff-update-meta-buffer ediff-parent-meta-buffer)))))
|
|
|
1527
|
|
|
1528 ;; t if no session in progress
|
|
|
1529 (defun ediff-safe-to-quit (meta-buffer)
|
|
|
1530 (if (ediff-buffer-live-p meta-buffer)
|
|
|
1531 (let ((lis ediff-meta-list)
|
|
|
1532 (cont t)
|
|
|
1533 buffer-read-only)
|
|
|
1534 (ediff-update-meta-buffer meta-buffer)
|
|
|
1535 (ediff-eval-in-buffer meta-buffer
|
|
|
1536 (setq lis (cdr lis)) ; discard the description part of meta-list
|
|
|
1537 (while (and cont lis)
|
|
|
1538 (if (ediff-buffer-live-p
|
|
|
1539 (ediff-get-group-buffer lis)) ; in progress
|
|
|
1540 (setq cont nil))
|
|
|
1541 (setq lis (cdr lis)))
|
|
|
1542 cont))))
|
|
|
1543
|
|
|
1544 (defun ediff-quit-meta-buffer ()
|
|
12
|
1545 "If the group has no active session, delete the meta buffer.
|
|
0
|
1546 If no session is in progress, ask to confirm before deleting meta buffer.
|
|
|
1547 Otherwise, bury the meta buffer.
|
|
|
1548 If this is a session registry buffer then just bury it."
|
|
|
1549 (interactive)
|
|
|
1550 (let* ((buf (current-buffer))
|
|
|
1551 (dir-diffs-buffer ediff-dir-diffs-buffer)
|
|
|
1552 (meta-diff-buffer ediff-meta-diff-buffer)
|
|
|
1553 (parent-buf ediff-parent-meta-buffer)
|
|
|
1554 (dont-show-registry (eq buf ediff-registry-buffer)))
|
|
|
1555 (if dont-show-registry
|
|
|
1556 (bury-buffer)
|
|
|
1557 (ediff-cleanup-meta-buffer buf)
|
|
|
1558 (cond ((and (ediff-safe-to-quit buf)
|
|
|
1559 (y-or-n-p "Quit this session group? "))
|
|
12
|
1560 (run-hooks 'ediff-quit-session-group-hook)
|
|
0
|
1561 (message "")
|
|
|
1562 (ediff-dispose-of-meta-buffer buf))
|
|
|
1563 ((ediff-safe-to-quit buf)
|
|
|
1564 (bury-buffer))
|
|
|
1565 (t
|
|
|
1566 (error
|
|
|
1567 "This session group has active sessions---cannot exit")))
|
|
|
1568 (ediff-cleanup-meta-buffer parent-buf)
|
|
|
1569 (ediff-kill-buffer-carefully dir-diffs-buffer)
|
|
|
1570 (ediff-kill-buffer-carefully meta-diff-buffer)
|
|
|
1571 (if (ediff-buffer-live-p parent-buf)
|
|
|
1572 (progn
|
|
|
1573 (setq dont-show-registry t)
|
|
|
1574 (ediff-show-meta-buffer parent-buf)))
|
|
|
1575 )
|
|
|
1576 (or dont-show-registry
|
|
|
1577 (ediff-show-registry))))
|
|
|
1578
|
|
|
1579 (defun ediff-dispose-of-meta-buffer (buf)
|
|
|
1580 (setq ediff-session-registry (delq buf ediff-session-registry))
|
|
|
1581 (ediff-eval-in-buffer buf
|
|
|
1582 (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
|
|
|
1583 (kill-buffer ediff-dir-diffs-buffer)))
|
|
|
1584 (kill-buffer buf))
|
|
|
1585
|
|
|
1586
|
|
|
1587 ;; Obtain information on a meta record where the user clicked or typed
|
|
|
1588 ;; BUF is the buffer where this happened and POINT is the position
|
|
|
1589 ;; If optional NOERROR arg is given, don't report error and return nil if no
|
|
|
1590 ;; meta info is found on line.
|
|
|
1591 (defun ediff-get-meta-info (buf point &optional noerror)
|
|
|
1592 (let (result olist tmp)
|
|
|
1593 (if (and point (ediff-buffer-live-p buf))
|
|
|
1594 (ediff-eval-in-buffer buf
|
|
|
1595 (if ediff-xemacs-p
|
|
|
1596 (setq result
|
|
|
1597 (if (setq tmp (extent-at point buf 'ediff-meta-info))
|
|
|
1598 (ediff-overlay-get tmp 'ediff-meta-info)))
|
|
|
1599 (setq olist (overlays-at point))
|
|
|
1600 (setq olist
|
|
|
1601 (mapcar (function (lambda (elt)
|
|
|
1602 (overlay-get elt 'ediff-meta-info)))
|
|
|
1603 olist))
|
|
|
1604 (while (and olist (null (car olist))
|
|
|
1605 (overlay-get (car olist) 'invisible))
|
|
|
1606 (setq olist (cdr olist)))
|
|
|
1607 (setq result (car olist)))))
|
|
|
1608 (if result
|
|
|
1609 result
|
|
|
1610 (if noerror
|
|
|
1611 nil
|
|
|
1612 (ediff-update-registry)
|
|
|
1613 (error "No session info in this line")))))
|
|
|
1614
|
|
|
1615 ;; return location of the next meta overlay after point
|
|
|
1616 (defun ediff-next-meta-overlay-start (point)
|
|
|
1617 (if (eobp)
|
|
|
1618 (goto-char (point-min))
|
|
|
1619 (let (overl)
|
|
|
1620 (if ediff-xemacs-p
|
|
|
1621 (progn
|
|
|
1622 (setq overl (extent-at point (current-buffer) 'ediff-meta-info))
|
|
|
1623 (if overl
|
|
|
1624 (setq overl (next-extent overl))
|
|
|
1625 (setq overl (next-extent (current-buffer))))
|
|
|
1626 (if overl
|
|
|
1627 (extent-start-position overl)
|
|
|
1628 (point-max)))
|
|
|
1629 (setq overl (car (overlays-at point)))
|
|
|
1630 (if (and overl (overlay-get overl 'ediff-meta-info))
|
|
|
1631 ;; note: end of current overlay is the beginning of the next one
|
|
|
1632 (overlay-end overl)
|
|
|
1633 (next-overlay-change point))))
|
|
|
1634 ))
|
|
|
1635
|
|
|
1636 (defun ediff-previous-meta-overlay-start (point)
|
|
|
1637 (if (bobp)
|
|
|
1638 (goto-char (point-max))
|
|
|
1639 (let (overl)
|
|
|
1640 (if ediff-xemacs-p
|
|
|
1641 (progn
|
|
|
1642 (setq overl (extent-at point (current-buffer) 'ediff-meta-info))
|
|
|
1643 (if overl
|
|
|
1644 (setq overl (previous-extent overl))
|
|
|
1645 (setq overl (previous-extent (current-buffer))))
|
|
|
1646 (if overl
|
|
|
1647 (extent-start-position overl)
|
|
|
1648 (point-min)))
|
|
|
1649 (setq overl (car (overlays-at point)))
|
|
|
1650 (if (and overl (overlay-get overl 'ediff-meta-info))
|
|
|
1651 (setq point (overlay-start overl)))
|
|
|
1652 ;; to get to the beginning of prev overlay
|
|
|
1653 (if (not (bobp))
|
|
|
1654 ;; trickery to overcome an emacs bug--doesn't always find previous
|
|
|
1655 ;; overlay change correctly
|
|
|
1656 (setq point (1- point)))
|
|
|
1657 (setq point (previous-overlay-change point))
|
|
|
1658 ;; If we are not over an overlay after subtracting 1, it means we are
|
|
|
1659 ;; in the description area preceding session records. In this case,
|
|
|
1660 ;; goto the top of the registry buffer.
|
|
|
1661 (or (car (overlays-at point))
|
|
|
1662 (setq point (point-min)))
|
|
|
1663 point
|
|
|
1664 ))))
|
|
|
1665
|
|
|
1666 ;; this is the action invoked when the user selects a patch from the meta
|
|
|
1667 ;; buffer.
|
|
|
1668 (defun ediff-patch-file-form-meta (file &optional startup-hooks)
|
|
|
1669 (let* ((pos (ediff-event-point last-command-event))
|
|
|
1670 (meta-buf (ediff-event-buffer last-command-event))
|
|
|
1671 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
|
|
|
1672 (info (ediff-get-meta-info meta-buf pos))
|
|
|
1673 (meta-patchbuf ediff-meta-patchbufer)
|
|
|
1674 session-buf beg-marker end-marker)
|
|
|
1675
|
|
|
1676 (if (or (file-directory-p file) (string-match "/dev/null" file))
|
|
|
1677 (error "`%s' is not an ordinary file" (file-name-as-directory file)))
|
|
|
1678 (setq session-buf (ediff-get-session-buffer info)
|
|
|
1679 beg-marker (ediff-get-session-objB-name info)
|
|
|
1680 end-marker (ediff-get-session-objC-name info))
|
|
|
1681
|
|
|
1682 (or (ediff-buffer-live-p session-buf) ; either an active patch session
|
|
|
1683 (null session-buf) ; or it is a virgin session
|
|
|
1684 (error
|
|
|
1685 "Patch has been already applied to this file--cannot be repeated!"))
|
|
|
1686
|
|
|
1687 (ediff-eval-in-buffer meta-patchbuf
|
|
|
1688 (save-restriction
|
|
|
1689 (widen)
|
|
|
1690 (narrow-to-region beg-marker end-marker)
|
|
|
1691 (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
|
|
|
1692
|
|
|
1693
|
|
|
1694 (defun ediff-meta-mark-equal-files ()
|
|
|
1695 "Run though the session list and mark identical files.
|
|
|
1696 This is used only for sessions that involve 2 or 3 files at the same time."
|
|
|
1697 (interactive)
|
|
|
1698 (let ((list (cdr ediff-meta-list))
|
|
|
1699 fileinfo1 fileinfo2 fileinfo3 elt)
|
|
|
1700 (while (setq elt (car list))
|
|
|
1701 (setq fileinfo1 (ediff-get-session-objA elt)
|
|
|
1702 fileinfo2 (ediff-get-session-objB elt)
|
|
|
1703 fileinfo3 (ediff-get-session-objC elt))
|
|
|
1704 (ediff-set-file-eqstatus fileinfo1 nil)
|
|
|
1705 (ediff-set-file-eqstatus fileinfo2 nil)
|
|
|
1706 (ediff-set-file-eqstatus fileinfo3 nil)
|
|
|
1707
|
|
|
1708 (ediff-mark-if-equal fileinfo1 fileinfo2)
|
|
|
1709 (if (ediff-metajob3)
|
|
|
1710 (progn
|
|
|
1711 (ediff-mark-if-equal fileinfo1 fileinfo3)
|
|
|
1712 (ediff-mark-if-equal fileinfo2 fileinfo3)))
|
|
|
1713 (setq list (cdr list))))
|
|
|
1714 (ediff-update-meta-buffer (current-buffer)))
|
|
|
1715
|
|
|
1716 ;; mark files 1 and 2 as equal, if they are.
|
|
|
1717 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
|
|
|
1718 (get-buffer-create ediff-tmp-buffer)
|
|
|
1719 (or (file-directory-p (car fileinfo1))
|
|
|
1720 (file-directory-p (car fileinfo2))
|
|
|
1721 (if (= (ediff-make-diff2-buffer
|
|
|
1722 ediff-tmp-buffer (car fileinfo1) (car fileinfo2))
|
|
|
1723 0)
|
|
|
1724 (progn
|
|
|
1725 (ediff-set-file-eqstatus fileinfo1 t)
|
|
|
1726 (ediff-set-file-eqstatus fileinfo2 t)))))
|
|
|
1727
|
|
|
1728
|
|
|
1729
|
|
|
1730 ;;; Local Variables:
|
|
|
1731 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
|
|
|
1732 ;;; eval: (put 'ediff-eval-in-buffer 'lisp-indent-hook 1)
|
|
12
|
1733 ;;; eval: (put 'ediff-eval-in-buffer 'edebug-form-spec '(form body))
|
|
0
|
1734 ;;; End:
|
|
|
1735
|
|
|
1736 ;;; ediff-mult.el ends here
|
