1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
3 ;; Copyright (C) 1995, 96, 97, 98, 99, 2000, 01, 02, 05 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 ;; (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 (i.e., after the
47 ;; description header). See ediff-make-new-meta-list-element for the
48 ;; explanation of the two nil placeholders in such elements.
50 ;; There is API for extracting the components of the members of the
51 ;; above list. Search for `API for ediff-meta-list' for details.
53 ;; HEADER must be a list of SIX elements (nil or string):
54 ;; (regexp metaobj1 metaobj2 metaobj3 merge-save-buffer
55 ;; comparison-function)
56 ;; The function ediff-redraw-registry-buffer displays the
57 ;; 1st - 4th of these in the registry buffer.
58 ;; For some jobs some of the members of the header might be nil.
59 ;; The meaning of metaobj1, metaobj2, and metaobj3 depend on the job.
60 ;; Typically these are directories where the files to be compared are
62 ;; Also, keep in mind that the function ediff-prepare-meta-buffer
63 ;; (which see) prepends the session group buffer to the descriptor, so
64 ;; the descriptor becomes 7-long.
65 ;; Ediff expects that your function (in 2 above) will arrange to
66 ;; replace this prepended nil (via setcar) with the actual ediff
67 ;; control buffer associated with an appropriate Ediff session.
68 ;; This is arranged through internal startup hooks that can be passed
69 ;; to any of Ediff major entries (such as ediff-files, epatch, etc.).
70 ;; See how this is done in ediff-filegroup-action.
72 ;; Session descriptions are of the form
73 ;; (nil nil (obj1 . nil) (obj2 . nil) (obj3 . nil))
74 ;; which describe the objects relevant to the session.
75 ;; Use ediff-make-new-meta-list-element to create these things.
76 ;; Usually obj1/2/3 are names of files, but they may also be other
77 ;; things for some jobs. For instance, obj3 is nil for jobs that
78 ;; involve only two files. For patch jobs, obj2 and obj3 are markers
79 ;; that specify the patch corresponding to the file
80 ;; (whose name is obj1).
81 ;; The nil's are placeholders, which are used internally by ediff.
82 ;; 4. Write a function that makes a call to ediff-prepare-meta-buffer
83 ;; passing all this info.
84 ;; You may be able to use ediff-directories-internal as a template.
85 ;; 5. If you intend to add several related pieces of functionality,
86 ;; you may want to keep the function in 4 as an internal version
87 ;; and then write several top-level interactive functions that call it
88 ;; with different parameters.
89 ;; See how ediff-directories, ediff-merge-directories, and
90 ;; ediff-merge-directories-with-ancestor all use
91 ;; ediff-directories-internal.
93 ;; A useful addition here could be session groups selected by patterns
94 ;; (which are different in each directory). For instance, one may want to
95 ;; compare files of the form abc{something}.c to files old{something}.d
96 ;; which may be in the same or different directories. Or, one may want to
97 ;; compare all files of the form {something} to files of the form {something}~.
99 ;; Implementing this requires writing a collating function, which should pair
100 ;; up appropriate files. It will also require a generalization of the
101 ;; functions that do the layout of the meta- and differences buffers and of
102 ;; ediff-filegroup-action.
106 (provide 'ediff-mult
)
108 (defgroup ediff-mult nil
109 "Multi-file and multi-buffer processing in Ediff"
116 (let ((load-path (cons (expand-file-name ".") load-path
)))
117 (or (featurep 'ediff-init
)
118 (load "ediff-init.el" nil nil
'nosuffix
))
119 (or (featurep 'ediff-util
)
120 (load "ediff-util.el" nil nil
'nosuffix
))
124 (require 'ediff-init
)
125 (require 'ediff-util
)
128 (ediff-defvar-local ediff-meta-buffer nil
"")
129 (ediff-defvar-local ediff-parent-meta-buffer nil
"")
130 ;; the registry buffer
131 (defvar ediff-registry-buffer nil
)
133 (defconst ediff-meta-buffer-message
"This is an Ediff Session Group Panel: %s
136 button2, v, or RET over session record: start that Ediff session
137 M:\tin sessions invoked from here, brings back this group panel
138 R:\tdisplay the registry of active Ediff sessions
139 h:\tmark session for hiding (toggle)
140 x:\thide marked sessions; with prefix arg: unhide
141 m:\tmark session for a non-hiding operation (toggle)
142 uh/um:\tunmark all sessions marked for hiding/operation
144 p,DEL:\tprevious session
145 E:\tbrowse Ediff on-line manual
146 T:\ttoggle truncation of long file names
147 q:\tquit this session group
150 (ediff-defvar-local ediff-meta-buffer-map nil
151 "The keymap for the meta buffer.")
152 (defvar ediff-dir-diffs-buffer-map
(make-sparse-keymap)
153 "The keymap to be installed in the buffer showing differences between
156 ;; Variable specifying the action to take when the use invokes ediff in the
157 ;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action
158 (ediff-defvar-local ediff-meta-action-function nil
"")
159 ;; Tells ediff-update-meta-buffer how to redraw it
160 (ediff-defvar-local ediff-meta-redraw-function nil
"")
161 ;; Tells ediff-filegroup-action and similar procedures how to invoke Ediff for
162 ;; the sessions in a given session group
163 (ediff-defvar-local ediff-session-action-function nil
"")
165 (ediff-defvar-local ediff-metajob-name nil
"")
167 ;; buffer used to collect custom diffs from individual sessions in the group
168 (ediff-defvar-local ediff-meta-diff-buffer nil
"")
170 ;; t means recurse into subdirs when deciding which files have same contents
171 (ediff-defvar-local ediff-recurse-to-subdirectories nil
"")
173 ;; history var to use for filtering groups of files
174 (defvar ediff-filtering-regexp-history nil
"")
176 (defcustom ediff-default-filtering-regexp nil
177 "The default regular expression used as a filename filter in multifile comparisons.
178 Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil."
182 ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
183 ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
184 ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
185 ;; . eq-status)) ...)
186 ;; If ctl-buf is nil, the file-pair hasn't processed yet. If it is
187 ;; killed-buffer object, the file pair has been processed. If it is a live
188 ;; buffer, this means ediff is still working on the pair.
189 ;; Eq-status of a file is t if the file equals some other file in the same
191 (ediff-defvar-local ediff-meta-list nil
"")
193 (ediff-defvar-local ediff-meta-session-number nil
"")
196 ;; the difference list between directories in a directory session group
197 (ediff-defvar-local ediff-dir-difference-list nil
"")
198 (ediff-defvar-local ediff-dir-diffs-buffer nil
"")
200 ;; The registry of Ediff sessions. A list of control buffers.
201 (defvar ediff-session-registry nil
)
203 (defcustom ediff-meta-truncate-filenames t
204 "*If non-nil, truncate long file names in the session group buffers.
205 This can be toggled with `ediff-toggle-filename-truncation'."
208 (defcustom ediff-registry-setup-hook nil
209 "*Hooks run just after the registry control panel is set up."
213 (defcustom ediff-before-session-group-setup-hooks nil
214 "*Hooks to run before Ediff arranges the window for group-level operations.
215 It is used by commands such as ediff-directories.
216 This hook can be used to save the previous window config, which can be restored
217 on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook."
220 (defcustom ediff-after-session-group-setup-hook nil
221 "*Hooks run just after a meta-buffer controlling a session group, such as
222 ediff-directories, is run."
225 (defcustom ediff-quit-session-group-hook nil
226 "*Hooks run just before exiting a session group."
229 (defcustom ediff-show-registry-hook nil
230 "*Hooks run just after the registry buffer is shown."
233 (defcustom ediff-show-session-group-hook
'(delete-other-windows)
234 "*Hooks run just after a session group buffer is shown."
237 (defcustom ediff-meta-buffer-keymap-setup-hook nil
238 "*Hooks run just after setting up the ediff-meta-buffer-map.
239 This keymap controls key bindings in the meta buffer and is a local variable.
240 This means that you can set different bindings for different kinds of meta
245 ;; Buffer holding the multi-file patch. Local to the meta buffer
246 (ediff-defvar-local ediff-meta-patchbufer nil
"")
248 ;;; API for ediff-meta-list
250 ;; A meta-list is either ediff-meta-list, which contains a header and the list
251 ;; of ediff sessions or ediff-dir-difference-list, which is a header followed
252 ;; by the list of differences among the directories (i.e., files that are not
253 ;; in all directories). The header is the same in all meta lists, but the rest
255 ;; Structure of the meta-list:
256 ;; (HEADER SESSION1 SESSION2 ...)
257 ;; HEADER: (GROUP-BUF REGEXP OBJA OBJB OBJC SAVE-DIR COMPARISON-FUNC)
258 ;; OBJA - first directory
259 ;; OBJB - second directory
260 ;; OBJC - third directory
261 ;; SESSION1/2/... are described below
262 ;; group buffer/regexp
263 (defsubst ediff-get-group-buffer
(meta-list)
264 (nth 0 (car meta-list
)))
266 (defsubst ediff-get-group-regexp
(meta-list)
267 (nth 1 (car meta-list
)))
269 (defsubst ediff-get-group-objA
(meta-list)
270 (nth 2 (car meta-list
)))
271 (defsubst ediff-get-group-objB
(meta-list)
272 (nth 3 (car meta-list
)))
273 (defsubst ediff-get-group-objC
(meta-list)
274 (nth 4 (car meta-list
)))
275 (defsubst ediff-get-group-merge-autostore-dir
(meta-list)
276 (nth 5 (car meta-list
)))
277 (defsubst ediff-get-group-comparison-func
(meta-list)
278 (nth 6 (car meta-list
)))
280 ;; ELT is a session meta descriptor (what is being preserved as
282 ;; The structure is: (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
283 ;; STATUS is ?I (hidden or invalid), ?* (marked for operation), ?H (hidden)
285 ;; OBJA/B/C is (FILENAME EQSTATUS)
286 ;; EQSTATUS is ?= or nil (?= means that this file is equal to some other
287 ;; file in this session)
289 (defsubst ediff-get-session-buffer
(elt)
291 (defsubst ediff-get-session-status
(elt)
293 (defsubst ediff-set-session-status
(session-info new-status
)
294 (setcar (cdr session-info
) new-status
))
296 (defsubst ediff-get-session-objA
(elt)
298 (defsubst ediff-get-session-objB
(elt)
300 (defsubst ediff-get-session-objC
(elt)
302 ;; Take the "name" component of the object into acount. ObjA/C/B is of the form
303 ;; (name . equality-indicator)
304 (defsubst ediff-get-session-objA-name
(elt)
306 (defsubst ediff-get-session-objB-name
(elt)
308 (defsubst ediff-get-session-objC-name
(elt)
310 ;; equality indicators
311 (defsubst ediff-get-file-eqstatus
(elt)
313 (defsubst ediff-set-file-eqstatus
(elt value
)
314 (setcar (cdr elt
) value
))
316 ;; Create a new element for the meta list out of obj1/2/3, which usually are
319 ;; The first nil in such an element is later replaced with the session buffer.
320 ;; The second nil is reserved for session status.
322 ;; Also, session objects A/B/C are turned into lists of the form (obj nil).
323 ;; This nil is a placeholder for eq-indicator. It is either nil or =.
324 ;; If it is discovered that this file is = to some other
325 ;; file in the same session, eq-indicator is changed to `='.
326 ;; Curently, the eq-indicator is used only for 2 and 3-file jobs.
327 (defun ediff-make-new-meta-list-element (obj1 obj2 obj3
)
328 (list nil nil
(list obj1 nil
) (list obj2 nil
) (list obj3 nil
)))
330 ;; Constructs a meta list header.
331 ;; OBJA, OBJB, OBJC are usually directories involved, but can be different for
332 ;; different jobs. For instance, multifile patch has only OBJA, which is the
334 (defun ediff-make-new-meta-list-header (regexp
338 (list regexp objA objB objC merge-auto-store-dir comparison-func
))
340 ;; The activity marker is either or + (active session, i.e., ediff is currently
341 ;; run in it), or - (finished session, i.e., we've ran ediff in it and then
342 ;; exited). Return nil, if session is neither active nor finished
343 (defun ediff-get-session-activity-marker (session)
344 (let ((session-buf (ediff-get-session-buffer session
)))
345 (cond ((null session-buf
) nil
) ; virgin session
346 ((ediff-buffer-live-p session-buf
) ?
+) ;active session
349 ;; checks if the session is a meta session
350 (defun ediff-meta-session-p (session-info)
351 (and (stringp (ediff-get-session-objA-name session-info
))
352 (file-directory-p (ediff-get-session-objA-name session-info
))
353 (stringp (ediff-get-session-objB-name session-info
))
354 (file-directory-p (ediff-get-session-objB-name session-info
))
355 (if (stringp (ediff-get-session-objC-name session-info
))
356 (file-directory-p (ediff-get-session-objC-name session-info
)) t
)))
358 ;; set up the keymap in the meta buffer
359 (defun ediff-setup-meta-map()
360 (setq ediff-meta-buffer-map
(make-sparse-keymap))
361 (suppress-keymap ediff-meta-buffer-map
)
362 (define-key ediff-meta-buffer-map
"q" 'ediff-quit-meta-buffer
)
363 (define-key ediff-meta-buffer-map
"T" 'ediff-toggle-filename-truncation
)
364 (define-key ediff-meta-buffer-map
"R" 'ediff-show-registry
)
365 (define-key ediff-meta-buffer-map
"E" 'ediff-documentation
)
366 (define-key ediff-meta-buffer-map
"v" ediff-meta-action-function
)
367 (define-key ediff-meta-buffer-map
"\C-m" ediff-meta-action-function
)
368 (define-key ediff-meta-buffer-map
" " 'ediff-next-meta-item
)
369 (define-key ediff-meta-buffer-map
"n" 'ediff-next-meta-item
)
370 (define-key ediff-meta-buffer-map
"\C-?" 'ediff-previous-meta-item
)
371 (define-key ediff-meta-buffer-map
"p" 'ediff-previous-meta-item
)
372 (define-key ediff-meta-buffer-map
[delete] 'ediff-previous-meta-item)
373 (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item)
374 (or (ediff-one-filegroup-metajob)
376 (define-key ediff-meta-buffer-map "=" nil)
377 (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
378 (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
379 (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
380 (if ediff-no-emacs-help-in-control-buffer
381 (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item))
383 (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function)
384 (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function))
386 (use-local-map ediff-meta-buffer-map)
387 ;; modify ediff-meta-buffer-map here
388 (run-hooks 'ediff-meta-buffer-keymap-setup-hook))
391 (defun ediff-meta-mode ()
392 "This mode controls all operations on Ediff session groups.
393 It is entered through one of the following commands:
398 `ediff-merge-directories'
400 `ediff-merge-directories-with-ancestor'
401 `edirs-merge-with-ancestor'
402 `ediff-directory-revisions'
404 `ediff-merge-directory-revisions'
405 `edir-merge-revisions'
406 `ediff-merge-directory-revisions-with-ancestor'
407 `edir-merge-revisions-with-ancestor'
410 \\{ediff-meta-buffer-map}"
411 (kill-all-local-variables)
412 (setq major-mode 'ediff-meta-mode)
413 (setq mode-name "MetaEdiff"))
416 ;; the keymap for the buffer showing directory differences
417 (suppress-keymap ediff-dir-diffs-buffer-map)
418 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
419 (define-key ediff-dir-diffs-buffer-map " " 'next-line)
420 (define-key ediff-dir-diffs-buffer-map "n" 'next-line)
421 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)
422 (define-key ediff-dir-diffs-buffer-map "p" 'previous-line)
423 (define-key ediff-dir-diffs-buffer-map "C" 'ediff-dir-diff-copy-file)
425 (define-key ediff-dir-diffs-buffer-map [mouse-2] 'ediff-dir-diff-copy-file)
426 (define-key ediff-dir-diffs-buffer-map [button2] 'ediff-dir-diff-copy-file))
427 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line
)
428 (define-key ediff-dir-diffs-buffer-map
[backspace] 'previous-line)
430 (defun ediff-next-meta-item (count)
431 "Move to the next item in Ediff registry or session group buffer.
432 Moves in circular fashion. With numeric prefix arg, skip this many items."
434 (or count (setq count 1))
437 (setq count (1- count))
438 (ediff-next-meta-item1)
439 (setq overl (ediff-get-meta-overlay-at-pos (point)))
440 ;; skip invisible ones
441 (while (and overl (ediff-overlay-get overl 'invisible))
442 (ediff-next-meta-item1)
443 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
445 ;; Move to the next meta item
446 (defun ediff-next-meta-item1 ()
448 (setq pos (ediff-next-meta-overlay-start (point)))
449 (if pos (goto-char pos))
450 (if (eq ediff-metajob-name 'ediff-registry)
451 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
452 (search-forward "*Ediff" nil t))
453 (skip-chars-backward "a-zA-Z*"))
454 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
455 (backward-char 1)))))
458 (defun ediff-previous-meta-item (count)
459 "Move to the previous item in Ediff registry or session group buffer.
460 Moves in circular fashion. With numeric prefix arg, skip this many items."
462 (or count (setq count 1))
465 (setq count (1- count))
466 (ediff-previous-meta-item1)
467 (setq overl (ediff-get-meta-overlay-at-pos (point)))
468 ;; skip invisible ones
469 (while (and overl (ediff-overlay-get overl 'invisible))
470 (ediff-previous-meta-item1)
471 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
473 (defun ediff-previous-meta-item1 ()
475 (setq pos (ediff-previous-meta-overlay-start (point)))
477 ;;; (while (ediff-get-session-status
478 ;;; (ediff-get-meta-info (current-buffer) pos 'noerror))
479 ;;; (setq pos (ediff-previous-meta-overlay-start pos)))
481 (if pos (goto-char pos))
482 (if (eq ediff-metajob-name 'ediff-registry)
483 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
484 (search-forward "*Ediff" nil t))
485 (skip-chars-backward "a-zA-Z*"))
486 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
490 (defsubst ediff-add-slash-if-directory (dir file)
491 (if (file-directory-p (concat dir file))
492 (file-name-as-directory file)
495 (defun ediff-toggle-filename-truncation ()
496 "Toggle truncation of long file names in session group buffers.
497 Set `ediff-meta-truncate-filenames' variable if you want to change the default
500 (setq ediff-meta-truncate-filenames (not ediff-meta-truncate-filenames))
501 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
504 ;; These are used to encode membership of files in directory1/2/3
505 ;; Membership code of a file is a product of codes for the directories where
507 (defvar ediff-membership-code1 2)
508 (defvar ediff-membership-code2 3)
509 (defvar ediff-membership-code3 5)
510 (defvar ediff-product-of-memcodes (* ediff-membership-code1
511 ediff-membership-code2
512 ediff-membership-code3))
514 ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
515 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
517 ;; REGEXP is nil or a filter regexp; only file names that match the regexp
519 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
520 ;; included in the intersection. However, a regular file that is a dir in dir3
521 ;; is included, since dir3 files are supposed to be ancestors for merging.
522 ;; If COMPARISON-FUNC is given, use it. Otherwise, use string=
524 ;; Returns a list of the form:
525 ;; (COMMON-PART DIFF-LIST)
526 ;; COMMON-PART is car and DIFF-LIST is cdr.
528 ;; COMMON-PART is of the form:
529 ;; (META-HEADER (f1 f2 f3) (f1 f2 f3) ...)
530 ;; f3 can be nil if intersecting only 2 directories.
531 ;; Each triple (f1 f2 f3) represents the files to be compared in the
532 ;; corresponding ediff subsession.
534 ;; DIFF-LIST is of the form:
535 ;; (META-HEADER (file . num) (file . num)...)
536 ;; where num encodes the set of dirs where the file is found:
537 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.
539 ;; Contains the meta info about this ediff operation
540 ;; (regexp dir1 dir2 dir3 merge-auto-store-dir comparison-func)
541 ;; Later the meta-buffer is prepended to this list.
543 ;; Some operations might use a different meta header. For instance,
544 ;; ediff-multifile-patch doesn't have dir2 and dir3, and regexp,
545 ;; comparison-func don't apply.
547 (defun ediff-intersect-directories (jobname
550 dir3 merge-autostore-dir comparison-func)
551 (setq comparison-func (or comparison-func 'string=))
552 (let (lis1 lis2 lis3 common auxdir1 auxdir2 auxdir3 common-part difflist)
554 (setq auxdir1 (file-name-as-directory dir1)
555 lis1 (directory-files auxdir1 nil regexp)
556 lis1 (delete "." lis1)
557 lis1 (delete ".." lis1)
560 (ediff-add-slash-if-directory auxdir1 elt))
562 auxdir2 (file-name-as-directory dir2)
565 (ediff-add-slash-if-directory auxdir2 elt))
566 (directory-files auxdir2 nil regexp)))
569 (setq auxdir3 (file-name-as-directory dir3)
572 (ediff-add-slash-if-directory auxdir3 elt))
573 (directory-files auxdir3 nil regexp))))
575 (if (ediff-nonempty-string-p merge-autostore-dir)
576 (setq merge-autostore-dir
577 (file-name-as-directory merge-autostore-dir)))
578 (setq common (ediff-intersection lis1 lis2 comparison-func))
580 ;; In merge with ancestor jobs, we don't intersect with lis3.
581 ;; If there is no ancestor, we'll offer to merge without the ancestor.
582 ;; So, we intersect with lis3 only when we are doing 3-way file comparison
583 (if (and lis3 (ediff-comparison-metajob3 jobname))
584 (setq common (ediff-intersection common lis3 comparison-func)))
586 ;; copying is needed because sort sorts via side effects
587 (setq common (sort (ediff-copy-list common) 'string-lessp))
589 ;; compute difference list
590 (setq difflist (ediff-set-difference
591 (ediff-union (ediff-union lis1 lis2 comparison-func)
596 difflist (delete "." difflist)
597 ;; copying is needed because sort sorts via side effects
598 difflist (sort (ediff-copy-list (delete ".." difflist))
601 (setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist))
603 ;; check for files belonging to lis1/2/3
604 ;; Each elt is of the norm (file . number)
605 ;; Number encodes the directories to which file belongs.
606 ;; It is a product of a subset of ediff-membership-code1=2,
607 ;; ediff-membership-code2=3, and ediff-membership-code3=5.
608 ;; If file belongs to dir 1 only, the membership code is 2.
609 ;; If it is in dir1 and dir3, then the membership code is 2*5=10;
610 ;; if it is in dir1 and dir2, then the membership code is 2*3=6, etc.
611 (mapcar (lambda (elt)
612 (if (member (car elt) lis1)
613 (setcdr elt (* (cdr elt) ediff-membership-code1)))
614 (if (member (car elt) lis2)
615 (setcdr elt (* (cdr elt) ediff-membership-code2)))
616 (if (member (car elt) lis3)
617 (setcdr elt (* (cdr elt) ediff-membership-code3)))
621 ;; diff metalist header
622 (ediff-make-new-meta-list-header regexp
623 auxdir1 auxdir2 auxdir3
631 (ediff-make-new-meta-list-header regexp
632 auxdir1 auxdir2 auxdir3
637 (ediff-make-new-meta-list-element
642 ;; The following is done because: In merging with
643 ;; ancestor, we don't intersect with lis3. So, it is
644 ;; possible that elt is a file in auxdir1/2 but a
645 ;; directory in auxdir3 Or elt may not exist in auxdir3 at
646 ;; all. In the first case, we add a slash at the end. In
647 ;; the second case, we insert nil.
648 (setq elt (ediff-add-slash-if-directory auxdir3 elt))
649 (if (file-exists-p (concat auxdir3 elt))
650 (concat auxdir3 elt))))))
653 (cons common-part difflist)
656 ;; find directory files that are under revision. Include subdirectories, since
657 ;; we may visit them recursively. DIR1 is the directory to inspect.
658 ;; MERGE-AUTOSTORE-DIR is the directory where to auto-store the results of
659 ;; merges. Can be nil.
660 (defun ediff-get-directory-files-under-revision (jobname
662 &optional merge-autostore-dir)
663 (let (lis1 elt common auxdir1)
664 (setq auxdir1 (file-name-as-directory dir1)
665 lis1 (directory-files auxdir1 nil regexp))
667 (if (ediff-nonempty-string-p merge-autostore-dir)
668 (setq merge-autostore-dir
669 (file-name-as-directory merge-autostore-dir)))
674 ;; take files under revision control
675 (cond ((file-directory-p (concat auxdir1 elt))
677 (cons (ediff-add-slash-if-directory auxdir1 elt) common)))
678 ((and (featurep 'vc-hooks) (vc-backend (concat auxdir1 elt)))
679 (setq common (cons elt common)))
680 ;; The following two are needed only if vc-hooks isn't loaded.
681 ;; They won't recognize CVS files.
682 ((file-exists-p (concat auxdir1 elt ",v"))
683 (setq common (cons elt common)))
684 ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))
685 (setq common (cons elt common)))
689 (setq common (delete "./" common)
690 common (delete "../" common)
691 common (delete "RCS" common)
692 common (delete "CVS" common)
695 ;; copying is needed because sort sorts via side effects
696 (setq common (sort (ediff-copy-list common) 'string-lessp))
700 ;; header -- has 6 elements. Meta buffer is prepended later by
701 ;; ediff-prepare-meta-buffer
702 (ediff-make-new-meta-list-header regexp
704 merge-autostore-dir nil)
705 (mapcar (lambda (elt) (ediff-make-new-meta-list-element
706 (concat auxdir1 elt) nil nil))
711 ;; If file groups selected by patterns will ever be implemented, this
712 ;; comparison function might become useful.
713 ;;;; uses external variables PAT1 PAT2 to compare str1/2
714 ;;;; patterns must be of the form ???*???? where ??? are strings of chars
715 ;;;; containing no *.
716 ;;(defun ediff-pattern= (str1 str2)
717 ;; (let (pos11 pos12 pos21 pos22 len1 len2)
719 ;; len (length epat1)
721 ;; (while (and (< pos11 len) (not (= (aref epat1 pos11) ?*)))
722 ;; (setq pos11 (1+ pos11)))
723 ;; (while (and (> pos12 0) (not (= (aref epat1 (1- pos12)) ?*)))
724 ;; (setq pos12 (1- pos12)))
727 ;; len (length epat2)
729 ;; (while (and (< pos21 len) (not (= (aref epat2 pos21) ?*)))
730 ;; (setq pos21 (1+ pos21)))
731 ;; (while (and (> pos22 0) (not (= (aref epat2 (1- pos22)) ?*)))
732 ;; (setq pos22 (1- pos22)))
734 ;; (if (and (> (length str1) pos12) (>= pos12 pos11) (> pos11 -1)
735 ;; (> (length str2) pos22) (>= pos22 pos21) (> pos21 -1))
736 ;; (string= (substring str1 pos11 pos12)
737 ;; (substring str2 pos21 pos22)))
741 ;; Prepare meta-buffer in accordance with the argument-function and
742 ;; redraw-function. Must return the created meta-buffer.
743 (defun ediff-prepare-meta-buffer (action-func meta-list
744 meta-buffer-name redraw-function
745 jobname &optional startup-hooks)
746 (let* ((meta-buffer-name
747 (ediff-unique-buffer-name meta-buffer-name "*"))
748 (meta-buffer (get-buffer-create meta-buffer-name)))
749 (ediff-with-current-buffer meta-buffer
754 (setq ediff-meta-action-function action-func
755 ediff-meta-redraw-function redraw-function
756 ediff-metajob-name jobname
757 ediff-meta-buffer meta-buffer)
759 ;; comes after ediff-meta-action-function is set
760 (ediff-setup-meta-map)
762 (if (eq ediff-metajob-name 'ediff-registry)
764 (setq ediff-registry-buffer meta-buffer
765 ediff-meta-list meta-list)
766 ;; this func is used only from registry buffer, not from other
769 ediff-meta-buffer-map "M" 'ediff-show-meta-buff-from-registry))
770 ;; Initialize the meta list -- we don't do this for registry.
771 (setq ediff-meta-list
772 ;; add meta-buffer to the list header
773 (cons (cons meta-buffer (car meta-list))
776 (or (eq meta-buffer ediff-registry-buffer)
777 (setq ediff-session-registry
778 (cons meta-buffer ediff-session-registry)))
780 ;; redraw-function uses ediff-meta-list
781 (funcall redraw-function ediff-meta-list)
783 ;; set read-only/non-modified
784 (setq buffer-read-only t)
785 (set-buffer-modified-p nil)
787 (run-hooks 'startup-hooks)
789 ;; Arrange to show directory contents differences
790 ;; Must be after run startup-hooks, since ediff-dir-difference-list is
791 ;; set inside these hooks
792 (if (eq action-func 'ediff-filegroup-action)
794 ;; put meta buffer in (car ediff-dir-difference-list)
795 (setq ediff-dir-difference-list
796 (cons (cons meta-buffer (car ediff-dir-difference-list))
797 (cdr ediff-dir-difference-list)))
799 (or (ediff-one-filegroup-metajob jobname)
800 (ediff-draw-dir-diffs ediff-dir-difference-list))
802 ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos)
803 (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
805 ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos)
806 (define-key ediff-meta-buffer-map "u" nil)
808 ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
810 ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
811 (cond ((ediff-collect-diffs-metajob jobname)
813 ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
814 ((ediff-patch-metajob jobname)
816 ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
817 (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
818 (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
820 (if (eq ediff-metajob-name 'ediff-registry)
821 (run-hooks 'ediff-registry-setup-hook)
822 (run-hooks 'ediff-after-session-group-setup-hook))
823 ) ; eval in meta-buffer
826 ;; Insert the activity marker for session SESSION in the meta buffer at point
827 ;; The activity marker is either SPC (untouched session), or + (active session,
828 ;; i.e., ediff is currently run in it), or - (finished session, i.e., we've ran
829 ;; ediff in it and then exited)
830 (defun ediff-insert-session-activity-marker-in-meta-buffer (session)
832 (cond ((ediff-get-session-activity-marker session))
836 ;; Insert session status at point. Status is either ?H (marked for hiding), or
837 ;; ?I (hidden or invalid), or ?* (meaning marked for an operation; currently,
838 ;; such op can only be checking for equality)), or SPC (meaning neither marked
840 (defun ediff-insert-session-status-in-meta-buffer (session)
842 (cond ((ediff-get-session-status session)) ; session has status: ?H, ?I, ?*
843 ;; normal session, no marks or hidings
846 ;; If NEW-MARKER is non-nil, use it to substitute the current activity marker
847 ;; in the meta buffer. If nil, use SPC
848 (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker)
849 (let* ((overl (ediff-get-meta-overlay-at-pos point))
850 (session-info (ediff-overlay-get overl 'ediff-meta-info))
851 (activity-marker (ediff-get-session-activity-marker session-info))
853 (or new-marker activity-marker (setq new-marker ?\ ))
854 (goto-char (ediff-overlay-start overl))
855 (if (eq (char-after (point)) new-marker)
856 () ; if marker shown in buffer is the same as new-marker, do nothing
859 (set-buffer-modified-p nil))))
861 ;; If NEW-STATUS is non-nil, use it to substitute the current status marker in
862 ;; the meta buffer. If nil, use SPC
863 (defun ediff-replace-session-status-in-meta-buffer (point new-status)
864 (let* ((overl (ediff-get-meta-overlay-at-pos point))
865 (session-info (ediff-overlay-get overl 'ediff-meta-info))
866 (status (ediff-get-session-status session-info))
868 (setq new-status (or new-status status ?\ ))
869 (goto-char (ediff-overlay-start overl))
870 (forward-char 1) ; status is the second char in session record
871 (if (eq (char-after (point)) new-status)
872 () ; if marker shown in buffer is the same as new-marker, do nothing
875 (set-buffer-modified-p nil))))
877 ;; insert all file info in meta buffer for a given session
878 (defun ediff-insert-session-info-in-meta-buffer (session-info sessionNum)
879 (let ((f1 (ediff-get-session-objA session-info))
880 (f2 (ediff-get-session-objB session-info))
881 (f3 (ediff-get-session-objC session-info))
883 (hidden (eq (ediff-get-session-status session-info) ?I)))
884 ;; insert activity marker, i.e., SPC, - or +
885 (ediff-insert-session-activity-marker-in-meta-buffer session-info)
886 ;; insert session status, i.e., *, H
887 (ediff-insert-session-status-in-meta-buffer session-info)
888 (insert " Session " (int-to-string sessionNum) ":\n")
889 (ediff-meta-insert-file-info1 f1)
890 (ediff-meta-insert-file-info1 f2)
891 (ediff-meta-insert-file-info1 f3)
892 (ediff-set-meta-overlay pt (point) session-info sessionNum hidden)))
895 ;; this is a setup function for ediff-directories
896 ;; must return meta-buffer
897 (defun ediff-redraw-directory-group-buffer (meta-list)
898 ;; extract directories
899 (let ((meta-buf (ediff-get-group-buffer meta-list))
902 regexp elt merge-autostore-dir
903 point tmp-list buffer-read-only)
904 (ediff-with-current-buffer meta-buf
907 ;; delete phony overlays that used to represent sessions before the buff
909 (ediff-cond-compile-for-xemacs-or-emacs
910 (map-extents 'delete-extent) ; xemacs
911 (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
914 (insert (format ediff-meta-buffer-message
915 (ediff-abbrev-jobname ediff-metajob-name)))
917 (setq regexp (ediff-get-group-regexp meta-list)
919 (ediff-get-group-merge-autostore-dir meta-list))
921 (cond ((ediff-collect-diffs-metajob)
923 " P:\tcollect custom diffs of all marked sessions\n"))
924 ((ediff-patch-metajob)
926 " P:\tshow patch appropriately for the context (session or group)\n")))
928 " ^:\tshow parent session group\n")
929 (or (ediff-one-filegroup-metajob)
931 " D:\tshow differences among directories\n"
932 " ==:\tfor each session, show which files are identical\n"
933 " =h:\tlike ==, but also marks those sessions for hiding\n"
934 " =m:\tlike ==, but also marks those sessions for operation\n\n"))
937 (if (and (stringp regexp) (> (length regexp) 0))
939 (format "*** Filter-through regular expression: %s\n" regexp)))
940 (ediff-insert-dirs-in-meta-buffer meta-list)
941 (if (and ediff-autostore-merges (ediff-merge-metajob)
942 (ediff-nonempty-string-p merge-autostore-dir))
944 "\nMerge results are automatically stored in:\n\t%s\n"
945 merge-autostore-dir)))
947 Size Last modified Name
948 ----------------------------------------------
952 ;; discard info on directories and regexp
953 (setq meta-list (cdr meta-list)
955 (while (and tmp-list empty)
956 (if (and (car tmp-list)
957 (not (eq (ediff-get-session-status (car tmp-list)) ?I)))
959 (setq tmp-list (cdr tmp-list)))
963 " ****** ****** This session group has no members\n"))
965 ;; now organize file names like this:
966 ;; use-mark sizeA dateA sizeB dateB filename
967 ;; make sure directories are displayed with a trailing slash.
969 (setq elt (car meta-list)
970 meta-list (cdr meta-list)
971 sessionNum (1+ sessionNum))
972 (if (eq (ediff-get-session-status elt) ?I)
974 (ediff-insert-session-info-in-meta-buffer elt sessionNum)))
975 (set-buffer-modified-p nil)
979 (defun ediff-update-markers-in-dir-meta-buffer (meta-list)
980 (let ((meta-buf (ediff-get-group-buffer meta-list))
981 session-info point overl buffer-read-only)
982 (ediff-with-current-buffer meta-buf
984 (goto-char (point-min))
985 (ediff-next-meta-item1)
987 (setq session-info (ediff-get-meta-info meta-buf (point) 'no-error)
988 overl (ediff-get-meta-overlay-at-pos (point)))
991 (cond ((eq (ediff-get-session-status session-info) ?I)
993 (if overl (ediff-overlay-put overl 'invisible t)))
994 ((and (eq (ediff-get-session-status session-info) ?H)
995 overl (ediff-overlay-get overl 'invisible))
997 (ediff-overlay-put overl 'invisible nil))
998 (t (ediff-replace-session-activity-marker-in-meta-buffer
1000 (ediff-get-session-activity-marker session-info))
1001 (ediff-replace-session-status-in-meta-buffer
1003 (ediff-get-session-status session-info))))))
1004 (ediff-next-meta-item1) ; advance to the next item
1006 (set-buffer-modified-p nil)
1010 (defun ediff-update-session-marker-in-dir-meta-buffer (session-num)
1011 (let (buffer-meta-overlays session-info overl buffer-read-only)
1013 (ediff-cond-compile-for-xemacs-or-emacs
1014 (map-extents ; xemacs
1015 (lambda (ext maparg)
1017 (ediff-overlay-get ext 'ediff-meta-info)
1018 (eq (ediff-overlay-get ext 'ediff-meta-session-number)
1021 ;; Emacs doesn't have map-extents, so try harder
1022 ;; Splice overlay lists to get all buffer overlays
1024 (setq buffer-meta-overlays (overlay-lists)
1025 buffer-meta-overlays (append (car buffer-meta-overlays)
1026 (cdr buffer-meta-overlays)))
1032 (ediff-overlay-get overl 'ediff-meta-info)
1033 (eq (ediff-overlay-get
1034 overl 'ediff-meta-session-number)
1037 buffer-meta-overlays))))
1041 "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S"
1043 (setq session-info (ediff-overlay-get overl 'ediff-meta-info))
1044 (goto-char (ediff-overlay-start overl))
1045 (ediff-replace-session-activity-marker-in-meta-buffer
1047 (ediff-get-session-activity-marker session-info))
1048 (ediff-replace-session-status-in-meta-buffer
1050 (ediff-get-session-status session-info)))
1051 (ediff-next-meta-item1))
1055 ;; Check if this is a problematic session.
1056 ;; Return nil if not. Otherwise, return symbol representing the problem
1057 ;; At present, problematic sessions occur only in -with-ancestor comparisons
1058 ;; when the ancestor is a directory rather than a file, or when there is no
1059 ;; suitable ancestor file in the ancestor directory
1060 (defun ediff-problematic-session-p (session)
1061 (let ((f1 (ediff-get-session-objA-name session))
1062 (f2 (ediff-get-session-objB-name session))
1063 (f3 (ediff-get-session-objC-name session)))
1064 (cond ((and (stringp f1) (not (file-directory-p f1))
1065 (stringp f2) (not (file-directory-p f2))
1066 ;; either invalid file name or a directory
1067 (or (not (stringp f3)) (file-directory-p f3))
1068 (ediff-ancestor-metajob))
1069 ;; more may be added later
1073 (defun ediff-meta-insert-file-info1 (fileinfo)
1074 (let ((fname (car fileinfo))
1075 (feq (ediff-get-file-eqstatus fileinfo))
1076 (max-filename-width (if ediff-meta-truncate-filenames
1077 (- (window-width) 41)
1079 file-modtime file-size)
1080 (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits
1081 ((ediff-listable-file fname)
1082 (if (file-exists-p fname)
1083 ;; set real size and modtime
1084 (setq file-size (ediff-file-size fname)
1085 file-modtime (ediff-file-modtime fname))
1086 (setq file-size -2))) ; file doesn't exist
1087 ( t (setq file-size -1))) ; remote file
1092 (if feq "=" " ") ; equality indicator
1093 (format "%10s" (cond ((= file-size -1) "--")
1094 ((< file-size -1) "--")
1096 (cond ((= file-size -1) "*remote file*")
1097 ((< file-size -1) "*file doesn't exist*")
1098 (t (ediff-format-date (decode-time file-modtime))))
1100 ;; dir names in meta lists have training slashes, so we just
1101 ;; abbreviate the file name, if file exists
1102 (if (and (not (stringp fname)) (< file-size -1))
1103 "-------" ; file doesn't exist
1104 (ediff-truncate-string-left
1105 (ediff-abbreviate-file-name fname)
1106 max-filename-width)))))))
1108 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
1109 (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")
1110 (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec"))
1111 "Months' associative array.")
1113 ;; returns 2char string
1114 (defsubst ediff-fill-leading-zero (num)
1117 (number-to-string num)))
1119 ;; TIME is like the output of decode-time
1120 (defun ediff-format-date (time)
1121 (format "%s %2d %4d %s:%s:%s"
1122 (cdr (assoc (nth 4 time) ediff-months)) ; month
1125 (ediff-fill-leading-zero (nth 2 time)) ; hour
1126 (ediff-fill-leading-zero (nth 1 time)) ; min
1127 (ediff-fill-leading-zero (nth 0 time)) ; sec
1130 ;; Draw the directories
1131 (defun ediff-insert-dirs-in-meta-buffer (meta-list)
1132 (let* ((dir1 (ediff-abbreviate-file-name (ediff-get-group-objA meta-list)))
1133 (dir2 (ediff-get-group-objB meta-list))
1134 (dir2 (if (stringp dir2) (ediff-abbreviate-file-name dir2)))
1135 (dir3 (ediff-get-group-objC meta-list))
1136 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3))))
1137 (insert "*** Directory A: " dir1 "\n")
1138 (if dir2 (insert "*** Directory B: " dir2 "\n"))
1139 (if dir3 (insert "*** Directory C: " dir3 "\n"))
1142 (defun ediff-draw-dir-diffs (diff-list &optional buf-name)
1143 (if (null diff-list) (error "Lost difference info on these directories"))
1146 (ediff-unique-buffer-name "*Ediff File Group Differences" "*")))
1147 (let* ((regexp (ediff-get-group-regexp diff-list))
1148 (dir1 (ediff-abbreviate-file-name (ediff-get-group-objA diff-list)))
1149 (dir2 (ediff-abbreviate-file-name (ediff-get-group-objB diff-list)))
1150 (dir3 (ediff-get-group-objC diff-list))
1151 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3)))
1152 (meta-buf (ediff-get-group-buffer diff-list))
1153 (underline (make-string 26 ?-))
1154 file membership-code saved-point
1156 ;; skip the directory part
1157 (setq diff-list (cdr diff-list))
1158 (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))
1159 (ediff-with-current-buffer ediff-dir-diffs-buffer
1160 (setq saved-point (point))
1161 (use-local-map ediff-dir-diffs-buffer-map)
1163 (setq ediff-meta-buffer meta-buf)
1164 (insert "\t\t*** Directory Differences ***\n")
1167 C,button2: over file name -- copy this file to directory that doesn't have it
1170 p,DEL: previous line\n\n")
1172 (insert (format "\n*** Directory A: %s\n" dir1))
1173 (if dir2 (insert (format "*** Directory B: %s\n" dir2)))
1174 (if dir3 (insert (format "*** Directory C: %s\n" dir3)))
1175 (if (and (stringp regexp) (> (length regexp) 0))
1177 (format "*** Filter-through regular expression: %s\n" regexp)))
1179 (insert (format "\n%-27s%-26s" "Directory A" "Directory B"))
1181 (insert (format " %-25s\n" "Directory C"))
1183 (insert (format "%s%s" underline underline))
1185 (insert (format "%s\n\n" underline))
1188 (if (null diff-list)
1189 (insert "\n\t*** No differences ***\n"))
1192 (setq file (car (car diff-list))
1193 membership-code (cdr (car diff-list))
1194 diff-list (cdr diff-list))
1195 (if (= (mod membership-code ediff-membership-code1) 0) ; dir1
1196 (let ((beg (point)))
1197 (insert (format "%-27s"
1198 (ediff-truncate-string-left
1199 (ediff-abbreviate-file-name
1200 (if (file-directory-p (concat dir1 file))
1201 (file-name-as-directory file)
1204 ;; format of meta info in the dir-diff-buffer:
1205 ;; (filename-tail filename-full otherdir1 otherdir2 otherdir3)
1206 (ediff-set-meta-overlay
1208 (list meta-buf file (concat dir1 file) dir1 dir2 dir3)))
1209 (insert (format "%-27s" "---")))
1210 (if (= (mod membership-code ediff-membership-code2) 0) ; dir2
1211 (let ((beg (point)))
1212 (insert (format "%-26s"
1213 (ediff-truncate-string-left
1214 (ediff-abbreviate-file-name
1215 (if (file-directory-p (concat dir2 file))
1216 (file-name-as-directory file)
1219 (ediff-set-meta-overlay
1221 (list meta-buf file (concat dir2 file) dir1 dir2 dir3)))
1222 (insert (format "%-26s" "---")))
1224 (if (= (mod membership-code ediff-membership-code3) 0) ; dir3
1225 (let ((beg (point)))
1226 (insert (format " %-25s"
1227 (ediff-truncate-string-left
1228 (ediff-abbreviate-file-name
1229 (if (file-directory-p (concat dir3 file))
1230 (file-name-as-directory file)
1233 (ediff-set-meta-overlay
1235 (list meta-buf file (concat dir3 file) dir1 dir2 dir3)))
1236 (insert (format " %-25s" "---"))))
1238 (setq buffer-read-only t)
1239 (set-buffer-modified-p nil)
1240 (goto-char saved-point)) ; end eval in diff buffer
1243 (defun ediff-bury-dir-diffs-buffer ()
1244 "Bury the directory difference buffer. Display the meta buffer instead."
1246 ;; ediff-meta-buffer is set in ediff-draw-dir-diffs so the directory
1247 ;; difference buffer remembers the meta buffer
1248 (let ((buf ediff-meta-buffer)
1250 (ediff-kill-buffer-carefully ediff-dir-diffs-buffer)
1251 (if (setq wind (ediff-get-visible-buffer-window buf))
1252 (select-window wind)
1253 (set-window-buffer (selected-window) buf))))
1255 ;; executes in dir session group buffer
1256 ;; show buffer differences
1257 (defun ediff-show-dir-diffs ()
1258 "Display differences among the directories involved in session group."
1260 (if (ediff-one-filegroup-metajob)
1261 (error "This command is inapplicable in the present context"))
1262 (or (ediff-buffer-live-p ediff-dir-diffs-buffer)
1263 (ediff-draw-dir-diffs ediff-dir-difference-list))
1264 (let ((buf ediff-dir-diffs-buffer))
1266 (set-window-buffer (selected-window) buf)
1267 (goto-char (point-min))))
1269 ;; Format of meta info in dir-diff-buffer:
1270 ;; (filename-tail filename-full otherdir1 otherdir2)
1271 (defun ediff-dir-diff-copy-file ()
1272 "Copy file described at point to directories where this file is missing."
1274 (let* ((pos (ediff-event-point last-command-event))
1275 (info (ediff-get-meta-info (current-buffer) pos 'noerror))
1276 (meta-buf (car info))
1277 (file-tail (nth 1 info))
1278 (file-abs (nth 2 info))
1279 (otherdir1 (nth 3 info))
1280 (otherfile1 (if otherdir1 (concat otherdir1 file-tail)))
1281 (otherdir2 (nth 4 info))
1282 (otherfile2 (if otherdir2 (concat otherdir2 file-tail)))
1283 (otherdir3 (nth 5 info))
1284 (otherfile3 (if otherdir3 (concat otherdir3 file-tail)))
1285 meta-list dir-diff-list
1288 (error "No file suitable for copying described at this location"))
1289 (ediff-with-current-buffer meta-buf
1290 (setq meta-list ediff-meta-list
1291 dir-diff-list ediff-dir-difference-list))
1293 ;; copy file to directories where it doesn't exist, update
1294 ;; ediff-dir-difference-list and redisplay
1296 (lambda (otherfile-struct)
1297 (let ((otherfile (car otherfile-struct))
1298 (file-mem-code (cdr otherfile-struct)))
1300 (or (file-exists-p otherfile)
1302 (format "Copy %s to %s ? " file-abs otherfile))
1303 (let* ((file-diff-record (assoc file-tail dir-diff-list))
1305 (* (cdr file-diff-record) file-mem-code)))
1306 (copy-file file-abs otherfile)
1307 (setcdr file-diff-record new-mem-code)
1308 (ediff-draw-dir-diffs dir-diff-list (buffer-name))
1310 ;; if file is in all three dirs or in two dirs and only
1311 ;; two dirs are involved, delete this file's record
1312 (if (or (= new-mem-code ediff-product-of-memcodes)
1313 (and (> new-mem-code ediff-membership-code3)
1315 (delq file-diff-record dir-diff-list))
1318 ;; 2,3,5 are numbers used to encode membership of a file in
1319 ;; dir1/2/3. See ediff-intersect-directories.
1320 (list (cons otherfile1 2) (cons otherfile2 3) (cons otherfile3 5)))
1322 (if (and (file-exists-p otherfile1)
1323 (file-exists-p otherfile2)
1324 (or (not otherfile3) (file-exists-p otherfile3)))
1325 ;; update ediff-meta-list by direct modification
1327 (list (ediff-make-new-meta-list-element
1328 otherfile1 otherfile2 otherfile3)))
1330 (ediff-update-meta-buffer meta-buf 'must-redraw)
1333 (defun ediff-up-meta-hierarchy ()
1334 "Go to the parent session group buffer."
1336 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
1337 (ediff-show-meta-buffer
1338 ediff-parent-meta-buffer ediff-meta-session-number)
1339 (error "This session group has no parent")))
1342 ;; argument is ignored
1343 (defun ediff-redraw-registry-buffer (&optional ignore)
1344 (ediff-with-current-buffer ediff-registry-buffer
1345 (let ((point (point))
1346 elt bufAname bufBname bufCname cur-diff total-diffs pt
1347 job-name meta-list registry-list buffer-read-only)
1349 ;; delete phony overlays that used to represent sessions before the buff
1351 (ediff-cond-compile-for-xemacs-or-emacs
1352 (map-extents 'delete-extent) ; xemacs
1353 (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs
1356 (insert "This is a registry of all active Ediff sessions.
1359 button2, `v', RET over a session record: switch to that session
1360 M over a session record: display the associated session group
1361 R in any Ediff session: display session registry
1363 p,DEL: previous session
1364 E: browse Ediff on-line manual
1368 \t\tActive Ediff Sessions:
1369 \t\t----------------------
1372 ;; purge registry list from dead buffers
1373 (mapcar (lambda (elt)
1374 (if (not (ediff-buffer-live-p elt))
1375 (setq ediff-session-registry
1376 (delq elt ediff-session-registry))))
1377 ediff-session-registry)
1379 (if (null ediff-session-registry)
1380 (insert " ******* No active Ediff sessions *******\n"))
1382 (setq registry-list ediff-session-registry)
1383 (while registry-list
1384 (setq elt (car registry-list)
1385 registry-list (cdr registry-list))
1387 (if (ediff-buffer-live-p elt)
1388 (if (ediff-with-current-buffer elt
1389 (setq job-name ediff-metajob-name
1390 meta-list ediff-meta-list)
1391 (and ediff-metajob-name
1392 (not (eq ediff-metajob-name 'ediff-registry))))
1395 (insert (format " *group*\t%s: %s\n"
1397 (ediff-abbrev-jobname job-name)))
1398 (insert (format "\t\t %s %s %s\n"
1399 (ediff-abbreviate-file-name
1400 (ediff-get-group-objA meta-list))
1401 (ediff-abbreviate-file-name
1403 (ediff-get-group-objB meta-list))
1404 (ediff-get-group-objB meta-list)
1406 (ediff-abbreviate-file-name
1408 (ediff-get-group-objC meta-list))
1409 (ediff-get-group-objC meta-list)
1411 (ediff-set-meta-overlay pt (point) elt))
1413 (ediff-with-current-buffer elt
1414 (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
1415 (buffer-name ediff-buffer-A)
1416 "!!!killed buffer!!!")
1417 bufBname (if (ediff-buffer-live-p ediff-buffer-B)
1418 (buffer-name ediff-buffer-B)
1419 "!!!killed buffer!!!")
1420 bufCname (cond ((not (ediff-3way-job))
1422 ((ediff-buffer-live-p ediff-buffer-C)
1423 (buffer-name ediff-buffer-C))
1424 (t "!!!killed buffer!!!")))
1425 (setq total-diffs (format "%-4d" ediff-number-of-differences)
1427 (cond ((= ediff-current-difference -1) " _")
1428 ((= ediff-current-difference
1429 ediff-number-of-differences)
1432 "%4d" (1+ ediff-current-difference))))
1433 job-name ediff-job-name))
1434 ;; back in the meta buf
1436 (insert cur-diff "/" total-diffs "\t"
1438 (format ": %s" (ediff-abbrev-jobname job-name)))
1440 "\n\t\t " bufAname " " bufBname " " bufCname "\n")
1441 (ediff-set-meta-overlay pt (point) elt))))
1443 (set-buffer-modified-p nil)
1447 ;; Sets overlay around a meta record with 'ediff-meta-info property PROP
1448 ;; If optional SESSION-NUMBER, make it a property of the overlay,
1449 ;; ediff-meta-session-number
1450 ;; PROP is either the ctl or meta buffer (used when we work with the registry)
1451 ;; or a session meta descriptor of the form
1452 ;; (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC)
1453 (defun ediff-set-meta-overlay (b e prop &optional session-number hidden)
1455 (setq overl (ediff-make-overlay b e))
1457 (ediff-overlay-put overl 'mouse-face 'highlight)
1458 (ediff-overlay-put overl 'highlight t))
1459 (ediff-overlay-put overl 'ediff-meta-info prop)
1460 (ediff-overlay-put overl 'invisible hidden)
1461 (if (numberp session-number)
1462 (ediff-overlay-put overl 'ediff-meta-session-number session-number))))
1464 (defun ediff-mark-for-hiding-at-pos (unmark)
1465 "Mark session for hiding. With prefix arg, unmark."
1467 (let* ((pos (ediff-event-point last-command-event))
1468 (meta-buf (ediff-event-buffer last-command-event))
1469 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1470 (info (ediff-get-meta-info meta-buf pos))
1471 (session-number (ediff-get-session-number-at-pos pos)))
1472 (ediff-mark-session-for-hiding info unmark)
1473 (ediff-next-meta-item 1)
1475 (ediff-update-meta-buffer meta-buf nil session-number))
1478 ;; Returns whether session was marked or unmarked
1479 (defun ediff-mark-session-for-hiding (info unmark)
1480 (let ((session-buf (ediff-get-session-buffer info))
1482 (cond ((eq unmark 'mark) (setq unmark nil))
1483 ((eq (ediff-get-session-status info) ?H) (setq unmark t))
1484 (unmark ; says unmark, but the marker is different from H
1487 (unmark (ediff-set-session-status info nil))
1488 ;;; (if (ediff-buffer-live-p session-buf)
1489 ;;; (error "Can't hide active session, %s" (buffer-name session-buf)))
1490 (t (ediff-set-session-status info ?H))))
1494 (defun ediff-mark-for-operation-at-pos (unmark)
1495 "Mark session for a group operation. With prefix arg, unmark."
1497 (let* ((pos (ediff-event-point last-command-event))
1498 (meta-buf (ediff-event-buffer last-command-event))
1499 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1500 (info (ediff-get-meta-info meta-buf pos))
1501 (session-number (ediff-get-session-number-at-pos pos)))
1502 (ediff-mark-session-for-operation info unmark)
1503 (ediff-next-meta-item 1)
1505 (ediff-update-meta-buffer meta-buf nil session-number))
1509 ;; returns whether session was unmarked.
1510 ;; remember: this is a toggle op
1511 (defun ediff-mark-session-for-operation (info unmark)
1513 (cond ((eq unmark 'mark) (setq unmark nil))
1514 ((eq (ediff-get-session-status info) ?*) (setq unmark t))
1515 (unmark ; says unmark, but the marker is different from *
1518 (unmark (ediff-set-session-status info nil))
1519 (t (ediff-set-session-status info ?*))))
1523 (defun ediff-hide-marked-sessions (unhide)
1524 "Hide marked sessions. With prefix arg, unhide."
1526 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1527 (meta-list (cdr ediff-meta-list))
1528 (from (if unhide ?I ?H))
1529 (to (if unhide ?H ?I))
1531 active-sessions-exist session-buf elt)
1533 (setq elt (car meta-list)
1534 meta-list (cdr meta-list)
1535 session-buf (ediff-get-session-buffer elt))
1537 (if (eq (ediff-get-session-status elt) from)
1539 (setq numMarked (1+ numMarked))
1540 (if (and (eq to ?I) (buffer-live-p session-buf))
1541 ;; shouldn't hide active sessions
1542 (setq active-sessions-exist t)
1543 (ediff-set-session-status elt to)))))
1545 (ediff-update-meta-buffer grp-buf 'must-redraw)
1548 (message "Nothing to reveal...")
1549 (message "Nothing to hide...")))
1550 (if active-sessions-exist
1551 (message "Note: Ediff didn't hide active sessions!"))
1554 ;; Apply OPERATION to marked sessions. Operation expects one argument of type
1555 ;; meta-list member (not the first one), i.e., a regular session description.
1556 ;; Returns number of marked sessions on which operation was performed
1557 (defun ediff-operate-on-marked-sessions (operation)
1558 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1559 (meta-list (cdr ediff-meta-list))
1563 (diff-buffer ediff-meta-diff-buffer)
1566 (setq elt (car meta-list)
1567 meta-list (cdr meta-list)
1568 sessionNum (1+ sessionNum))
1569 (cond ((eq (ediff-get-session-status elt) marksym)
1571 (setq numMarked (1+ numMarked))
1572 (funcall operation elt sessionNum)))
1573 ;; The following goes into a session represented by a subdirectory
1574 ;; and applies operation to marked sessions there
1575 ((and (ediff-meta-session-p elt)
1576 (ediff-buffer-live-p
1577 (setq session-buf (ediff-get-session-buffer elt))))
1580 (ediff-with-current-buffer session-buf
1581 ;; pass meta-diff along
1582 (setq ediff-meta-diff-buffer diff-buffer)
1583 ;; collect diffs in child group
1584 (ediff-operate-on-marked-sessions operation)))))))
1585 (ediff-update-meta-buffer grp-buf 'must-redraw) ; just in case
1589 (defun ediff-append-custom-diff (session sessionNum)
1590 (or (ediff-collect-diffs-metajob)
1591 (error "Can't compute multifile patch in this context"))
1592 (let ((session-buf (ediff-get-session-buffer session))
1593 (meta-diff-buff ediff-meta-diff-buffer)
1594 (metajob ediff-metajob-name)
1595 tmp-buf custom-diff-buf)
1596 (if (ediff-buffer-live-p session-buf)
1597 (ediff-with-current-buffer session-buf
1598 (if (eq ediff-control-buffer session-buf) ; individual session
1600 (ediff-compute-custom-diffs-maybe)
1601 (setq custom-diff-buf ediff-custom-diff-buffer)))))
1603 (or (ediff-buffer-live-p meta-diff-buff)
1604 (error "Ediff: something wrong--killed multiple diff's buffer"))
1606 (cond ((ediff-buffer-live-p custom-diff-buf)
1607 ;; for live session buffers we do them first because the user may
1608 ;; have changed them with respect to the underlying files
1610 (set-buffer meta-diff-buff)
1611 (goto-char (point-max))
1612 (insert-buffer custom-diff-buf)
1614 ;; if ediff session is not live, run diff directly on the files
1615 ((memq metajob '(ediff-directories
1616 ediff-merge-directories
1617 ediff-merge-directories-with-ancestor))
1618 ;; get diffs by calling shell command on ediff-custom-diff-program
1620 (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
1623 (format "%s %s %s %s"
1624 ediff-custom-diff-program ediff-custom-diff-options
1625 (ediff-get-session-objA-name session)
1626 (ediff-get-session-objB-name session))
1629 (set-buffer meta-diff-buff)
1630 (goto-char (point-max))
1631 (insert-buffer tmp-buf)
1634 (ediff-kill-buffer-carefully meta-diff-buff)
1635 (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum )))
1638 (defun ediff-collect-custom-diffs ()
1639 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
1640 This operation is defined only for `ediff-directories' and
1641 `ediff-directory-revisions', since its intent is to produce
1642 multifile patches. For `ediff-directory-revisions', we insist that
1643 all marked sessions must be active."
1645 (or (ediff-buffer-live-p ediff-meta-diff-buffer)
1646 (setq ediff-meta-diff-buffer
1648 (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
1649 (ediff-with-current-buffer ediff-meta-diff-buffer
1650 (setq buffer-read-only nil)
1652 (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
1655 (display-buffer ediff-meta-diff-buffer 'not-this-window)
1656 (ediff-with-current-buffer ediff-meta-diff-buffer
1657 (set-buffer-modified-p nil)
1658 (setq buffer-read-only t)))
1660 (message "No marked sessions found")))
1662 (defun ediff-meta-show-patch ()
1663 "Show the multi-file patch associated with this group session."
1665 (let* ((pos (ediff-event-point last-command-event))
1666 (meta-buf (ediff-event-buffer last-command-event))
1667 (info (ediff-get-meta-info meta-buf pos 'noerror))
1668 (patchbuffer ediff-meta-patchbufer))
1669 (if (ediff-buffer-live-p patchbuffer)
1670 (ediff-with-current-buffer patchbuffer
1675 (ediff-get-session-objB-name info)
1676 (ediff-get-session-objC-name info)))
1677 (set-buffer (get-buffer-create ediff-tmp-buffer))
1679 (insert-buffer patchbuffer)
1680 (display-buffer ediff-tmp-buffer 'not-this-window)
1682 (error "The patch buffer wasn't found"))))
1685 ;; This function executes in meta buffer. It knows where event happened.
1686 (defun ediff-filegroup-action ()
1687 "Execute appropriate action for a selected session."
1689 (let* ((pos (ediff-event-point last-command-event))
1690 (meta-buf (ediff-event-buffer last-command-event))
1691 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1692 (info (ediff-get-meta-info meta-buf pos))
1693 (session-buf (ediff-get-session-buffer info))
1694 (session-number (ediff-get-session-number-at-pos pos meta-buf))
1695 (default-regexp (eval ediff-default-filtering-regexp))
1696 merge-autostore-dir file1 file2 file3 regexp)
1698 (setq file1 (ediff-get-session-objA-name info)
1699 file2 (ediff-get-session-objB-name info)
1700 file3 (ediff-get-session-objC-name info))
1702 ;; make sure we don't start on hidden sessions
1703 ;; ?H means marked for hiding. ?I means invalid (hidden).
1704 (if (memq (ediff-get-session-status info) '(?I))
1707 (if (y-or-n-p "This session is marked as hidden, unmark? ")
1709 (ediff-set-session-status info nil)
1710 (ediff-update-meta-buffer meta-buf nil session-number))
1711 (error "Aborted"))))
1713 (ediff-with-current-buffer meta-buf
1714 (setq merge-autostore-dir
1715 (ediff-get-group-merge-autostore-dir ediff-meta-list))
1716 (goto-char pos) ; if the user clicked on session--move point there
1717 ;; First handle sessions involving directories (which are themselves
1719 ;; After that handle individual sessions
1720 (cond ((ediff-meta-session-p info)
1721 ;; do ediff/ediff-merge on subdirectories
1722 (if (ediff-buffer-live-p session-buf)
1723 (ediff-show-meta-buffer session-buf)
1726 (if (stringp default-regexp)
1728 "Filter through regular expression (default %s): "
1730 "Filter through regular expression: ")
1732 'ediff-filtering-regexp-history
1733 (eval ediff-default-filtering-regexp)))
1734 (ediff-directories-internal
1735 file1 file2 file3 regexp
1736 ediff-session-action-function
1738 ;; make it update (car info) after startup
1740 ;; child session group should know its parent
1741 (setq ediff-parent-meta-buffer
1742 (quote ,ediff-meta-buffer)
1743 ediff-meta-session-number
1745 ;; and parent will know its child
1746 (setcar (quote ,info) ediff-meta-buffer))))))
1748 ;; Do ediff-revision on a subdirectory
1749 ((and (ediff-one-filegroup-metajob)
1750 (ediff-revision-metajob)
1751 (file-directory-p file1))
1752 (if (ediff-buffer-live-p session-buf)
1753 (ediff-show-meta-buffer session-buf)
1754 (setq regexp (read-string "Filter through regular expression: "
1755 nil 'ediff-filtering-regexp-history))
1756 (ediff-directory-revisions-internal
1758 ediff-session-action-function ediff-metajob-name
1759 ;; make it update (car info) after startup
1761 ;; child session group should know its parent and
1763 (setq ediff-parent-meta-buffer
1764 (quote ,ediff-meta-buffer)
1765 ediff-meta-session-number
1767 ;; and parent will know its child
1768 (setcar (quote ,info) ediff-meta-buffer))))))
1770 ;; From here on---only individual session handlers
1772 ;; handle an individual session with a live control buffer
1773 ((ediff-buffer-live-p session-buf)
1774 (ediff-with-current-buffer session-buf
1775 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1776 (ediff-recenter 'no-rehighlight)))
1778 ((ediff-problematic-session-p info)
1781 "This session has no ancestor. Merge without the ancestor? ")
1784 ;; provide startup hooks
1787 'ediff-after-quit-hook-internal
1789 (if (ediff-buffer-live-p ,(current-buffer))
1790 (ediff-show-meta-buffer
1791 ,(current-buffer) ,session-number)))
1793 (setq ediff-meta-buffer ,(current-buffer)
1794 ediff-meta-session-number
1796 (setq ediff-merge-store-file
1797 ,(if (ediff-nonempty-string-p
1798 merge-autostore-dir)
1801 ediff-merge-filename-prefix
1802 (file-name-nondirectory file1))
1804 ;; make ediff-startup pass
1805 ;; ediff-control-buffer back to the meta
1808 (quote ,info) ediff-control-buffer))))
1810 ((ediff-one-filegroup-metajob) ; needs 1 file arg
1811 (funcall ediff-session-action-function
1813 ;; provide startup hooks
1816 'ediff-after-quit-hook-internal
1818 (if (ediff-buffer-live-p
1820 (ediff-show-meta-buffer
1824 (setq ediff-meta-buffer ,(current-buffer)
1825 ediff-meta-session-number
1827 (setq ediff-merge-store-file
1828 ,(if (ediff-nonempty-string-p
1829 merge-autostore-dir)
1832 ediff-merge-filename-prefix
1833 (file-name-nondirectory file1))) )
1834 ;; make ediff-startup pass
1835 ;; ediff-control-buffer back to the meta
1838 (quote ,info) ediff-control-buffer)))))
1839 ((not (ediff-metajob3)) ; need 2 file args
1840 (funcall ediff-session-action-function
1842 ;; provide startup hooks
1845 'ediff-after-quit-hook-internal
1847 (if (ediff-buffer-live-p
1849 (ediff-show-meta-buffer
1853 (setq ediff-meta-buffer ,(current-buffer)
1854 ediff-meta-session-number
1856 (setq ediff-merge-store-file
1857 ,(if (ediff-nonempty-string-p
1858 merge-autostore-dir)
1861 ediff-merge-filename-prefix
1862 (file-name-nondirectory file1))) )
1863 ;; make ediff-startup pass
1864 ;; ediff-control-buffer back to the meta
1867 (quote ,info) ediff-control-buffer)))))
1868 ((ediff-metajob3) ; need 3 file args
1869 (funcall ediff-session-action-function
1871 ;; arrange startup hooks
1874 'ediff-after-quit-hook-internal
1876 (if (ediff-buffer-live-p
1878 (ediff-show-meta-buffer
1882 (setq ediff-merge-store-file
1883 ,(if (ediff-nonempty-string-p
1884 merge-autostore-dir)
1887 ediff-merge-filename-prefix
1888 (file-name-nondirectory file1))) )
1889 (setq ediff-meta-buffer , (current-buffer)
1890 ediff-meta-session-number
1892 ;; this arranges that ediff-startup will pass
1893 ;; the value of ediff-control-buffer back to
1894 ;; the meta level, to the record in the meta
1895 ;; list containing the information about the
1896 ;; session associated with that
1897 ;; ediff-control-buffer
1899 (quote ,info) ediff-control-buffer)))))
1901 ) ; eval in meta-buf
1904 (defun ediff-registry-action ()
1905 "Switch to a selected session."
1907 (let* ((pos (ediff-event-point last-command-event))
1908 (buf (ediff-event-buffer last-command-event))
1909 (ctl-buf (ediff-get-meta-info buf pos)))
1911 (if (ediff-buffer-live-p ctl-buf)
1912 ;; check if this is ediff-control-buffer or ediff-meta-buffer
1913 (if (ediff-with-current-buffer ctl-buf
1914 (eq (key-binding "q") 'ediff-quit-meta-buffer))
1915 ;; it's a meta-buffer -- last action should just display it
1916 (ediff-show-meta-buffer ctl-buf t)
1917 ;; it's a session buffer -- invoke go back to session
1918 (ediff-with-current-buffer ctl-buf
1919 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1920 (ediff-recenter 'no-rehighlight)))
1922 (message "You've selected a stale session --- try again")
1923 (ediff-update-registry))
1924 (ediff-with-current-buffer buf
1929 ;; If session number is t, means don't update meta buffer
1930 (defun ediff-show-meta-buffer (&optional meta-buf session-number)
1931 "Show the session group buffer."
1933 (run-hooks 'ediff-before-directory-setup-hooks)
1934 (let (wind frame silent)
1935 (if meta-buf (setq silent t))
1937 (setq meta-buf (or meta-buf ediff-meta-buffer))
1938 (cond ((not (bufferp meta-buf))
1939 (error "This Ediff session is not part of a session group"))
1940 ((not (ediff-buffer-live-p meta-buf))
1942 "Can't find this session's group panel -- session itself is ok")))
1944 (cond ((numberp session-number)
1945 (ediff-update-meta-buffer meta-buf nil session-number))
1946 ;; if session-number is t, don't update
1948 (t (ediff-cleanup-meta-buffer meta-buf)))
1950 (ediff-with-current-buffer meta-buf
1952 (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
1955 "Already showing the group panel for this session"))
1956 (set-window-buffer wind meta-buf)
1957 (select-window wind))
1958 ((window-live-p (setq wind ediff-window-C)) ;in merge--merge buf
1959 (set-window-buffer ediff-window-C meta-buf)
1960 (select-window wind))
1961 ((window-live-p (setq wind ediff-window-A))
1962 (set-window-buffer ediff-window-A meta-buf)
1963 (select-window wind))
1964 ((window-live-p (setq wind ediff-window-B))
1965 (set-window-buffer ediff-window-B meta-buf)
1966 (select-window wind))
1969 (ediff-get-visible-buffer-window ediff-registry-buffer))
1970 (ediff-window-display-p))
1971 (select-window wind)
1973 (set-window-buffer (selected-window) meta-buf))
1974 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
1975 (set-window-buffer (selected-window) meta-buf)))
1977 (if (and (ediff-window-display-p)
1979 (setq wind (ediff-get-visible-buffer-window meta-buf))))
1981 (setq frame (window-frame wind))
1983 (ediff-reset-mouse frame)))
1984 (sit-for 0) ; sometimes needed to synch the display and ensure that the
1985 ; point ends up after the just completed session
1986 (run-hooks 'ediff-show-session-group-hook)
1989 (defun ediff-show-current-session-meta-buffer ()
1991 (ediff-show-meta-buffer nil ediff-meta-session-number))
1993 (defun ediff-show-meta-buff-from-registry ()
1994 "Display the session group buffer for a selected session group."
1996 (let* ((pos (ediff-event-point last-command-event))
1997 (meta-buf (ediff-event-buffer last-command-event))
1998 (info (ediff-get-meta-info meta-buf pos))
1999 (meta-or-session-buf info))
2000 (ediff-with-current-buffer meta-or-session-buf
2001 (ediff-show-meta-buffer nil t))))
2004 (defun ediff-show-registry ()
2005 "Display Ediff's registry."
2007 (ediff-update-registry)
2008 (if (not (ediff-buffer-live-p ediff-registry-buffer))
2009 (error "No active Ediff sessions or corrupted session registry"))
2011 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
2013 (ediff-with-current-buffer ediff-registry-buffer
2016 (ediff-get-visible-buffer-window ediff-registry-buffer))
2017 (message "Already showing the registry")
2018 (set-window-buffer wind ediff-registry-buffer)
2019 (select-window wind))
2020 ((window-live-p ediff-window-C)
2021 (set-window-buffer ediff-window-C ediff-registry-buffer)
2022 (select-window ediff-window-C))
2023 ((window-live-p ediff-window-A)
2024 (set-window-buffer ediff-window-A ediff-registry-buffer)
2025 (select-window ediff-window-A))
2026 ((window-live-p ediff-window-B)
2027 (set-window-buffer ediff-window-B ediff-registry-buffer)
2028 (select-window ediff-window-B))
2030 (ediff-get-visible-buffer-window ediff-meta-buffer))
2031 (ediff-window-display-p))
2032 (select-window wind)
2034 (set-window-buffer (selected-window) ediff-registry-buffer))
2035 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
2036 (set-window-buffer (selected-window) ediff-registry-buffer)))
2038 (if (ediff-window-display-p)
2042 (ediff-get-visible-buffer-window ediff-registry-buffer)))
2044 (ediff-reset-mouse frame)))
2045 (run-hooks 'ediff-show-registry-hook)
2049 (defalias 'eregistry 'ediff-show-registry)
2051 ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
2053 ;; Check if META-BUF exists before calling this function
2054 ;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
2055 ;; buffer. Otherwise, it will just go over the buffer and update activity marks
2056 ;; and session status.
2057 ;; SESSION-NUMBER, if specified, says which session caused the update.
2058 (defun ediff-update-meta-buffer (meta-buf &optional must-redraw session-number)
2059 (if (ediff-buffer-live-p meta-buf)
2060 (ediff-with-current-buffer meta-buf
2062 (cond (must-redraw ; completely redraw the meta buffer
2063 (funcall ediff-meta-redraw-function ediff-meta-list))
2064 ((numberp session-number) ; redraw only for the given session
2065 (ediff-update-session-marker-in-dir-meta-buffer
2067 (t ; update what changed only, but scan the entire meta buffer
2068 (ediff-update-markers-in-dir-meta-buffer ediff-meta-list)))
2069 (setq overl (ediff-get-meta-overlay-at-pos (point)))
2070 ;; skip the invisible sessions
2071 (while (and overl (ediff-overlay-get overl 'invisible))
2072 (ediff-next-meta-item1)
2073 (setq overl (ediff-get-meta-overlay-at-pos (point))))
2076 (defun ediff-update-registry ()
2077 (ediff-with-current-buffer (current-buffer)
2078 (if (ediff-buffer-live-p ediff-registry-buffer)
2079 (ediff-redraw-registry-buffer)
2080 (ediff-prepare-meta-buffer
2081 'ediff-registry-action
2082 ediff-session-registry
2084 'ediff-redraw-registry-buffer
2088 ;; If meta-buf exists, it is redrawn along with parent.
2089 ;; Otherwise, nothing happens.
2090 (defun ediff-cleanup-meta-buffer (meta-buffer)
2091 (if (ediff-buffer-live-p meta-buffer)
2092 (ediff-with-current-buffer meta-buffer
2093 (ediff-update-meta-buffer meta-buffer)
2094 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
2095 (ediff-update-meta-buffer
2096 ediff-parent-meta-buffer nil ediff-meta-session-number)))))
2098 ;; t if no session is in progress
2099 (defun ediff-safe-to-quit (meta-buffer)
2100 (if (ediff-buffer-live-p meta-buffer)
2101 (let ((lis ediff-meta-list)
2104 ;;(ediff-update-meta-buffer meta-buffer)
2105 (ediff-with-current-buffer meta-buffer
2106 (setq lis (cdr lis)) ; discard the description part of meta-list
2107 (while (and cont lis)
2108 (if (ediff-buffer-live-p
2109 (ediff-get-group-buffer lis)) ; in progress
2111 (setq lis (cdr lis)))
2114 (defun ediff-quit-meta-buffer ()
2115 "If the group has no active session, delete the meta buffer.
2116 If no session is in progress, ask to confirm before deleting meta buffer.
2117 Otherwise, bury the meta buffer.
2118 If this is a session registry buffer then just bury it."
2120 (let* ((buf (current-buffer))
2121 (dir-diffs-buffer ediff-dir-diffs-buffer)
2122 (meta-diff-buffer ediff-meta-diff-buffer)
2123 (session-number ediff-meta-session-number)
2124 (parent-buf ediff-parent-meta-buffer)
2125 (dont-show-registry (eq buf ediff-registry-buffer)))
2126 (if dont-show-registry
2128 ;;(ediff-cleanup-meta-buffer buf)
2129 (cond ((and (ediff-safe-to-quit buf)
2130 (y-or-n-p "Quit this session group? "))
2131 (run-hooks 'ediff-quit-session-group-hook)
2133 (ediff-dispose-of-meta-buffer buf))
2134 ((ediff-safe-to-quit buf)
2138 "This session group has active sessions---cannot exit")))
2139 (ediff-update-meta-buffer parent-buf nil session-number)
2140 (ediff-kill-buffer-carefully dir-diffs-buffer)
2141 (ediff-kill-buffer-carefully meta-diff-buffer)
2142 (if (ediff-buffer-live-p parent-buf)
2144 (setq dont-show-registry t)
2145 (ediff-show-meta-buffer parent-buf session-number)))
2147 (or dont-show-registry
2148 (ediff-show-registry))))
2150 (defun ediff-dispose-of-meta-buffer (buf)
2151 (setq ediff-session-registry (delq buf ediff-session-registry))
2152 (ediff-with-current-buffer buf
2153 (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
2154 (kill-buffer ediff-dir-diffs-buffer)))
2158 ;; Obtain information on a meta record where the user clicked or typed
2159 ;; BUF is the buffer where this happened and POINT is the position
2160 ;; If optional NOERROR arg is given, don't report error and return nil if no
2161 ;; meta info is found on line.
2162 (defun ediff-get-meta-info (buf point &optional noerror)
2163 (let (result olist tmp)
2164 (if (and point (ediff-buffer-live-p buf))
2165 (ediff-with-current-buffer buf
2166 (ediff-cond-compile-for-xemacs-or-emacs
2167 (setq result ; xemacs
2168 (if (setq tmp (extent-at point buf 'ediff-meta-info))
2169 (ediff-overlay-get tmp 'ediff-meta-info)))
2171 (setq olist (overlays-at point))
2173 (mapcar (lambda (elt)
2174 (unless (overlay-get elt 'invisible)
2175 (overlay-get elt 'ediff-meta-info)))
2177 (while (and olist (null (car olist)))
2178 (setq olist (cdr olist)))
2179 (setq result (car olist)))
2186 (ediff-update-registry)
2187 (error "No session info in this line")))))
2190 (defun ediff-get-meta-overlay-at-pos (point)
2191 (ediff-cond-compile-for-xemacs-or-emacs
2192 (extent-at point (current-buffer) 'ediff-meta-info) ; xemacs
2194 (let* ((overl-list (overlays-at point))
2195 (overl (car overl-list)))
2196 (while (and overl (null (overlay-get overl 'ediff-meta-info)))
2197 (setq overl-list (cdr overl-list)
2198 overl (car overl-list)))
2203 (defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
2204 (setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
2207 (ediff-with-current-buffer meta-buffer
2209 (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number)))
2212 ;; Return location of the next meta overlay after point
2213 (defun ediff-next-meta-overlay-start (point)
2215 (goto-char (point-min))
2216 (let ((overl (ediff-get-meta-overlay-at-pos point)))
2217 (ediff-cond-compile-for-xemacs-or-emacs
2220 (setq overl (next-extent overl))
2221 (setq overl (next-extent (current-buffer))))
2223 (extent-start-position overl)
2227 ;; note: end of current overlay is the beginning of the next one
2229 (next-overlay-change point))
2235 (defun ediff-previous-meta-overlay-start (point)
2237 (goto-char (point-max))
2238 (let ((overl (ediff-get-meta-overlay-at-pos point)))
2239 (ediff-cond-compile-for-xemacs-or-emacs
2242 (setq overl (previous-extent overl))
2243 (setq overl (previous-extent (current-buffer))))
2245 (extent-start-position overl)
2248 (if overl (setq point (overlay-start overl)))
2249 ;; to get to the beginning of prev overlay
2251 ;; trick to overcome an emacs bug--doesn't always find previous
2252 ;; overlay change correctly
2253 (setq point (1- point)))
2254 (setq point (previous-overlay-change point))
2255 ;; If we are not over an overlay after subtracting 1, it means we are
2256 ;; in the description area preceding session records. In this case,
2257 ;; goto the top of the registry buffer.
2258 (or (car (overlays-at point))
2259 (setq point (point-min)))
2264 ;; this is the action invoked when the user selects a patch from the meta
2266 (defun ediff-patch-file-form-meta (file &optional startup-hooks)
2267 (let* ((pos (ediff-event-point last-command-event))
2268 (meta-buf (ediff-event-buffer last-command-event))
2269 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
2270 (info (ediff-get-meta-info meta-buf pos))
2271 (meta-patchbuf ediff-meta-patchbufer)
2272 session-buf beg-marker end-marker)
2274 (if (or (file-directory-p file) (string-match "/dev/null" file))
2275 (error "`%s' is not an ordinary file" (file-name-as-directory file)))
2276 (setq session-buf (ediff-get-session-buffer info)
2277 beg-marker (ediff-get-session-objB-name info)
2278 end-marker (ediff-get-session-objC-name info))
2280 (or (ediff-buffer-live-p session-buf) ; either an active patch session
2281 (null session-buf) ; or it is a virgin session
2283 "Patch has already been applied to this file -- can't repeat!"))
2285 (ediff-with-current-buffer meta-patchbuf
2288 (narrow-to-region beg-marker end-marker)
2289 (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
2292 (defun ediff-unmark-all-for-operation ()
2293 "Unmark all sessions marked for operation."
2295 (let ((list (cdr ediff-meta-list))
2297 (while (setq elt (car list))
2298 (ediff-mark-session-for-operation elt 'unmark)
2299 (setq list (cdr list))))
2300 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2302 (defun ediff-unmark-all-for-hiding ()
2303 "Unmark all sessions marked for hiding."
2305 (let ((list (cdr ediff-meta-list))
2307 (while (setq elt (car list))
2308 (ediff-mark-session-for-hiding elt 'unmark)
2309 (setq list (cdr list))))
2310 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2313 ;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply
2314 ;; indicate which are equal files
2315 (defun ediff-meta-mark-equal-files (&optional action)
2316 "Run through the session list and mark identical files.
2317 This is used only for sessions that involve 2 or 3 files at the same time.
2318 ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark
2319 for operation, or simply indicate which are equal files. If it is nil, then
2320 last-command-char is used to decide which action to take."
2323 (setq action last-command-char))
2324 (let ((list (cdr ediff-meta-list))
2325 marked1 marked2 marked3
2326 fileinfo1 fileinfo2 fileinfo3 elt)
2327 (message "Comparing files ...")
2328 (while (setq elt (car list))
2329 (setq fileinfo1 (ediff-get-session-objA elt)
2330 fileinfo2 (ediff-get-session-objB elt)
2331 fileinfo3 (ediff-get-session-objC elt))
2332 (ediff-set-file-eqstatus fileinfo1 nil)
2333 (ediff-set-file-eqstatus fileinfo2 nil)
2334 (ediff-set-file-eqstatus fileinfo3 nil)
2339 (or (ediff-mark-if-equal fileinfo1 fileinfo2)
2341 (if (ediff-metajob3)
2343 (or (ediff-mark-if-equal fileinfo1 fileinfo3)
2345 (or (ediff-mark-if-equal fileinfo2 fileinfo3)
2346 (setq marked3 nil))))
2347 (if (and marked1 marked2 marked3)
2348 (cond ((eq action ?h)
2349 (ediff-mark-session-for-hiding elt 'mark))
2351 (ediff-mark-session-for-operation elt 'mark))
2353 (setq list (cdr list)))
2354 (message "Comparing files ... Done"))
2355 (setq ediff-recurse-to-subdirectories nil)
2356 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2358 ;; mark files 1 and 2 as equal, if they are.
2359 ;; returns t, if something was marked
2360 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
2361 (let ((f1 (car fileinfo1))
2362 (f2 (car fileinfo2)))
2363 (if (and (stringp f1) (stringp f2) (ediff-same-contents f1 f2))
2365 (ediff-set-file-eqstatus fileinfo1 t)
2366 (ediff-set-file-eqstatus fileinfo2 t)
2372 ;;; Local Variables:
2373 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
2374 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
2375 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
2378 ;;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188
2379 ;;; ediff-mult.el ends here