1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
3 ;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; This file is part of GNU Emacs.
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)
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.
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.
26 ;; Users are encouraged to add functionality to this file.
27 ;; The present file contains all the infrastructure needed for that.
29 ;; Generally, to implement a new multisession capability within Ediff,
30 ;; you need to tell it
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-header (nil nil (obj1 nil) (obj2 nil) (obj3 nil))
45 ;; The function ediff-make-new-meta-list-element can be used to create
46 ;; 2nd and subsequent elements of that list.
47 ;; Actually, the format of this list is pretty much up to the
48 ;; developer. The only thing is that it must be a list of lists,
49 ;; and the first list must describe the meta session, and subsequent
50 ;; elements must describe individual sessions.
51 ;; This descriptor-header must be a list of SIX elements (nil or
52 ;; string). The function ediff-redraw-registry-buffer displays the
53 ;; 1st - 4th of these in the registry buffer.
54 ;; Also, keep in mind that the function ediff-prepare-meta-buffer
55 ;; (which see) prepends the session group buffer to the descriptor, so
56 ;; the descriptor becomes 7-long.
57 ;; Ediff expects that your function (in 2 above) will arrange to
58 ;; replace this prepended nil (via setcar) with the actual ediff
59 ;; control buffer associated with an appropriate Ediff session.
60 ;; This is arranged through internal startup hooks that can be passed
61 ;; to any of Ediff major entries (such as ediff-files, epatch, etc.).
62 ;; See how this is done in ediff-filegroup-action.
64 ;; Session descriptions are of the form (obj1 obj2 obj3), which
65 ;; describe objects relevant to the session. Usually they are names of
66 ;; files, but sometimes they may be other things. For instance, obj3
67 ;; is nil for jobs that involve only two files. For patch jobs, obj2
68 ;; and obj3 are markers that specify the patch corresponding to the
69 ;; file (whose name is obj1).
70 ;; 4. Write a function that makes a call to ediff-prepare-meta-buffer
71 ;; passing all this info.
72 ;; You may be able to use ediff-directories-internal as a template.
73 ;; 5. If you intend to add several related pieces of functionality,
74 ;; you may want to keep the function in 4 as an internal version
75 ;; and then write several top-level interactive functions that call it
76 ;; with different parameters.
77 ;; See how ediff-directories, ediff-merge-directories, and
78 ;; ediff-merge-directories-with-ancestor all use
79 ;; ediff-directories-internal.
81 ;; A useful addition here could be session groups selected by patterns
82 ;; (which are different in each directory). For instance, one may want to
83 ;; compare files of the form abc{something}.c to files old{something}.d
84 ;; which may be in the same or different directories. Or, one may want to
85 ;; compare all files of the form {something} to files of the form {something}~.
87 ;; Implementing this requires writing an collating function, which should pair
88 ;; up appropriate files. It will also require a generalization of the
89 ;; functions that do the layout of the meta- and differences buffers and of
90 ;; ediff-filegroup-action.
96 (defgroup ediff-mult nil
97 "Multi-file and multi-buffer processing in Ediff"
104 (let ((load-path (cons (expand-file-name ".") load-path
)))
105 (or (featurep 'ediff-init
)
106 (load "ediff-init.el" nil nil
'nosuffix
))
107 (or (featurep 'ediff-util
)
108 (load "ediff-util.el" nil nil
'nosuffix
))
112 (require 'ediff-init
)
113 (require 'ediff-util
)
116 (ediff-defvar-local ediff-meta-buffer nil
"")
117 (ediff-defvar-local ediff-parent-meta-buffer nil
"")
118 ;; the registry buffer
119 (defvar ediff-registry-buffer nil
)
121 (defconst ediff-meta-buffer-message
"This is an Ediff Session Group Panel: %s
124 button2, v, or RET over session record: start that Ediff session
125 M:\tin sessions invoked from here, brings back this group panel
126 R:\tdisplay the registry of active Ediff sessions
127 h:\tmark session for hiding (toggle)
128 x:\thide marked sessions; with prefix arg: unhide
129 m:\tmark session for a non-hiding operation (toggle)
130 uh/um:\tunmark all sessions marked for hiding/operation
132 p,DEL:\tprevious session
133 E:\tbrowse Ediff on-line manual
134 T:\ttoggle truncation of long file names
135 q:\tquit this session group
138 (ediff-defvar-local ediff-meta-buffer-map nil
139 "The keymap for the meta buffer.")
140 (defvar ediff-dir-diffs-buffer-map
(make-sparse-keymap)
141 "The keymap to be installed in the buffer showing differences between
144 ;; Variable specifying the action to take when the use invokes ediff in the
145 ;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action
146 (ediff-defvar-local ediff-meta-action-function nil
"")
147 ;; Tells ediff-update-meta-buffer how to redraw it
148 (ediff-defvar-local ediff-meta-redraw-function nil
"")
149 ;; Tells ediff-filegroup-action and similar procedures how to invoke Ediff for
150 ;; the sessions in a given session group
151 (ediff-defvar-local ediff-session-action-function nil
"")
153 (ediff-defvar-local ediff-metajob-name nil
"")
155 ;; buffer used to collect custom diffs from individual sessions in the group
156 (ediff-defvar-local ediff-meta-diff-buffer nil
"")
158 ;; history var to use for filtering groups
159 (defvar ediff-filtering-regexp-history nil
"")
161 ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
162 ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
163 ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
164 ;; . eq-status)) ...)
165 ;; If ctl-buf is nil, the file-pair hasn't processed yet. If it is
166 ;; killed-buffer object, the file pair has been processed. If it is a live
167 ;; buffer, this means ediff is still working on the pair.
168 ;; Eq-status of a file is t if the file equals some other file in the same
170 (ediff-defvar-local ediff-meta-list nil
"")
172 (ediff-defvar-local ediff-meta-session-number nil
"")
175 ;; the difference list between directories in a directory session group
176 (ediff-defvar-local ediff-dir-difference-list nil
"")
177 (ediff-defvar-local ediff-dir-diffs-buffer nil
"")
179 ;; The registry of Ediff sessions. A list of control buffers.
180 (defvar ediff-session-registry nil
)
182 (defcustom ediff-meta-truncate-filenames t
183 "*If non-nil, truncate long file names in the session group buffers.
184 This can be toggled with `ediff-toggle-filename-truncation'."
187 (defcustom ediff-registry-setup-hook nil
188 "*Hooks run just after the registry control panel is set up."
192 (defcustom ediff-before-session-group-setup-hooks nil
193 "*Hooks to run before Ediff arranges the window for group-level operations.
194 It is used by commands such as ediff-directories.
195 This hook can be used to save the previous window config, which can be restored
196 on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook."
199 (defcustom ediff-after-session-group-setup-hook nil
200 "*Hooks run just after a meta-buffer controlling a session group, such as
201 ediff-directories, is run."
204 (defcustom ediff-quit-session-group-hook nil
205 "*Hooks run just before exiting a session group."
208 (defcustom ediff-show-registry-hook nil
209 "*Hooks run just after the registry buffer is shown."
212 (defcustom ediff-show-session-group-hook
'(delete-other-windows)
213 "*Hooks run just after a session group buffer is shown."
216 (defcustom ediff-meta-buffer-keymap-setup-hook nil
217 "*Hooks run just after setting up the ediff-meta-buffer-map.
218 This keymap controls key bindings in the meta buffer and is a local variable.
219 This means that you can set different bindings for different kinds of meta
224 ;; Buffer holding the multi-file patch. Local to the meta buffer
225 (ediff-defvar-local ediff-meta-patchbufer nil
"")
227 ;;; API for ediff-meta-list
229 ;; A meta-list is either ediff-meta-list, which contains a header and the list
230 ;; of ediff sessions or ediff-dir-difference-list, which is a header followed
231 ;; by the list of differences among the directories (i.e., files that are not
232 ;; in all directories). The header is the same in all meta lists, but the rest
234 ;; Structure of the meta-list:
235 ;; (HEADER SESSION1 SESSION2 ...)
236 ;; HEADER: (GROUP-BUF REGEXP OBJA OBJB OBJC SAVE-DIR COMPARISON-FUNC)
237 ;; OBJA - first directory
238 ;; OBJB - second directory
239 ;; OBJC - third directory
240 ;; SESSION1/2/... are described below
241 ;; group buffer/regexp
242 (defsubst ediff-get-group-buffer
(meta-list)
243 (nth 0 (car meta-list
)))
245 (defsubst ediff-get-group-regexp
(meta-list)
246 (nth 1 (car meta-list
)))
248 (defsubst ediff-get-group-objA
(meta-list)
249 (nth 2 (car meta-list
)))
250 (defsubst ediff-get-group-objB
(meta-list)
251 (nth 3 (car meta-list
)))
252 (defsubst ediff-get-group-objC
(meta-list)
253 (nth 4 (car meta-list
)))
254 (defsubst ediff-get-group-merge-autostore-dir
(meta-list)
255 (nth 5 (car meta-list
)))
256 (defsubst ediff-get-group-comparison-func
(meta-list)
257 (nth 6 (car meta-list
)))
259 ;; ELT is a session meta descriptor (what is being preserved as
261 ;; The structure is: (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
262 ;; STATUS is ?I (hidden or invalid), ?* (marked for operation), ?H (hidden)
264 ;; OBJA/B/C is (FILENAME EQSTATUS)
265 ;; EQSTATUS is ?= or nil (?= means that this file is equal to some other
266 ;; file in this session)
268 (defsubst ediff-get-session-buffer
(elt)
270 (defsubst ediff-get-session-status
(elt)
272 (defsubst ediff-set-session-status
(session-info new-status
)
273 (setcar (cdr session-info
) new-status
))
275 (defsubst ediff-get-session-objA
(elt)
277 (defsubst ediff-get-session-objB
(elt)
279 (defsubst ediff-get-session-objC
(elt)
281 (defsubst ediff-get-session-objA-name
(elt)
283 (defsubst ediff-get-session-objB-name
(elt)
285 (defsubst ediff-get-session-objC-name
(elt)
287 ;; equality indicators
288 (defsubst ediff-get-file-eqstatus
(elt)
290 (defsubst ediff-set-file-eqstatus
(elt value
)
291 (setcar (cdr elt
) value
))
293 ;; Create a new element for the meta list out of obj1/2/3, which usually are
296 ;; The first nil in such an is later replaced with the session buffer. The
297 ;; second nil is reserved for session status.
299 ;; Also, session objects A/B/C are turned into lists of the form (obj nil).
300 ;; This nill is a placeholder for eq-indicator. It is either nil or =.
301 ;; If it is discovered that this file is = to some other
302 ;; file in the same session, eq-indicator is changed to `='.
303 ;; Curently, the eq-indicator is used only for 2 and 3-file jobs.
304 (defun ediff-make-new-meta-list-element (obj1 obj2 obj3
)
305 (list nil nil
(list obj1 nil
) (list obj2 nil
) (list obj3 nil
)))
307 ;; The activity marker is either or + (active session, i.e., ediff is currently
308 ;; run in it), or - (finished session, i.e., we've ran ediff in it and then
309 ;; exited). Return nil, if session is neither active nor finished
310 (defun ediff-get-session-activity-marker (session)
311 (let ((session-buf (ediff-get-session-buffer session
)))
312 (cond ((null session-buf
) nil
) ; virgin session
313 ((ediff-buffer-live-p session-buf
) ?
+) ;active session
316 ;; checks if the session is a meta session
317 (defun ediff-meta-session-p (session-info)
318 (and (stringp (ediff-get-session-objA-name session-info
))
319 (file-directory-p (ediff-get-session-objA-name session-info
))
320 (stringp (ediff-get-session-objB-name session-info
))
321 (file-directory-p (ediff-get-session-objB-name session-info
))
322 (if (stringp (ediff-get-session-objC-name session-info
))
323 (file-directory-p (ediff-get-session-objC-name session-info
)) t
)))
325 ;; set up the keymap in the meta buffer
326 (defun ediff-setup-meta-map()
327 (setq ediff-meta-buffer-map
(make-sparse-keymap))
328 (suppress-keymap ediff-meta-buffer-map
)
329 (define-key ediff-meta-buffer-map
"q" 'ediff-quit-meta-buffer
)
330 (define-key ediff-meta-buffer-map
"T" 'ediff-toggle-filename-truncation
)
331 (define-key ediff-meta-buffer-map
"R" 'ediff-show-registry
)
332 (define-key ediff-meta-buffer-map
"E" 'ediff-documentation
)
333 (define-key ediff-meta-buffer-map
"v" ediff-meta-action-function
)
334 (define-key ediff-meta-buffer-map
"\C-m" ediff-meta-action-function
)
335 (define-key ediff-meta-buffer-map
" " 'ediff-next-meta-item
)
336 (define-key ediff-meta-buffer-map
"n" 'ediff-next-meta-item
)
337 (define-key ediff-meta-buffer-map
"\C-?" 'ediff-previous-meta-item
)
338 (define-key ediff-meta-buffer-map
"p" 'ediff-previous-meta-item
)
339 (define-key ediff-meta-buffer-map
[delete] 'ediff-previous-meta-item)
340 (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item)
341 (or (ediff-one-filegroup-metajob)
343 (define-key ediff-meta-buffer-map "=" nil)
344 (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
345 (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
346 (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
347 (if ediff-no-emacs-help-in-control-buffer
348 (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item))
350 (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function)
351 (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function))
353 (use-local-map ediff-meta-buffer-map)
354 ;; modify ediff-meta-buffer-map here
355 (run-hooks 'ediff-meta-buffer-keymap-setup-hook))
358 (defun ediff-meta-mode ()
359 "This mode controls all operations on Ediff session groups.
360 It is entered through one of the following commands:
365 `ediff-merge-directories'
367 `ediff-merge-directories-with-ancestor'
368 `edirs-merge-with-ancestor'
369 `ediff-directory-revisions'
371 `ediff-merge-directory-revisions'
372 `edir-merge-revisions'
373 `ediff-merge-directory-revisions-with-ancestor'
374 `edir-merge-revisions-with-ancestor'
377 \\{ediff-meta-buffer-map}"
378 (kill-all-local-variables)
379 (setq major-mode 'ediff-meta-mode)
380 (setq mode-name "MetaEdiff"))
383 ;; the keymap for the buffer showing directory differences
384 (suppress-keymap ediff-dir-diffs-buffer-map)
385 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
386 (define-key ediff-dir-diffs-buffer-map " " 'next-line)
387 (define-key ediff-dir-diffs-buffer-map "n" 'next-line)
388 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)
389 (define-key ediff-dir-diffs-buffer-map "p" 'previous-line)
390 (define-key ediff-dir-diffs-buffer-map "C" 'ediff-dir-diff-copy-file)
392 (define-key ediff-dir-diffs-buffer-map [mouse-2] 'ediff-dir-diff-copy-file)
393 (define-key ediff-dir-diffs-buffer-map [button2] 'ediff-dir-diff-copy-file))
394 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line
)
395 (define-key ediff-dir-diffs-buffer-map
[backspace] 'previous-line)
397 (defun ediff-next-meta-item (count)
398 "Move to the next item in Ediff registry or session group buffer.
399 Moves in circular fashion. With numeric prefix arg, skip this many items."
401 (or count (setq count 1))
404 (setq count (1- count))
405 (ediff-next-meta-item1)
406 (setq overl (ediff-get-meta-overlay-at-pos (point)))
407 ;; skip invisible ones
408 (while (and overl (ediff-overlay-get overl 'invisible))
409 (ediff-next-meta-item1)
410 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
412 ;; Move to the next meta item
413 (defun ediff-next-meta-item1 ()
415 (setq pos (ediff-next-meta-overlay-start (point)))
416 (if pos (goto-char pos))
417 (if (eq ediff-metajob-name 'ediff-registry)
418 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
419 (search-forward "*Ediff" nil t))
420 (skip-chars-backward "a-zA-Z*"))
421 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
422 (backward-char 1)))))
425 (defun ediff-previous-meta-item (count)
426 "Move to the previous item in Ediff registry or session group buffer.
427 Moves in circular fashion. With numeric prefix arg, skip this many items."
429 (or count (setq count 1))
432 (setq count (1- count))
433 (ediff-previous-meta-item1)
434 (setq overl (ediff-get-meta-overlay-at-pos (point)))
435 ;; skip invisible ones
436 (while (and overl (ediff-overlay-get overl 'invisible))
437 (ediff-previous-meta-item1)
438 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
440 (defun ediff-previous-meta-item1 ()
442 (setq pos (ediff-previous-meta-overlay-start (point)))
444 ;;; (while (ediff-get-session-status
445 ;;; (ediff-get-meta-info (current-buffer) pos 'noerror))
446 ;;; (setq pos (ediff-previous-meta-overlay-start pos)))
448 (if pos (goto-char pos))
449 (if (eq ediff-metajob-name 'ediff-registry)
450 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
451 (search-forward "*Ediff" nil t))
452 (skip-chars-backward "a-zA-Z*"))
453 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
457 (defsubst ediff-add-slash-if-directory (dir file)
458 (if (file-directory-p (concat dir file))
459 (file-name-as-directory file)
462 (defun ediff-toggle-filename-truncation ()
463 "Toggle truncation of long file names in session group buffers.
464 Set `ediff-meta-truncate-filenames' variable if you want to change the default
467 (setq ediff-meta-truncate-filenames (not ediff-meta-truncate-filenames))
468 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
471 ;; These are used to encode membership of files in directory1/2/3
472 ;; Membership code of a file is a product of codes for the directories where
474 (defvar ediff-membership-code1 2)
475 (defvar ediff-membership-code2 3)
476 (defvar ediff-membership-code3 5)
477 (defvar ediff-product-of-memcodes (* ediff-membership-code1
478 ediff-membership-code2
479 ediff-membership-code3))
481 ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
482 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
484 ;; REGEXP is a regexp used to filter out files in the directories.
485 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
486 ;; included in the intersection. However, a regular file that is a dir in dir3
487 ;; is included, since dir3 files are supposed to be ancestors for merging.
488 ;; Returns a list of the form:
489 ;; (DIFF-LIST META-HEADER (f1 f2 f3) (f1 f2 f3) ...)
490 ;; dir3, f3 can be nil if intersecting only 2 directories.
491 ;; If COMPARISON-FUNC is given, use it. Otherwise, use string=
492 ;; DIFF-LIST is of the form:
493 ;; (META-HEADER (file . num) (file . num)...)
494 ;; where num encodes the set of dirs where the file is found:
495 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.
496 ;; META-HEADER is of the form
497 ;; It contains the meta info about this ediff operation
498 ;; (regexp dir1 dir2 dir3 merge-auto-store-dir comparison-func)
499 ;; Later the meta-buffer is prepended to this list.
500 (defun ediff-intersect-directories (jobname
503 dir3 merge-autostore-dir comparison-func)
504 (setq comparison-func (or comparison-func 'string=))
505 (let (lis1 lis2 lis3 common auxdir1 auxdir2 auxdir3 common-part difflist)
507 (setq auxdir1 (file-name-as-directory dir1)
508 lis1 (directory-files auxdir1 nil regexp)
509 lis1 (delete "." lis1)
510 lis1 (delete ".." lis1)
513 (ediff-add-slash-if-directory auxdir1 elt))
515 auxdir2 (file-name-as-directory dir2)
518 (ediff-add-slash-if-directory auxdir2 elt))
519 (directory-files auxdir2 nil regexp)))
522 (setq auxdir3 (file-name-as-directory dir3)
525 (ediff-add-slash-if-directory auxdir3 elt))
526 (directory-files auxdir3 nil regexp))))
528 (if (ediff-nonempty-string-p merge-autostore-dir)
529 (setq merge-autostore-dir
530 (file-name-as-directory merge-autostore-dir)))
531 (setq common (ediff-intersection lis1 lis2 comparison-func))
533 ;; In merge with ancestor jobs, we don't intersect with lis3.
534 ;; If there is no ancestor, we'll offer to merge without the ancestor.
535 ;; So, we intersect with lis3 only when we are doing 3-way file comparison
536 (if (and lis3 (ediff-comparison-metajob3 jobname))
537 (setq common (ediff-intersection common lis3 comparison-func)))
539 ;; copying is needed because sort sorts via side effects
540 (setq common (sort (ediff-copy-list common) 'string-lessp))
542 ;; compute difference list
543 (setq difflist (ediff-set-difference
544 (ediff-union (ediff-union lis1 lis2 comparison-func)
549 difflist (delete "." difflist)
550 ;; copying is needed because sort sorts via side effects
551 difflist (sort (ediff-copy-list (delete ".." difflist))
554 (setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist))
556 ;; check for files belonging to lis1/2/3
557 ;; Each elt is of the norm (file . number)
558 ;; Number encodes the directories to which file belongs.
559 ;; It is a product of a subset of ediff-membership-code1=2,
560 ;; ediff-membership-code2=3, and ediff-membership-code3=5.
561 ;; If file belongs to dir 1 only, the membership code is 2.
562 ;; If it is in dir1 and dir3, then the membership code is 2*5=10;
563 ;; if it is in dir1 and dir2, then the membership code is 2*3=6, etc.
564 (mapcar (lambda (elt)
565 (if (member (car elt) lis1)
566 (setcdr elt (* (cdr elt) ediff-membership-code1)))
567 (if (member (car elt) lis2)
568 (setcdr elt (* (cdr elt) ediff-membership-code2)))
569 (if (member (car elt) lis3)
570 (setcdr elt (* (cdr elt) ediff-membership-code3)))
574 ;; diff metalist header
576 auxdir1 auxdir2 auxdir3
585 auxdir1 auxdir2 auxdir3
590 (ediff-make-new-meta-list-element
595 ;; The following is done because: In merging with
596 ;; ancestor, we don't intersect with lis3. So, it is
597 ;; possible that elt is a file in auxdir1/2 but a
598 ;; directory in auxdir3 Or elt may not exist in auxdir3 at
599 ;; all. In the first case, we add a slash at the end. In
600 ;; the second case, we insert nil.
601 (setq elt (ediff-add-slash-if-directory auxdir3 elt))
602 (if (file-exists-p (concat auxdir3 elt))
603 (concat auxdir3 elt))))))
606 (cons common-part difflist)
609 ;; find directory files that are under revision. Include subdirectories, since
610 ;; we may visit them recursively. DIR1 is the directory to inspect.
611 ;; MERGE-AUTOSTORE-DIR is the directory where to auto-store the results of
612 ;; merges. Can be nil.
613 (defun ediff-get-directory-files-under-revision (jobname
615 &optional merge-autostore-dir)
616 (let (lis1 elt common auxdir1)
617 (setq auxdir1 (file-name-as-directory dir1)
618 lis1 (directory-files auxdir1 nil regexp))
620 (if (ediff-nonempty-string-p merge-autostore-dir)
621 (setq merge-autostore-dir
622 (file-name-as-directory merge-autostore-dir)))
627 ;; take files under revision control
628 (cond ((file-directory-p (concat auxdir1 elt))
630 (cons (ediff-add-slash-if-directory auxdir1 elt) common)))
631 ((and (featurep 'vc-hooks) (vc-backend (concat auxdir1 elt)))
632 (setq common (cons elt common)))
633 ;; The following two are needed only if vc-hooks isn't loaded.
634 ;; They won't recognize CVS files.
635 ((file-exists-p (concat auxdir1 elt ",v"))
636 (setq common (cons elt common)))
637 ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))
638 (setq common (cons elt common)))
642 (setq common (delete "./" common)
643 common (delete "../" common)
644 common (delete "RCS" common)
645 common (delete "CVS" common)
648 ;; copying is needed because sort sorts via side effects
649 (setq common (sort (ediff-copy-list common) 'string-lessp))
653 ;; header -- has 6 elements. Meta buffer is prepended later by
654 ;; ediff-prepare-meta-buffer
655 (list regexp auxdir1 nil nil merge-autostore-dir nil)
656 (mapcar (lambda (elt) (ediff-make-new-meta-list-element
657 (concat auxdir1 elt) nil nil))
662 ;; If file groups selected by patterns will ever be implemented, this
663 ;; comparison function might become useful.
664 ;;;; uses external variables PAT1 PAT2 to compare str1/2
665 ;;;; patterns must be of the form ???*???? where ??? are strings of chars
666 ;;;; containing no *.
667 ;;(defun ediff-pattern= (str1 str2)
668 ;; (let (pos11 pos12 pos21 pos22 len1 len2)
670 ;; len (length epat1)
672 ;; (while (and (< pos11 len) (not (= (aref epat1 pos11) ?*)))
673 ;; (setq pos11 (1+ pos11)))
674 ;; (while (and (> pos12 0) (not (= (aref epat1 (1- pos12)) ?*)))
675 ;; (setq pos12 (1- pos12)))
678 ;; len (length epat2)
680 ;; (while (and (< pos21 len) (not (= (aref epat2 pos21) ?*)))
681 ;; (setq pos21 (1+ pos21)))
682 ;; (while (and (> pos22 0) (not (= (aref epat2 (1- pos22)) ?*)))
683 ;; (setq pos22 (1- pos22)))
685 ;; (if (and (> (length str1) pos12) (>= pos12 pos11) (> pos11 -1)
686 ;; (> (length str2) pos22) (>= pos22 pos21) (> pos21 -1))
687 ;; (string= (substring str1 pos11 pos12)
688 ;; (substring str2 pos21 pos22)))
692 ;; Prepare meta-buffer in accordance with the argument-function and
693 ;; redraw-function. Must return the created meta-buffer.
694 (defun ediff-prepare-meta-buffer (action-func meta-list
695 meta-buffer-name redraw-function
696 jobname &optional startup-hooks)
697 (let* ((meta-buffer-name
698 (ediff-unique-buffer-name meta-buffer-name "*"))
699 (meta-buffer (get-buffer-create meta-buffer-name)))
700 (ediff-with-current-buffer meta-buffer
705 (setq ediff-meta-action-function action-func
706 ediff-meta-redraw-function redraw-function
707 ediff-metajob-name jobname
708 ediff-meta-buffer meta-buffer)
710 ;; comes after ediff-meta-action-function is set
711 (ediff-setup-meta-map)
713 (if (eq ediff-metajob-name 'ediff-registry)
715 (setq ediff-registry-buffer meta-buffer
716 ediff-meta-list meta-list)
717 ;; this func is used only from registry buffer, not from other
720 ediff-meta-buffer-map "M" 'ediff-show-meta-buff-from-registry))
721 ;; Initialize the meta list -- we don't do this for registry.
722 (setq ediff-meta-list
723 ;; add meta-buffer to the list header
724 (cons (cons meta-buffer (car meta-list))
727 (or (eq meta-buffer ediff-registry-buffer)
728 (setq ediff-session-registry
729 (cons meta-buffer ediff-session-registry)))
731 ;; redraw-function uses ediff-meta-list
732 (funcall redraw-function ediff-meta-list)
734 ;; set read-only/non-modified
735 (setq buffer-read-only t)
736 (set-buffer-modified-p nil)
738 (run-hooks 'startup-hooks)
740 ;; Arrange to show directory contents differences
741 ;; Must be after run startup-hooks, since ediff-dir-difference-list is
742 ;; set inside these hooks
743 (if (eq action-func 'ediff-filegroup-action)
745 ;; put meta buffer in (car ediff-dir-difference-list)
746 (setq ediff-dir-difference-list
747 (cons (cons meta-buffer (car ediff-dir-difference-list))
748 (cdr ediff-dir-difference-list)))
750 (or (ediff-one-filegroup-metajob jobname)
751 (ediff-draw-dir-diffs ediff-dir-difference-list))
753 ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos)
754 (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
756 ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos)
757 (define-key ediff-meta-buffer-map "u" nil)
759 ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
761 ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
762 (cond ((ediff-collect-diffs-metajob jobname)
764 ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
765 ((ediff-patch-metajob jobname)
767 ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
768 (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
769 (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
771 (if (eq ediff-metajob-name 'ediff-registry)
772 (run-hooks 'ediff-registry-setup-hook)
773 (run-hooks 'ediff-after-session-group-setup-hook))
774 ) ; eval in meta-buffer
777 ;; Insert the activity marker for session SESSION in the meta buffer at point
778 ;; The activity marker is either SPC (untouched session), or + (active session,
779 ;; i.e., ediff is currently run in it), or - (finished session, i.e., we've ran
780 ;; ediff in it and then exited)
781 (defun ediff-insert-session-activity-marker-in-meta-buffer (session)
783 (cond ((ediff-get-session-activity-marker session))
787 ;; Insert session status at point. Status is either ?H (marked for hiding), or
788 ;; ?I (hidden or invalid), or ?* (meaning marked for an operation; currently,
789 ;; such op can only be checking for equality)), or SPC (meaning neither marked
791 (defun ediff-insert-session-status-in-meta-buffer (session)
793 (cond ((ediff-get-session-status session)) ; session has status: ?H, ?I, ?*
794 ;; normal session, no marks or hidings
797 ;; If NEW-MARKER is non-nil, use it to substitute the current activity marker
798 ;; in the meta buffer. If nil, use SPC
799 (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker)
800 (let* ((overl (ediff-get-meta-overlay-at-pos point))
801 (session-info (ediff-overlay-get overl 'ediff-meta-info))
802 (activity-marker (ediff-get-session-activity-marker session-info))
804 (or new-marker activity-marker (setq new-marker ?\ ))
805 (goto-char (ediff-overlay-start overl))
806 (if (eq (char-after (point)) new-marker)
807 () ; if marker shown in buffer is the same as new-marker, do nothing
810 (set-buffer-modified-p nil))))
812 ;; If NEW-STATUS is non-nil, use it to substitute the current status marker in
813 ;; the meta buffer. If nil, use SPC
814 (defun ediff-replace-session-status-in-meta-buffer (point new-status)
815 (let* ((overl (ediff-get-meta-overlay-at-pos point))
816 (session-info (ediff-overlay-get overl 'ediff-meta-info))
817 (status (ediff-get-session-status session-info))
819 (setq new-status (or new-status status ?\ ))
820 (goto-char (ediff-overlay-start overl))
821 (forward-char 1) ; status is the second char in session record
822 (if (eq (char-after (point)) new-status)
823 () ; if marker shown in buffer is the same as new-marker, do nothing
826 (set-buffer-modified-p nil))))
828 ;; insert all file info in meta buffer for a given session
829 (defun ediff-insert-session-info-in-meta-buffer (session-info sessionNum)
830 (let ((f1 (ediff-get-session-objA session-info))
831 (f2 (ediff-get-session-objB session-info))
832 (f3 (ediff-get-session-objC session-info))
834 (hidden (eq (ediff-get-session-status session-info) ?I)))
835 ;; insert activity marker, i.e., SPC, - or +
836 (ediff-insert-session-activity-marker-in-meta-buffer session-info)
837 ;; insert session status, i.e., *, H
838 (ediff-insert-session-status-in-meta-buffer session-info)
839 (insert " Session " (int-to-string sessionNum) ":\n")
840 (ediff-meta-insert-file-info1 f1)
841 (ediff-meta-insert-file-info1 f2)
842 (ediff-meta-insert-file-info1 f3)
843 (ediff-set-meta-overlay pt (point) session-info sessionNum hidden)))
846 ;; this is a setup function for ediff-directories
847 ;; must return meta-buffer
848 (defun ediff-redraw-directory-group-buffer (meta-list)
849 ;; extract directories
850 (let ((meta-buf (ediff-get-group-buffer meta-list))
853 regexp elt merge-autostore-dir
854 point tmp-list buffer-read-only)
855 (ediff-with-current-buffer meta-buf
858 ;; delete phony overlays that used to represent sessions before the buff
860 (ediff-cond-compile-for-xemacs-or-emacs
861 (map-extents 'delete-extent) ; xemacs
862 (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
865 (insert (format ediff-meta-buffer-message
866 (ediff-abbrev-jobname ediff-metajob-name)))
868 (setq regexp (ediff-get-group-regexp meta-list)
870 (ediff-get-group-merge-autostore-dir meta-list))
872 (cond ((ediff-collect-diffs-metajob)
874 " P:\tcollect custom diffs of all marked sessions\n"))
875 ((ediff-patch-metajob)
877 " P:\tshow patch appropriately for the context (session or group)\n")))
879 " ^:\tshow parent session group\n")
880 (or (ediff-one-filegroup-metajob)
882 " D:\tshow differences among directories\n"
883 " ==:\tfor each session, show which files are identical\n"
884 " =h:\tlike ==, but also marks those sessions for hiding\n"
885 " =m:\tlike ==, but also marks those sessions for operation\n\n"))
888 (if (and (stringp regexp) (> (length regexp) 0))
890 (format "*** Filter-through regular expression: %s\n" regexp)))
891 (ediff-insert-dirs-in-meta-buffer meta-list)
892 (if (and ediff-autostore-merges (ediff-merge-metajob)
893 (ediff-nonempty-string-p merge-autostore-dir))
895 "\nMerge results are automatically stored in:\n\t%s\n"
896 merge-autostore-dir)))
898 Size Last modified Name
899 ----------------------------------------------
903 ;; discard info on directories and regexp
904 (setq meta-list (cdr meta-list)
906 (while (and tmp-list empty)
907 (if (and (car tmp-list)
908 (not (eq (ediff-get-session-status (car tmp-list)) ?I)))
910 (setq tmp-list (cdr tmp-list)))
914 " ****** ****** This session group has no members\n"))
916 ;; now organize file names like this:
917 ;; use-mark sizeA dateA sizeB dateB filename
918 ;; make sure directories are displayed with a trailing slash.
920 (setq elt (car meta-list)
921 meta-list (cdr meta-list)
922 sessionNum (1+ sessionNum))
923 (if (eq (ediff-get-session-status elt) ?I)
925 (ediff-insert-session-info-in-meta-buffer elt sessionNum)))
926 (set-buffer-modified-p nil)
930 (defun ediff-update-markers-in-dir-meta-buffer (meta-list)
931 (let ((meta-buf (ediff-get-group-buffer meta-list))
932 session-info point overl buffer-read-only)
933 (ediff-with-current-buffer meta-buf
935 (goto-char (point-min))
936 (ediff-next-meta-item1)
938 (setq session-info (ediff-get-meta-info meta-buf (point) 'no-error)
939 overl (ediff-get-meta-overlay-at-pos (point)))
942 (cond ((eq (ediff-get-session-status session-info) ?I)
944 (if overl (ediff-overlay-put overl 'invisible t)))
945 ((and (eq (ediff-get-session-status session-info) ?H)
946 overl (ediff-overlay-get overl 'invisible))
948 (ediff-overlay-put overl 'invisible nil))
949 (t (ediff-replace-session-activity-marker-in-meta-buffer
951 (ediff-get-session-activity-marker session-info))
952 (ediff-replace-session-status-in-meta-buffer
954 (ediff-get-session-status session-info))))))
955 (ediff-next-meta-item1) ; advance to the next item
957 (set-buffer-modified-p nil)
961 (defun ediff-update-session-marker-in-dir-meta-buffer (session-num)
962 (let (buffer-meta-overlays session-info overl buffer-read-only)
964 (ediff-cond-compile-for-xemacs-or-emacs
965 (map-extents ; xemacs
968 (ediff-overlay-get ext 'ediff-meta-info)
969 (eq (ediff-overlay-get ext 'ediff-meta-session-number)
972 ;; Emacs doesn't have map-extents, so try harder
973 ;; Splice overlay lists to get all buffer overlays
975 (setq buffer-meta-overlays (overlay-lists)
976 buffer-meta-overlays (append (car buffer-meta-overlays)
977 (cdr buffer-meta-overlays)))
983 (ediff-overlay-get overl 'ediff-meta-info)
984 (eq (ediff-overlay-get
985 overl 'ediff-meta-session-number)
988 buffer-meta-overlays))))
992 "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S"
994 (setq session-info (ediff-overlay-get overl 'ediff-meta-info))
995 (goto-char (ediff-overlay-start overl))
996 (ediff-replace-session-activity-marker-in-meta-buffer
998 (ediff-get-session-activity-marker session-info))
999 (ediff-replace-session-status-in-meta-buffer
1001 (ediff-get-session-status session-info)))
1002 (ediff-next-meta-item1))
1006 ;; Check if this is a problematic session.
1007 ;; Return nil if not. Otherwise, return symbol representing the problem
1008 ;; At present, problematic sessions occur only in -with-ancestor comparisons
1009 ;; when the ancestor is a directory rather than a file, or when there is no
1010 ;; suitable ancestor file in the ancestor directory
1011 (defun ediff-problematic-session-p (session)
1012 (let ((f1 (ediff-get-session-objA-name session))
1013 (f2 (ediff-get-session-objB-name session))
1014 (f3 (ediff-get-session-objC-name session)))
1015 (cond ((and (stringp f1) (not (file-directory-p f1))
1016 (stringp f2) (not (file-directory-p f2))
1017 ;; either invalid file name or a directory
1018 (or (not (stringp f3)) (file-directory-p f3))
1019 (ediff-ancestor-metajob))
1020 ;; more may be added later
1024 (defun ediff-meta-insert-file-info1 (fileinfo)
1025 (let ((fname (car fileinfo))
1026 (feq (ediff-get-file-eqstatus fileinfo))
1027 (max-filename-width (if ediff-meta-truncate-filenames
1028 (- (window-width) 41)
1030 file-modtime file-size)
1031 (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits
1032 ((ediff-listable-file fname)
1033 (if (file-exists-p fname)
1034 ;; set real size and modtime
1035 (setq file-size (ediff-file-size fname)
1036 file-modtime (ediff-file-modtime fname))
1037 (setq file-size -2))) ; file doesn't exist
1038 ( t (setq file-size -1))) ; remote file
1043 (if feq "=" " ") ; equality indicator
1044 (format "%10s" (cond ((= file-size -1) "--")
1045 ((< file-size -1) "--")
1047 (cond ((= file-size -1) "*remote file*")
1048 ((< file-size -1) "*file doesn't exist*")
1049 (t (ediff-format-date (decode-time file-modtime))))
1051 ;; dir names in meta lists have training slashes, so we just
1052 ;; abbreviate the file name, if file exists
1053 (if (and (not (stringp fname)) (< file-size -1))
1054 "-------" ; file doesn't exist
1055 (ediff-truncate-string-left
1056 (ediff-abbreviate-file-name fname)
1057 max-filename-width)))))))
1059 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
1060 (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")
1061 (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec"))
1062 "Months' associative array.")
1064 ;; returns 2char string
1065 (defsubst ediff-fill-leading-zero (num)
1068 (number-to-string num)))
1070 ;; TIME is like the output of decode-time
1071 (defun ediff-format-date (time)
1072 (format "%s %2d %4d %s:%s:%s"
1073 (cdr (assoc (nth 4 time) ediff-months)) ; month
1076 (ediff-fill-leading-zero (nth 2 time)) ; hour
1077 (ediff-fill-leading-zero (nth 1 time)) ; min
1078 (ediff-fill-leading-zero (nth 0 time)) ; sec
1081 ;; Draw the directories
1082 (defun ediff-insert-dirs-in-meta-buffer (meta-list)
1083 (let* ((dir1 (ediff-abbreviate-file-name (ediff-get-group-objA meta-list)))
1084 (dir2 (ediff-get-group-objB meta-list))
1085 (dir2 (if (stringp dir2) (ediff-abbreviate-file-name dir2)))
1086 (dir3 (ediff-get-group-objC meta-list))
1087 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3))))
1088 (insert "*** Directory A: " dir1 "\n")
1089 (if dir2 (insert "*** Directory B: " dir2 "\n"))
1090 (if dir3 (insert "*** Directory C: " dir3 "\n"))
1093 (defun ediff-draw-dir-diffs (diff-list &optional buf-name)
1094 (if (null diff-list) (error "Lost difference info on these directories"))
1097 (ediff-unique-buffer-name "*Ediff File Group Differences" "*")))
1098 (let* ((regexp (ediff-get-group-regexp diff-list))
1099 (dir1 (ediff-abbreviate-file-name (ediff-get-group-objA diff-list)))
1100 (dir2 (ediff-abbreviate-file-name (ediff-get-group-objB diff-list)))
1101 (dir3 (ediff-get-group-objC diff-list))
1102 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3)))
1103 (meta-buf (ediff-get-group-buffer diff-list))
1104 (underline (make-string 26 ?-))
1105 file membership-code saved-point
1107 ;; skip the directory part
1108 (setq diff-list (cdr diff-list))
1109 (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))
1110 (ediff-with-current-buffer ediff-dir-diffs-buffer
1111 (setq saved-point (point))
1112 (use-local-map ediff-dir-diffs-buffer-map)
1114 (setq ediff-meta-buffer meta-buf)
1115 (insert "\t\t*** Directory Differences ***\n")
1118 C,button2: over file name -- copy this file to directory that doesn't have it
1121 p,DEL: previous line\n\n")
1123 (insert (format "\n*** Directory A: %s\n" dir1))
1124 (if dir2 (insert (format "*** Directory B: %s\n" dir2)))
1125 (if dir3 (insert (format "*** Directory C: %s\n" dir3)))
1126 (if (and (stringp regexp) (> (length regexp) 0))
1128 (format "*** Filter-through regular expression: %s\n" regexp)))
1130 (insert (format "\n%-27s%-26s" "Directory A" "Directory B"))
1132 (insert (format " %-25s\n" "Directory C"))
1134 (insert (format "%s%s" underline underline))
1136 (insert (format "%s\n\n" underline))
1139 (if (null diff-list)
1140 (insert "\n\t*** No differences ***\n"))
1143 (setq file (car (car diff-list))
1144 membership-code (cdr (car diff-list))
1145 diff-list (cdr diff-list))
1146 (if (= (mod membership-code ediff-membership-code1) 0) ; dir1
1147 (let ((beg (point)))
1148 (insert (format "%-27s"
1149 (ediff-truncate-string-left
1150 (ediff-abbreviate-file-name
1151 (if (file-directory-p (concat dir1 file))
1152 (file-name-as-directory file)
1155 ;; format of meta info in the dir-diff-buffer:
1156 ;; (filename-tail filename-full otherdir1 otherdir2 otherdir3)
1157 (ediff-set-meta-overlay
1159 (list meta-buf file (concat dir1 file) dir1 dir2 dir3)))
1160 (insert (format "%-27s" "---")))
1161 (if (= (mod membership-code ediff-membership-code2) 0) ; dir2
1162 (let ((beg (point)))
1163 (insert (format "%-26s"
1164 (ediff-truncate-string-left
1165 (ediff-abbreviate-file-name
1166 (if (file-directory-p (concat dir2 file))
1167 (file-name-as-directory file)
1170 (ediff-set-meta-overlay
1172 (list meta-buf file (concat dir2 file) dir1 dir2 dir3)))
1173 (insert (format "%-26s" "---")))
1175 (if (= (mod membership-code ediff-membership-code3) 0) ; dir3
1176 (let ((beg (point)))
1177 (insert (format " %-25s"
1178 (ediff-truncate-string-left
1179 (ediff-abbreviate-file-name
1180 (if (file-directory-p (concat dir3 file))
1181 (file-name-as-directory file)
1184 (ediff-set-meta-overlay
1186 (list meta-buf file (concat dir3 file) dir1 dir2 dir3)))
1187 (insert (format " %-25s" "---"))))
1189 (setq buffer-read-only t)
1190 (set-buffer-modified-p nil)
1191 (goto-char saved-point)) ; end eval in diff buffer
1194 (defun ediff-bury-dir-diffs-buffer ()
1195 "Bury the directory difference buffer. Display the meta buffer instead."
1197 ;; ediff-meta-buffer is set in ediff-draw-dir-diffs so the directory
1198 ;; difference buffer remembers the meta buffer
1199 (let ((buf ediff-meta-buffer)
1201 (ediff-kill-buffer-carefully ediff-dir-diffs-buffer)
1202 (if (setq wind (ediff-get-visible-buffer-window buf))
1203 (select-window wind)
1204 (set-window-buffer (selected-window) buf))))
1206 ;; executes in dir session group buffer
1207 ;; show buffer differences
1208 (defun ediff-show-dir-diffs ()
1209 "Display differences among the directories involved in session group."
1211 (if (ediff-one-filegroup-metajob)
1212 (error "This command is inapplicable in the present context"))
1213 (or (ediff-buffer-live-p ediff-dir-diffs-buffer)
1214 (ediff-draw-dir-diffs ediff-dir-difference-list))
1215 (let ((buf ediff-dir-diffs-buffer))
1217 (set-window-buffer (selected-window) buf)
1218 (goto-char (point-min))))
1220 ;; Format of meta info in dir-diff-buffer:
1221 ;; (filename-tail filename-full otherdir1 otherdir2)
1222 (defun ediff-dir-diff-copy-file ()
1223 "Copy file described at point to directories where this file is missing."
1225 (let* ((pos (ediff-event-point last-command-event))
1226 (info (ediff-get-meta-info (current-buffer) pos 'noerror))
1227 (meta-buf (car info))
1228 (file-tail (nth 1 info))
1229 (file-abs (nth 2 info))
1230 (otherdir1 (nth 3 info))
1231 (otherfile1 (if otherdir1 (concat otherdir1 file-tail)))
1232 (otherdir2 (nth 4 info))
1233 (otherfile2 (if otherdir2 (concat otherdir2 file-tail)))
1234 (otherdir3 (nth 5 info))
1235 (otherfile3 (if otherdir3 (concat otherdir3 file-tail)))
1236 meta-list dir-diff-list
1239 (error "No file suitable for copying described at this location"))
1240 (ediff-with-current-buffer meta-buf
1241 (setq meta-list ediff-meta-list
1242 dir-diff-list ediff-dir-difference-list))
1244 ;; copy file to directories where it doesn't exist, update
1245 ;; ediff-dir-difference-list and redisplay
1247 (lambda (otherfile-struct)
1248 (let ((otherfile (car otherfile-struct))
1249 (file-mem-code (cdr otherfile-struct)))
1251 (or (file-exists-p otherfile)
1253 (format "Copy %s to %s ? " file-abs otherfile))
1254 (let* ((file-diff-record (assoc file-tail dir-diff-list))
1256 (* (cdr file-diff-record) file-mem-code)))
1257 (copy-file file-abs otherfile)
1258 (setcdr file-diff-record new-mem-code)
1259 (ediff-draw-dir-diffs dir-diff-list (buffer-name))
1261 ;; if file is in all three dirs or in two dirs and only
1262 ;; two dirs are involved, delete this file's record
1263 (if (or (= new-mem-code ediff-product-of-memcodes)
1264 (and (> new-mem-code ediff-membership-code3)
1266 (delq file-diff-record dir-diff-list))
1269 ;; 2,3,5 are numbers used to encode membership of a file in
1270 ;; dir1/2/3. See ediff-intersect-directories.
1271 (list (cons otherfile1 2) (cons otherfile2 3) (cons otherfile3 5)))
1273 (if (and (file-exists-p otherfile1)
1274 (file-exists-p otherfile2)
1275 (or (not otherfile3) (file-exists-p otherfile3)))
1276 ;; update ediff-meta-list by direct modification
1278 (list (ediff-make-new-meta-list-element
1279 otherfile1 otherfile2 otherfile3)))
1281 (ediff-update-meta-buffer meta-buf 'must-redraw)
1284 (defun ediff-up-meta-hierarchy ()
1285 "Go to the parent session group buffer."
1287 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
1288 (ediff-show-meta-buffer
1289 ediff-parent-meta-buffer ediff-meta-session-number)
1290 (error "This session group has no parent")))
1293 ;; argument is ignored
1294 (defun ediff-redraw-registry-buffer (&optional ignore)
1295 (ediff-with-current-buffer ediff-registry-buffer
1296 (let ((point (point))
1297 elt bufAname bufBname bufCname cur-diff total-diffs pt
1298 job-name meta-list registry-list buffer-read-only)
1300 ;; delete phony overlays that used to represent sessions before the buff
1302 (ediff-cond-compile-for-xemacs-or-emacs
1303 (map-extents 'delete-extent) ; xemacs
1304 (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
1307 (insert "This is a registry of all active Ediff sessions.
1310 button2, `v', RET over a session record: switch to that session
1311 M over a session record: display the associated session group
1312 R in any Ediff session: display session registry
1314 p,DEL: previous session
1315 E: browse Ediff on-line manual
1319 \t\tActive Ediff Sessions:
1320 \t\t----------------------
1323 ;; purge registry list from dead buffers
1324 (mapcar (lambda (elt)
1325 (if (not (ediff-buffer-live-p elt))
1326 (setq ediff-session-registry
1327 (delq elt ediff-session-registry))))
1328 ediff-session-registry)
1330 (if (null ediff-session-registry)
1331 (insert " ******* No active Ediff sessions *******\n"))
1333 (setq registry-list ediff-session-registry)
1334 (while registry-list
1335 (setq elt (car registry-list)
1336 registry-list (cdr registry-list))
1338 (if (ediff-buffer-live-p elt)
1339 (if (ediff-with-current-buffer elt
1340 (setq job-name ediff-metajob-name
1341 meta-list ediff-meta-list)
1342 (and ediff-metajob-name
1343 (not (eq ediff-metajob-name 'ediff-registry))))
1346 (insert (format " *group*\t%s: %s\n"
1348 (ediff-abbrev-jobname job-name)))
1349 (insert (format "\t\t %s %s %s\n"
1350 (ediff-abbreviate-file-name
1351 (ediff-get-group-objA meta-list))
1352 (ediff-abbreviate-file-name
1354 (ediff-get-group-objB meta-list))
1355 (ediff-get-group-objB meta-list)
1357 (ediff-abbreviate-file-name
1359 (ediff-get-group-objC meta-list))
1360 (ediff-get-group-objC meta-list)
1362 (ediff-set-meta-overlay pt (point) elt))
1364 (ediff-with-current-buffer elt
1365 (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
1366 (buffer-name ediff-buffer-A)
1367 "!!!killed buffer!!!")
1368 bufBname (if (ediff-buffer-live-p ediff-buffer-B)
1369 (buffer-name ediff-buffer-B)
1370 "!!!killed buffer!!!")
1371 bufCname (cond ((not (ediff-3way-job))
1373 ((ediff-buffer-live-p ediff-buffer-C)
1374 (buffer-name ediff-buffer-C))
1375 (t "!!!killed buffer!!!")))
1376 (setq total-diffs (format "%-4d" ediff-number-of-differences)
1378 (cond ((= ediff-current-difference -1) " _")
1379 ((= ediff-current-difference
1380 ediff-number-of-differences)
1383 "%4d" (1+ ediff-current-difference))))
1384 job-name ediff-job-name))
1385 ;; back in the meta buf
1387 (insert cur-diff "/" total-diffs "\t"
1389 (format ": %s" (ediff-abbrev-jobname job-name)))
1391 "\n\t\t " bufAname " " bufBname " " bufCname "\n")
1392 (ediff-set-meta-overlay pt (point) elt))))
1394 (set-buffer-modified-p nil)
1398 ;; Sets overlay around a meta record with 'ediff-meta-info property PROP
1399 ;; If optional SESSION-NUMBER, make it a property of the overlay,
1400 ;; ediff-meta-session-number
1401 ;; PROP is either the ctl or meta buffer (used when we work with the registry)
1402 ;; or a session meta descriptor of the form
1403 ;; (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
1404 (defun ediff-set-meta-overlay (b e prop &optional session-number hidden)
1406 (setq overl (ediff-make-overlay b e))
1408 (ediff-overlay-put overl 'mouse-face 'highlight)
1409 (ediff-overlay-put overl 'highlight t))
1410 (ediff-overlay-put overl 'ediff-meta-info prop)
1411 (ediff-overlay-put overl 'invisible hidden)
1412 (if (numberp session-number)
1413 (ediff-overlay-put overl 'ediff-meta-session-number session-number))))
1415 (defun ediff-mark-for-hiding-at-pos (unmark)
1416 "Mark session for hiding. With prefix arg, unmark."
1418 (let* ((pos (ediff-event-point last-command-event))
1419 (meta-buf (ediff-event-buffer last-command-event))
1420 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1421 (info (ediff-get-meta-info meta-buf pos))
1422 (session-number (ediff-get-session-number-at-pos pos)))
1423 (ediff-mark-session-for-hiding info unmark)
1424 (ediff-next-meta-item 1)
1426 (ediff-update-meta-buffer meta-buf nil session-number))
1429 ;; Returns whether session was marked or unmarked
1430 (defun ediff-mark-session-for-hiding (info unmark)
1431 (let ((session-buf (ediff-get-session-buffer info))
1433 (cond ((eq unmark 'mark) (setq unmark nil))
1434 ((eq (ediff-get-session-status info) ?H) (setq unmark t))
1435 (unmark ; says unmark, but the marker is different from H
1438 (unmark (ediff-set-session-status info nil))
1439 ;;; (if (ediff-buffer-live-p session-buf)
1440 ;;; (error "Can't hide active session, %s" (buffer-name session-buf)))
1441 (t (ediff-set-session-status info ?H))))
1445 (defun ediff-mark-for-operation-at-pos (unmark)
1446 "Mark session for a group operation. With prefix arg, unmark."
1448 (let* ((pos (ediff-event-point last-command-event))
1449 (meta-buf (ediff-event-buffer last-command-event))
1450 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1451 (info (ediff-get-meta-info meta-buf pos))
1452 (session-number (ediff-get-session-number-at-pos pos)))
1453 (ediff-mark-session-for-operation info unmark)
1454 (ediff-next-meta-item 1)
1456 (ediff-update-meta-buffer meta-buf nil session-number))
1460 ;; returns whether session was unmarked.
1461 ;; remember: this is a toggle op
1462 (defun ediff-mark-session-for-operation (info unmark)
1464 (cond ((eq unmark 'mark) (setq unmark nil))
1465 ((eq (ediff-get-session-status info) ?*) (setq unmark t))
1466 (unmark ; says unmark, but the marker is different from *
1469 (unmark (ediff-set-session-status info nil))
1470 (t (ediff-set-session-status info ?*))))
1474 (defun ediff-hide-marked-sessions (unhide)
1475 "Hide marked sessions. With prefix arg, unhide."
1477 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1478 (meta-list (cdr ediff-meta-list))
1479 (from (if unhide ?I ?H))
1480 (to (if unhide ?H ?I))
1482 active-sessions-exist session-buf elt)
1484 (setq elt (car meta-list)
1485 meta-list (cdr meta-list)
1486 session-buf (ediff-get-session-buffer elt))
1488 (if (eq (ediff-get-session-status elt) from)
1490 (setq numMarked (1+ numMarked))
1491 (if (and (eq to ?I) (buffer-live-p session-buf))
1492 ;; shouldn't hide active sessions
1493 (setq active-sessions-exist t)
1494 (ediff-set-session-status elt to)))))
1496 (ediff-update-meta-buffer grp-buf 'must-redraw)
1499 (message "Nothing to reveal...")
1500 (message "Nothing to hide...")))
1501 (if active-sessions-exist
1502 (message "Note: Ediff didn't hide active sessions!"))
1505 ;; Apply OPERATION to marked sessions. Operation expects one argument of type
1506 ;; meta-list member (not the first one), i.e., a regular session description.
1507 ;; Returns number of marked sessions on which operation was performed
1508 (defun ediff-operate-on-marked-sessions (operation)
1509 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1510 (meta-list (cdr ediff-meta-list))
1514 (diff-buffer ediff-meta-diff-buffer)
1517 (setq elt (car meta-list)
1518 meta-list (cdr meta-list)
1519 sessionNum (1+ sessionNum))
1520 (cond ((eq (ediff-get-session-status elt) marksym)
1522 (setq numMarked (1+ numMarked))
1523 (funcall operation elt sessionNum)))
1524 ;; The following goes into a session represented by a subdirectory
1525 ;; and applies operation to marked sessions there
1526 ((and (ediff-meta-session-p elt)
1527 (ediff-buffer-live-p
1528 (setq session-buf (ediff-get-session-buffer elt))))
1531 (ediff-with-current-buffer session-buf
1532 ;; pass meta-diff along
1533 (setq ediff-meta-diff-buffer diff-buffer)
1534 ;; collect diffs in child group
1535 (ediff-operate-on-marked-sessions operation)))))))
1536 (ediff-update-meta-buffer grp-buf 'must-redraw) ; just in case
1540 (defun ediff-append-custom-diff (session sessionNum)
1541 (or (ediff-collect-diffs-metajob)
1542 (error "Can't compute multifile patch in this context"))
1543 (let ((session-buf (ediff-get-session-buffer session))
1544 (meta-diff-buff ediff-meta-diff-buffer)
1545 (metajob ediff-metajob-name)
1546 tmp-buf custom-diff-buf)
1547 (if (ediff-buffer-live-p session-buf)
1548 (ediff-with-current-buffer session-buf
1549 (if (eq ediff-control-buffer session-buf) ; individual session
1551 (ediff-compute-custom-diffs-maybe)
1552 (setq custom-diff-buf ediff-custom-diff-buffer)))))
1554 (or (ediff-buffer-live-p meta-diff-buff)
1555 (error "Ediff: something wrong--killed multiple diff's buffer"))
1557 (cond ((ediff-buffer-live-p custom-diff-buf)
1558 ;; for live session buffers we do them first because the user may
1559 ;; have changed them with respect to the underlying files
1561 (set-buffer meta-diff-buff)
1562 (goto-char (point-max))
1563 (insert-buffer custom-diff-buf)
1565 ;; if ediff session is not live, run diff directly on the files
1566 ((memq metajob '(ediff-directories
1567 ediff-merge-directories
1568 ediff-merge-directories-with-ancestor))
1569 ;; get diffs by calling shell command on ediff-custom-diff-program
1571 (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
1574 (format "%s %s %s %s"
1575 ediff-custom-diff-program ediff-custom-diff-options
1576 (ediff-get-session-objA-name session)
1577 (ediff-get-session-objB-name session))
1580 (set-buffer meta-diff-buff)
1581 (goto-char (point-max))
1582 (insert-buffer tmp-buf)
1585 (ediff-kill-buffer-carefully meta-diff-buff)
1586 (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum )))
1589 (defun ediff-collect-custom-diffs ()
1590 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
1591 This operation is defined only for `ediff-directories' and
1592 `ediff-directory-revisions', since its intent is to produce
1593 multifile patches. For `ediff-directory-revisions', we insist that
1594 all marked sessions must be active."
1596 (or (ediff-buffer-live-p ediff-meta-diff-buffer)
1597 (setq ediff-meta-diff-buffer
1599 (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
1600 (ediff-with-current-buffer ediff-meta-diff-buffer
1601 (setq buffer-read-only nil)
1603 (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
1606 (display-buffer ediff-meta-diff-buffer 'not-this-window)
1607 (ediff-with-current-buffer ediff-meta-diff-buffer
1608 (set-buffer-modified-p nil)
1609 (setq buffer-read-only t)))
1611 (message "No marked sessions found")))
1613 (defun ediff-meta-show-patch ()
1614 "Show the multi-file patch associated with this group session."
1616 (let* ((pos (ediff-event-point last-command-event))
1617 (meta-buf (ediff-event-buffer last-command-event))
1618 (info (ediff-get-meta-info meta-buf pos 'noerror))
1619 (patchbuffer ediff-meta-patchbufer))
1620 (if (ediff-buffer-live-p patchbuffer)
1621 (ediff-with-current-buffer patchbuffer
1626 (ediff-get-session-objB-name info)
1627 (ediff-get-session-objC-name info)))
1628 (set-buffer (get-buffer-create ediff-tmp-buffer))
1630 (insert-buffer patchbuffer)
1631 (display-buffer ediff-tmp-buffer 'not-this-window)
1633 (error "The patch buffer wasn't found"))))
1636 ;; This function executes in meta buffer. It knows where event happened.
1637 (defun ediff-filegroup-action ()
1638 "Execute appropriate action for a selected session."
1640 (let* ((pos (ediff-event-point last-command-event))
1641 (meta-buf (ediff-event-buffer last-command-event))
1642 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1643 (info (ediff-get-meta-info meta-buf pos))
1644 (session-buf (ediff-get-session-buffer info))
1645 (session-number (ediff-get-session-number-at-pos pos meta-buf))
1646 merge-autostore-dir file1 file2 file3 regexp)
1648 (setq file1 (ediff-get-session-objA-name info)
1649 file2 (ediff-get-session-objB-name info)
1650 file3 (ediff-get-session-objC-name info))
1652 ;; make sure we don't start on hidden sessions
1653 ;; ?H means marked for hiding. ?I means invalid (hidden).
1654 (if (memq (ediff-get-session-status info) '(?I))
1657 (if (y-or-n-p "This session is marked as hidden, unmark? ")
1659 (ediff-set-session-status info nil)
1660 (ediff-update-meta-buffer meta-buf nil session-number))
1661 (error "Aborted"))))
1663 (ediff-with-current-buffer meta-buf
1664 (setq merge-autostore-dir
1665 (ediff-get-group-merge-autostore-dir ediff-meta-list))
1666 (goto-char pos) ; if the user clicked on session--move point there
1667 ;; First handle sessions involving directories (which are themselves
1669 ;; After that handle individual sessions
1670 (cond ((ediff-meta-session-p info)
1671 ;; do ediff/ediff-merge on subdirectories
1672 (if (ediff-buffer-live-p session-buf)
1673 (ediff-show-meta-buffer session-buf)
1674 (setq regexp (read-string "Filter through regular expression: "
1675 nil 'ediff-filtering-regexp-history))
1676 (ediff-directories-internal
1677 file1 file2 file3 regexp
1678 ediff-session-action-function
1680 ;; make it update (car info) after startup
1682 ;; child session group should know its parent
1683 (setq ediff-parent-meta-buffer
1684 (quote ,ediff-meta-buffer)
1685 ediff-meta-session-number
1687 ;; and parent will know its child
1688 (setcar (quote ,info) ediff-meta-buffer))))))
1690 ;; Do ediff-revision on a subdirectory
1691 ((and (ediff-one-filegroup-metajob)
1692 (ediff-revision-metajob)
1693 (file-directory-p file1))
1694 (if (ediff-buffer-live-p session-buf)
1695 (ediff-show-meta-buffer session-buf)
1696 (setq regexp (read-string "Filter through regular expression: "
1697 nil 'ediff-filtering-regexp-history))
1698 (ediff-directory-revisions-internal
1700 ediff-session-action-function ediff-metajob-name
1701 ;; make it update (car info) after startup
1703 ;; child session group should know its parent and
1705 (setq ediff-parent-meta-buffer
1706 (quote ,ediff-meta-buffer)
1707 ediff-meta-session-number
1709 ;; and parent will know its child
1710 (setcar (quote ,info) ediff-meta-buffer))))))
1712 ;; From here on---only individual session handlers
1714 ;; handle an individual session with a live control buffer
1715 ((ediff-buffer-live-p session-buf)
1716 (ediff-with-current-buffer session-buf
1717 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1718 (ediff-recenter 'no-rehighlight)))
1720 ((ediff-problematic-session-p info)
1723 "This session has no ancestor. Merge without the ancestor? ")
1726 ;; provide startup hooks
1729 'ediff-after-quit-hook-internal
1731 (if (ediff-buffer-live-p ,(current-buffer))
1732 (ediff-show-meta-buffer
1733 ,(current-buffer) ,session-number)))
1735 (setq ediff-meta-buffer ,(current-buffer)
1736 ediff-meta-session-number
1738 (setq ediff-merge-store-file
1739 ,(if (ediff-nonempty-string-p
1740 merge-autostore-dir)
1743 ediff-merge-filename-prefix
1744 (file-name-nondirectory file1))
1746 ;; make ediff-startup pass
1747 ;; ediff-control-buffer back to the meta
1750 (quote ,info) ediff-control-buffer))))
1752 ((ediff-one-filegroup-metajob) ; needs 1 file arg
1753 (funcall ediff-session-action-function
1755 ;; provide startup hooks
1758 'ediff-after-quit-hook-internal
1760 (if (ediff-buffer-live-p
1762 (ediff-show-meta-buffer
1766 (setq ediff-meta-buffer ,(current-buffer)
1767 ediff-meta-session-number
1769 (setq ediff-merge-store-file
1770 ,(if (ediff-nonempty-string-p
1771 merge-autostore-dir)
1774 ediff-merge-filename-prefix
1775 (file-name-nondirectory file1))) )
1776 ;; make ediff-startup pass
1777 ;; ediff-control-buffer back to the meta
1780 (quote ,info) ediff-control-buffer)))))
1781 ((not (ediff-metajob3)) ; need 2 file args
1782 (funcall ediff-session-action-function
1784 ;; provide startup hooks
1787 'ediff-after-quit-hook-internal
1789 (if (ediff-buffer-live-p
1791 (ediff-show-meta-buffer
1795 (setq ediff-meta-buffer ,(current-buffer)
1796 ediff-meta-session-number
1798 (setq ediff-merge-store-file
1799 ,(if (ediff-nonempty-string-p
1800 merge-autostore-dir)
1803 ediff-merge-filename-prefix
1804 (file-name-nondirectory file1))) )
1805 ;; make ediff-startup pass
1806 ;; ediff-control-buffer back to the meta
1809 (quote ,info) ediff-control-buffer)))))
1810 ((ediff-metajob3) ; need 3 file args
1811 (funcall ediff-session-action-function
1813 ;; arrange startup hooks
1816 'ediff-after-quit-hook-internal
1818 (if (ediff-buffer-live-p
1820 (ediff-show-meta-buffer
1824 (setq ediff-merge-store-file
1825 ,(if (ediff-nonempty-string-p
1826 merge-autostore-dir)
1829 ediff-merge-filename-prefix
1830 (file-name-nondirectory file1))) )
1831 (setq ediff-meta-buffer , (current-buffer)
1832 ediff-meta-session-number
1834 ;; this arranges that ediff-startup will pass
1835 ;; the value of ediff-control-buffer back to
1836 ;; the meta level, to the record in the meta
1837 ;; list containing the information about the
1838 ;; session associated with that
1839 ;; ediff-control-buffer
1841 (quote ,info) ediff-control-buffer)))))
1843 ) ; eval in meta-buf
1846 (defun ediff-registry-action ()
1847 "Switch to a selected session."
1849 (let* ((pos (ediff-event-point last-command-event))
1850 (buf (ediff-event-buffer last-command-event))
1851 (ctl-buf (ediff-get-meta-info buf pos)))
1853 (if (ediff-buffer-live-p ctl-buf)
1854 ;; check if this is ediff-control-buffer or ediff-meta-buffer
1855 (if (ediff-with-current-buffer ctl-buf
1856 (eq (key-binding "q") 'ediff-quit-meta-buffer))
1857 ;; it's a meta-buffer -- last action should just display it
1858 (ediff-show-meta-buffer ctl-buf t)
1859 ;; it's a session buffer -- invoke go back to session
1860 (ediff-with-current-buffer ctl-buf
1861 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1862 (ediff-recenter 'no-rehighlight)))
1864 (message "You've selected a stale session --- try again")
1865 (ediff-update-registry))
1866 (ediff-with-current-buffer buf
1871 ;; If session number is t, means don't update meta buffer
1872 (defun ediff-show-meta-buffer (&optional meta-buf session-number)
1873 "Show the session group buffer."
1875 (run-hooks 'ediff-before-directory-setup-hooks)
1876 (let (wind frame silent)
1877 (if meta-buf (setq silent t))
1879 (setq meta-buf (or meta-buf ediff-meta-buffer))
1880 (cond ((not (bufferp meta-buf))
1881 (error "This Ediff session is not part of a session group"))
1882 ((not (ediff-buffer-live-p meta-buf))
1884 "Can't find this session's group panel -- session itself is ok")))
1886 (cond ((numberp session-number)
1887 (ediff-update-meta-buffer meta-buf nil session-number))
1888 ;; if session-number is t, don't update
1890 (t (ediff-cleanup-meta-buffer meta-buf)))
1892 (ediff-with-current-buffer meta-buf
1894 (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
1897 "Already showing the group panel for this session"))
1898 (set-window-buffer wind meta-buf)
1899 (select-window wind))
1900 ((window-live-p (setq wind ediff-window-C)) ;in merge--merge buf
1901 (set-window-buffer ediff-window-C meta-buf)
1902 (select-window wind))
1903 ((window-live-p (setq wind ediff-window-A))
1904 (set-window-buffer ediff-window-A meta-buf)
1905 (select-window wind))
1906 ((window-live-p (setq wind ediff-window-B))
1907 (set-window-buffer ediff-window-B meta-buf)
1908 (select-window wind))
1911 (ediff-get-visible-buffer-window ediff-registry-buffer))
1912 (ediff-window-display-p))
1913 (select-window wind)
1915 (set-window-buffer (selected-window) meta-buf))
1916 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
1917 (set-window-buffer (selected-window) meta-buf)))
1919 (if (and (ediff-window-display-p)
1921 (setq wind (ediff-get-visible-buffer-window meta-buf))))
1923 (setq frame (window-frame wind))
1925 (ediff-reset-mouse frame)))
1926 (sit-for 0) ; sometimes needed to synch the display and ensure that the
1927 ; point ends up after the just completed session
1928 (run-hooks 'ediff-show-session-group-hook)
1931 (defun ediff-show-current-session-meta-buffer ()
1933 (ediff-show-meta-buffer nil ediff-meta-session-number))
1935 (defun ediff-show-meta-buff-from-registry ()
1936 "Display the session group buffer for a selected session group."
1938 (let* ((pos (ediff-event-point last-command-event))
1939 (meta-buf (ediff-event-buffer last-command-event))
1940 (info (ediff-get-meta-info meta-buf pos))
1941 (meta-or-session-buf info))
1942 (ediff-with-current-buffer meta-or-session-buf
1943 (ediff-show-meta-buffer nil t))))
1946 (defun ediff-show-registry ()
1947 "Display Ediff's registry."
1949 (ediff-update-registry)
1950 (if (not (ediff-buffer-live-p ediff-registry-buffer))
1951 (error "No active Ediff sessions or corrupted session registry"))
1953 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
1955 (ediff-with-current-buffer ediff-registry-buffer
1958 (ediff-get-visible-buffer-window ediff-registry-buffer))
1959 (message "Already showing the registry")
1960 (set-window-buffer wind ediff-registry-buffer)
1961 (select-window wind))
1962 ((window-live-p ediff-window-C)
1963 (set-window-buffer ediff-window-C ediff-registry-buffer)
1964 (select-window ediff-window-C))
1965 ((window-live-p ediff-window-A)
1966 (set-window-buffer ediff-window-A ediff-registry-buffer)
1967 (select-window ediff-window-A))
1968 ((window-live-p ediff-window-B)
1969 (set-window-buffer ediff-window-B ediff-registry-buffer)
1970 (select-window ediff-window-B))
1972 (ediff-get-visible-buffer-window ediff-meta-buffer))
1973 (ediff-window-display-p))
1974 (select-window wind)
1976 (set-window-buffer (selected-window) ediff-registry-buffer))
1977 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
1978 (set-window-buffer (selected-window) ediff-registry-buffer)))
1980 (if (ediff-window-display-p)
1984 (ediff-get-visible-buffer-window ediff-registry-buffer)))
1986 (ediff-reset-mouse frame)))
1987 (run-hooks 'ediff-show-registry-hook)
1991 (defalias 'eregistry 'ediff-show-registry)
1993 ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
1995 ;; Check if META-BUF exists before calling this function
1996 ;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
1997 ;; buffer. Otherwise, it will just go over the buffer and update activity marks
1998 ;; and session status.
1999 ;; SESSION-NUMBER, if specified, says which session caused the update.
2000 (defun ediff-update-meta-buffer (meta-buf &optional must-redraw session-number)
2001 (if (ediff-buffer-live-p meta-buf)
2002 (ediff-with-current-buffer meta-buf
2004 (cond (must-redraw ; completely redraw the meta buffer
2005 (funcall ediff-meta-redraw-function ediff-meta-list))
2006 ((numberp session-number) ; redraw only for the given session
2007 (ediff-update-session-marker-in-dir-meta-buffer
2009 (t ; update what changed only, but scan the entire meta buffer
2010 (ediff-update-markers-in-dir-meta-buffer ediff-meta-list)))
2011 (setq overl (ediff-get-meta-overlay-at-pos (point)))
2012 ;; skip the invisible sessions
2013 (while (and overl (ediff-overlay-get overl 'invisible))
2014 (ediff-next-meta-item1)
2015 (setq overl (ediff-get-meta-overlay-at-pos (point))))
2018 (defun ediff-update-registry ()
2019 (ediff-with-current-buffer (current-buffer)
2020 (if (ediff-buffer-live-p ediff-registry-buffer)
2021 (ediff-redraw-registry-buffer)
2022 (ediff-prepare-meta-buffer
2023 'ediff-registry-action
2024 ediff-session-registry
2026 'ediff-redraw-registry-buffer
2030 ;; If meta-buf exists, it is redrawn along with parent.
2031 ;; Otherwise, nothing happens.
2032 (defun ediff-cleanup-meta-buffer (meta-buffer)
2033 (if (ediff-buffer-live-p meta-buffer)
2034 (ediff-with-current-buffer meta-buffer
2035 (ediff-update-meta-buffer meta-buffer)
2036 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
2037 (ediff-update-meta-buffer
2038 ediff-parent-meta-buffer nil ediff-meta-session-number)))))
2040 ;; t if no session is in progress
2041 (defun ediff-safe-to-quit (meta-buffer)
2042 (if (ediff-buffer-live-p meta-buffer)
2043 (let ((lis ediff-meta-list)
2046 ;;(ediff-update-meta-buffer meta-buffer)
2047 (ediff-with-current-buffer meta-buffer
2048 (setq lis (cdr lis)) ; discard the description part of meta-list
2049 (while (and cont lis)
2050 (if (ediff-buffer-live-p
2051 (ediff-get-group-buffer lis)) ; in progress
2053 (setq lis (cdr lis)))
2056 (defun ediff-quit-meta-buffer ()
2057 "If the group has no active session, delete the meta buffer.
2058 If no session is in progress, ask to confirm before deleting meta buffer.
2059 Otherwise, bury the meta buffer.
2060 If this is a session registry buffer then just bury it."
2062 (let* ((buf (current-buffer))
2063 (dir-diffs-buffer ediff-dir-diffs-buffer)
2064 (meta-diff-buffer ediff-meta-diff-buffer)
2065 (session-number ediff-meta-session-number)
2066 (parent-buf ediff-parent-meta-buffer)
2067 (dont-show-registry (eq buf ediff-registry-buffer)))
2068 (if dont-show-registry
2070 ;;(ediff-cleanup-meta-buffer buf)
2071 (cond ((and (ediff-safe-to-quit buf)
2072 (y-or-n-p "Quit this session group? "))
2073 (run-hooks 'ediff-quit-session-group-hook)
2075 (ediff-dispose-of-meta-buffer buf))
2076 ((ediff-safe-to-quit buf)
2080 "This session group has active sessions---cannot exit")))
2081 (ediff-update-meta-buffer parent-buf nil session-number)
2082 (ediff-kill-buffer-carefully dir-diffs-buffer)
2083 (ediff-kill-buffer-carefully meta-diff-buffer)
2084 (if (ediff-buffer-live-p parent-buf)
2086 (setq dont-show-registry t)
2087 (ediff-show-meta-buffer parent-buf session-number)))
2089 (or dont-show-registry
2090 (ediff-show-registry))))
2092 (defun ediff-dispose-of-meta-buffer (buf)
2093 (setq ediff-session-registry (delq buf ediff-session-registry))
2094 (ediff-with-current-buffer buf
2095 (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
2096 (kill-buffer ediff-dir-diffs-buffer)))
2100 ;; Obtain information on a meta record where the user clicked or typed
2101 ;; BUF is the buffer where this happened and POINT is the position
2102 ;; If optional NOERROR arg is given, don't report error and return nil if no
2103 ;; meta info is found on line.
2104 (defun ediff-get-meta-info (buf point &optional noerror)
2105 (let (result olist tmp)
2106 (if (and point (ediff-buffer-live-p buf))
2107 (ediff-with-current-buffer buf
2108 (ediff-cond-compile-for-xemacs-or-emacs
2109 (setq result ; xemacs
2110 (if (setq tmp (extent-at point buf 'ediff-meta-info))
2111 (ediff-overlay-get tmp 'ediff-meta-info)))
2113 (setq olist (overlays-at point))
2115 (mapcar (lambda (elt)
2116 (unless (overlay-get elt 'invisible)
2117 (overlay-get elt 'ediff-meta-info)))
2119 (while (and olist (null (car olist)))
2120 (setq olist (cdr olist)))
2121 (setq result (car olist)))
2128 (ediff-update-registry)
2129 (error "No session info in this line")))))
2132 (defun ediff-get-meta-overlay-at-pos (point)
2133 (ediff-cond-compile-for-xemacs-or-emacs
2134 (extent-at point (current-buffer) 'ediff-meta-info) ; xemacs
2136 (let* ((overl-list (overlays-at point))
2137 (overl (car overl-list)))
2138 (while (and overl (null (overlay-get overl 'ediff-meta-info)))
2139 (setq overl-list (cdr overl-list)
2140 overl (car overl-list)))
2145 (defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
2146 (setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
2149 (ediff-with-current-buffer meta-buffer
2151 (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number)))
2154 ;; Return location of the next meta overlay after point
2155 (defun ediff-next-meta-overlay-start (point)
2157 (goto-char (point-min))
2158 (let ((overl (ediff-get-meta-overlay-at-pos point)))
2159 (ediff-cond-compile-for-xemacs-or-emacs
2162 (setq overl (next-extent overl))
2163 (setq overl (next-extent (current-buffer))))
2165 (extent-start-position overl)
2169 ;; note: end of current overlay is the beginning of the next one
2171 (next-overlay-change point))
2177 (defun ediff-previous-meta-overlay-start (point)
2179 (goto-char (point-max))
2180 (let ((overl (ediff-get-meta-overlay-at-pos point)))
2181 (ediff-cond-compile-for-xemacs-or-emacs
2184 (setq overl (previous-extent overl))
2185 (setq overl (previous-extent (current-buffer))))
2187 (extent-start-position overl)
2190 (if overl (setq point (overlay-start overl)))
2191 ;; to get to the beginning of prev overlay
2193 ;; trick to overcome an emacs bug--doesn't always find previous
2194 ;; overlay change correctly
2195 (setq point (1- point)))
2196 (setq point (previous-overlay-change point))
2197 ;; If we are not over an overlay after subtracting 1, it means we are
2198 ;; in the description area preceding session records. In this case,
2199 ;; goto the top of the registry buffer.
2200 (or (car (overlays-at point))
2201 (setq point (point-min)))
2206 ;; this is the action invoked when the user selects a patch from the meta
2208 (defun ediff-patch-file-form-meta (file &optional startup-hooks)
2209 (let* ((pos (ediff-event-point last-command-event))
2210 (meta-buf (ediff-event-buffer last-command-event))
2211 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
2212 (info (ediff-get-meta-info meta-buf pos))
2213 (meta-patchbuf ediff-meta-patchbufer)
2214 session-buf beg-marker end-marker)
2216 (if (or (file-directory-p file) (string-match "/dev/null" file))
2217 (error "`%s' is not an ordinary file" (file-name-as-directory file)))
2218 (setq session-buf (ediff-get-session-buffer info)
2219 beg-marker (ediff-get-session-objB-name info)
2220 end-marker (ediff-get-session-objC-name info))
2222 (or (ediff-buffer-live-p session-buf) ; either an active patch session
2223 (null session-buf) ; or it is a virgin session
2225 "Patch has been already applied to this file--cannot be repeated!"))
2227 (ediff-with-current-buffer meta-patchbuf
2230 (narrow-to-region beg-marker end-marker)
2231 (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
2234 (defun ediff-unmark-all-for-operation ()
2235 "Unmark all sessions marked for operation."
2237 (let ((list (cdr ediff-meta-list))
2239 (while (setq elt (car list))
2240 (ediff-mark-session-for-operation elt 'unmark)
2241 (setq list (cdr list))))
2242 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2244 (defun ediff-unmark-all-for-hiding ()
2245 "Unmark all sessions marked for hiding."
2247 (let ((list (cdr ediff-meta-list))
2249 (while (setq elt (car list))
2250 (ediff-mark-session-for-hiding elt 'unmark)
2251 (setq list (cdr list))))
2252 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2255 ;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply
2256 ;; indicate which are equal files
2257 (defun ediff-meta-mark-equal-files (&optional action)
2258 "Run through the session list and mark identical files.
2259 This is used only for sessions that involve 2 or 3 files at the same time.
2260 ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
2261 for operation, or simply indicate which are equal files. If it is nil, then
2262 last-command-char is used to decide which action to take."
2265 (setq action last-command-char))
2266 (let ((list (cdr ediff-meta-list))
2267 marked1 marked2 marked3
2268 fileinfo1 fileinfo2 fileinfo3 elt)
2269 (message "Comparing files ...")
2270 (while (setq elt (car list))
2271 (setq fileinfo1 (ediff-get-session-objA elt)
2272 fileinfo2 (ediff-get-session-objB elt)
2273 fileinfo3 (ediff-get-session-objC elt))
2274 (ediff-set-file-eqstatus fileinfo1 nil)
2275 (ediff-set-file-eqstatus fileinfo2 nil)
2276 (ediff-set-file-eqstatus fileinfo3 nil)
2281 (or (ediff-mark-if-equal fileinfo1 fileinfo2)
2283 (if (ediff-metajob3)
2285 (or (ediff-mark-if-equal fileinfo1 fileinfo3)
2287 (or (ediff-mark-if-equal fileinfo2 fileinfo3)
2288 (setq marked3 nil))))
2289 (if (and marked1 marked2 marked3)
2290 (cond ((eq action ?h)
2291 (ediff-mark-session-for-hiding elt 'mark))
2293 (ediff-mark-session-for-operation elt 'mark))
2295 (setq list (cdr list)))
2296 (message "Comparing files ... Done"))
2297 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2299 ;; mark files 1 and 2 as equal, if they are.
2300 ;; returns t, if something was marked
2301 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
2302 (let ((f1 (car fileinfo1))
2303 (f2 (car fileinfo2)))
2304 (cond ((file-directory-p f1) nil)
2305 ((file-directory-p f2) nil)
2306 ((ediff-same-file-contents f1 f2)
2307 (ediff-set-file-eqstatus fileinfo1 t)
2308 (ediff-set-file-eqstatus fileinfo2 t)
2314 ;;; Local Variables:
2315 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
2316 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
2317 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
2320 ;;; ediff-mult.el ends here