1 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
3 ;; Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.sunysb.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 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 (obj1 obj2 obj3) (...) ...)
44 ;; Actually, the format of this list is pretty much up to the
45 ;; developer. The only thing is that it must be a list of lists,
46 ;; and the first list must describe the meta session, and subsequent
47 ;; elements must describe individual sessions.
48 ;; This descriptor must be a list of two, three, or four elements (nil
49 ;; or string). The function ediff-redraw-registry-buffer displays the
50 ;; second through last of these in the registry buffer.
51 ;; Also, keep in mind that the function ediff-prepare-meta-buffer
52 ;; (which see) prepends the session group buffer to the descriptor and
53 ;; nil in front of each subsequent list (i.e., the above list
55 ;; ((meta-buf descriptor) (nil obj1 obj2 obj3) (nil ...) ...)
56 ;; Ediff expects that your function (in 2 above) will arrange to
57 ;; replace this prepended nil (via setcar) with the actual ediff
58 ;; control buffer associated with an appropriate Ediff session.
59 ;; This is arranged through internal startup hooks that can be passed
60 ;; to any of Ediff major entries (such as ediff-files, epatch, etc.).
61 ;; See how this is done in ediff-filegroup-action.
63 ;; Session descriptions are of the form (obj1 obj2 obj3), which
64 ;; describe objects relevant to the session. Usually they are names of
65 ;; files, but sometimes they may be other things. For instance, obj3 is
66 ;; nil for jobs that involve only two files. For patch jobs, obj2 and
67 ;; obj3 are markers that specify the patch corresponding to the file
68 ;; (whose name is obj1).
69 ;; 4. Write a function that makes a call to ediff-prepare-meta-buffer
70 ;; passing all this info.
71 ;; You may be able to use ediff-directories-internal as a template.
72 ;; 5. If you intend to add several related pieces of functionality,
73 ;; you may want to keep the function in 4 as an internal version
74 ;; and then write several top-level interactive functions that call it
75 ;; with different parameters.
76 ;; See how ediff-directories, ediff-merge-directories, and
77 ;; ediff-merge-directories-with-ancestor all use
78 ;; ediff-directories-internal.
80 ;; A useful addition here could be session groups selected by patterns
81 ;; (which are different in each directory). For instance, one may want to
82 ;; compare files of the form abc{something}.c to files old{something}.d
83 ;; which may be in the same or different directories. Or, one may want to
84 ;; compare all files of the form {something} to files of the form {something}~.
86 ;; Implementing this requires writing an collating function, which should pair
87 ;; up appropriate files. It will also require a generalization of the functions
88 ;; that do the layout of the meta- and differences buffers and of
89 ;; ediff-filegroup-action.
95 (defgroup ediff-mult nil
96 "Multi-file and multi-buffer processing in Ediff"
103 (let ((load-path (cons (expand-file-name ".") load-path)))
104 (or (featurep 'ediff-init)
105 (load "ediff-init.el" nil nil 'nosuffix))
106 (or (featurep 'ediff-util)
107 (load "ediff-util.el" nil nil 'nosuffix))
111 (require 'ediff-init)
112 (require 'ediff-util)
115 (ediff-defvar-local ediff-meta-buffer nil "")
116 (ediff-defvar-local ediff-parent-meta-buffer nil "")
117 ;; the registry buffer
118 (defvar ediff-registry-buffer nil)
120 (defconst ediff-meta-buffer-message "This is an Ediff Session Group Panel: %s
123 button2, v, or RET over session record: start that Ediff session
124 M:\tin sessions invoked from here, brings back this group panel
125 R:\tdisplay the registry of active Ediff sessions
126 h:\tmark session for hiding (toggle)
127 x:\thide marked sessions; with prefix arg: unhide
128 m:\tmark session for a non-hiding operation (toggle)
129 uh/um:\tunmark all sessions marked for hiding/operation
131 p,DEL:\tprevious session
132 E:\tbrowse Ediff on-line manual
133 T:\ttoggle truncation of long file names
134 q:\tquit this session group
137 (ediff-defvar-local ediff-meta-buffer-map nil
138 "The keymap for the meta buffer.")
139 (defvar ediff-dir-diffs-buffer-map (make-sparse-keymap)
140 "The keymap to be installed in the buffer showing differences between
143 ;; Variable specifying the action to take when the use invokes ediff in the
144 ;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action
145 (ediff-defvar-local ediff-meta-action-function nil "")
146 ;; Tells ediff-update-meta-buffer how to redraw it
147 (ediff-defvar-local ediff-meta-redraw-function nil "")
148 ;; Tells ediff-filegroup-action and similar procedures how to invoke Ediff for
149 ;; the sessions in a given session group
150 (ediff-defvar-local ediff-session-action-function nil "")
152 (ediff-defvar-local ediff-metajob-name nil "")
154 ;; buffer used to collect custom diffs from individual sessions in the group
155 (ediff-defvar-local ediff-meta-diff-buffer nil "")
157 ;; history var to use for filtering groups
158 (defvar ediff-filtering-regexp-history nil "")
160 ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir)
161 ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3
162 ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2
163 ;; . eq-status)) ...)
164 ;; If ctl-buf is nil, the file-pair hasn't processed yet. If it is
165 ;; killed-buffer object, the file pair has been processed. If it is a live
166 ;; buffer, this means ediff is still working on the pair.
167 ;; Eq-status of a file is t if the file equals some other file in the same
169 (ediff-defvar-local ediff-meta-list nil "")
171 (ediff-defvar-local ediff-meta-session-number nil "")
174 ;; the difference list between directories in a directory session group
175 (ediff-defvar-local ediff-dir-difference-list nil "")
176 (ediff-defvar-local ediff-dir-diffs-buffer nil "")
178 ;; The registry of Ediff sessions. A list of control buffers.
179 (defvar ediff-session-registry nil)
181 (defcustom ediff-meta-truncate-filenames t
182 "*If non-nil, truncate long file names in the session group buffers.
183 This can be toggled with `ediff-toggle-filename-truncation'."
186 (defcustom ediff-registry-setup-hook nil
187 "*Hooks run just after the registry control panel is set up."
190 (defcustom ediff-session-group-setup-hook nil
191 "*Hooks run just after a meta-buffer controlling a session group, such as
192 ediff-directories, is run."
195 (defcustom ediff-quit-session-group-hook nil
196 "*Hooks run just before exiting a session group."
199 (defcustom ediff-show-registry-hook nil
200 "*Hooks run just after the registry buffer is shown."
203 (defcustom ediff-show-session-group-hook nil
204 "*Hooks run just after a session group buffer is shown."
207 (defcustom ediff-meta-buffer-keymap-setup-hook nil
208 "*Hooks run just after setting up the ediff-meta-buffer-map.
209 This keymap controls key bindings in the meta buffer and is a local variable.
210 This means that you can set different bindings for different kinds of meta
215 ;; buffer holding the multi-file patch. local to the meta buffer
216 (ediff-defvar-local ediff-meta-patchbufer nil "")
218 ;;; API for ediff-meta-list
220 ;; group buffer/regexp
221 (defsubst ediff-get-group-buffer (meta-list)
222 (nth 0 (car meta-list)))
224 (defsubst ediff-get-group-regexp (meta-list)
225 (nth 1 (car meta-list)))
227 (defsubst ediff-get-group-objA (meta-list)
228 (nth 2 (car meta-list)))
229 (defsubst ediff-get-group-objB (meta-list)
230 (nth 3 (car meta-list)))
231 (defsubst ediff-get-group-objC (meta-list)
232 (nth 4 (car meta-list)))
233 (defsubst ediff-get-group-merge-autostore-dir (meta-list)
234 (nth 5 (car meta-list)))
237 (defsubst ediff-get-session-buffer (elt)
239 (defsubst ediff-get-session-status (elt)
241 (defsubst ediff-set-session-status (session-info new-status)
242 (setcar (cdr session-info) new-status))
244 (defsubst ediff-get-session-objA (elt)
246 (defsubst ediff-get-session-objB (elt)
248 (defsubst ediff-get-session-objC (elt)
250 (defsubst ediff-get-session-objA-name (elt)
252 (defsubst ediff-get-session-objB-name (elt)
254 (defsubst ediff-get-session-objC-name (elt)
256 ;; equality indicators
257 (defsubst ediff-get-file-eqstatus (elt)
259 (defsubst ediff-set-file-eqstatus (elt value)
260 (setcar (cdr elt) value))
262 ;; The activity marker is either or + (active session, i.e., ediff is currently
263 ;; run in it), or - (finished session, i.e., we've ran ediff in it and then
264 ;; exited). Return nil, if session is neither active nor finished
265 (defun ediff-get-session-activity-marker (session)
266 (let ((session-buf (ediff-get-session-buffer session)))
267 (cond ((null session-buf) nil) ; virgin session
268 ((ediff-buffer-live-p session-buf) ?+) ;active session
271 ;; checks if the session is a meta session
272 (defun ediff-meta-session-p (session-info)
273 (and (stringp (ediff-get-session-objA-name session-info))
274 (file-directory-p (ediff-get-session-objA-name session-info))
275 (stringp (ediff-get-session-objB-name session-info))
276 (file-directory-p (ediff-get-session-objB-name session-info))
277 (if (stringp (ediff-get-session-objC-name session-info))
278 (file-directory-p (ediff-get-session-objC-name session-info)) t)))
280 ;; set up the keymap in the meta buffer
281 (defun ediff-setup-meta-map()
282 (setq ediff-meta-buffer-map (make-sparse-keymap))
283 (suppress-keymap ediff-meta-buffer-map)
284 (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer)
285 (define-key ediff-meta-buffer-map "T" 'ediff-toggle-filename-truncation)
286 (define-key ediff-meta-buffer-map "R" 'ediff-show-registry)
287 (define-key ediff-meta-buffer-map "E" 'ediff-documentation)
288 (define-key ediff-meta-buffer-map "v" ediff-meta-action-function)
289 (define-key ediff-meta-buffer-map "\C-m" ediff-meta-action-function)
290 (define-key ediff-meta-buffer-map " " 'ediff-next-meta-item)
291 (define-key ediff-meta-buffer-map "n" 'ediff-next-meta-item)
292 (define-key ediff-meta-buffer-map "\C-?" 'ediff-previous-meta-item)
293 (define-key ediff-meta-buffer-map "p" 'ediff-previous-meta-item)
294 (define-key ediff-meta-buffer-map [delete] 'ediff-previous-meta-item)
295 (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item)
296 (or (ediff-one-filegroup-metajob)
298 (define-key ediff-meta-buffer-map "=" nil)
299 (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files)
300 (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files)
301 (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files)))
302 (if ediff-no-emacs-help-in-control-buffer
303 (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item))
305 (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function)
306 (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function))
308 (use-local-map ediff-meta-buffer-map)
309 ;; modify ediff-meta-buffer-map here
310 (run-hooks 'ediff-meta-buffer-keymap-setup-hook))
312 (defun ediff-meta-mode ()
313 "This mode controls all operations on Ediff session groups.
314 It is entered through one of the following commands:
319 `ediff-merge-directories'
321 `ediff-merge-directories-with-ancestor'
322 `edirs-merge-with-ancestor'
323 `ediff-directory-revisions'
325 `ediff-merge-directory-revisions'
326 `edir-merge-revisions'
327 `ediff-merge-directory-revisions-with-ancestor'
328 `edir-merge-revisions-with-ancestor'
331 \\{ediff-meta-buffer-map}"
332 (kill-all-local-variables)
333 (setq major-mode 'ediff-meta-mode)
334 (setq mode-name "MetaEdiff"))
337 ;; the keymap for the buffer showing directory differences
338 (suppress-keymap ediff-dir-diffs-buffer-map)
339 (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer)
340 (define-key ediff-dir-diffs-buffer-map " " 'next-line)
341 (define-key ediff-dir-diffs-buffer-map "n" 'next-line)
342 (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line)
343 (define-key ediff-dir-diffs-buffer-map "p" 'previous-line)
344 (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line)
345 (define-key ediff-dir-diffs-buffer-map [backspace] 'previous-line)
347 (defun ediff-next-meta-item (count)
348 "Move to the next item in Ediff registry or session group buffer.
349 Moves in circular fashion. With numeric prefix arg, skip this many items."
351 (or count (setq count 1))
354 (setq count (1- count))
355 (ediff-next-meta-item1)
356 (setq overl (ediff-get-meta-overlay-at-pos (point)))
357 ;; skip invisible ones
358 (while (and overl (ediff-overlay-get overl 'invisible))
359 (ediff-next-meta-item1)
360 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
362 ;; Move to the next meta item
363 (defun ediff-next-meta-item1 ()
365 (setq pos (ediff-next-meta-overlay-start (point)))
366 (if pos (goto-char pos))
367 (if (eq ediff-metajob-name 'ediff-registry)
368 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
369 (search-forward "*Ediff" nil t))
370 (skip-chars-backward "a-zA-Z*"))
371 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
372 (backward-char 1)))))
375 (defun ediff-previous-meta-item (count)
376 "Move to the previous item in Ediff registry or session group buffer.
377 Moves in circular fashion. With numeric prefix arg, skip this many items."
379 (or count (setq count 1))
382 (setq count (1- count))
383 (ediff-previous-meta-item1)
384 (setq overl (ediff-get-meta-overlay-at-pos (point)))
385 ;; skip invisible ones
386 (while (and overl (ediff-overlay-get overl 'invisible))
387 (ediff-previous-meta-item1)
388 (setq overl (ediff-get-meta-overlay-at-pos (point)))))))
390 (defun ediff-previous-meta-item1 ()
392 (setq pos (ediff-previous-meta-overlay-start (point)))
394 ;;; (while (ediff-get-session-status
395 ;;; (ediff-get-meta-info (current-buffer) pos 'noerror))
396 ;;; (setq pos (ediff-previous-meta-overlay-start pos)))
398 (if pos (goto-char pos))
399 (if (eq ediff-metajob-name 'ediff-registry)
400 (if (and (ediff-get-meta-info (current-buffer) pos 'noerror)
401 (search-forward "*Ediff" nil t))
402 (skip-chars-backward "a-zA-Z*"))
403 (if (> (skip-chars-forward "-+?H* \t0-9") 0)
407 (defsubst ediff-add-slash-if-directory (dir file)
408 (if (file-directory-p (concat dir file))
409 (file-name-as-directory file)
412 (defun ediff-toggle-filename-truncation ()
413 "Toggle truncation of long file names in session group buffers.
414 Set `ediff-meta-truncate-filenames' variable if you want to change the default
417 (setq ediff-meta-truncate-filenames (not ediff-meta-truncate-filenames))
418 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
421 ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil.
422 ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs.
424 ;; REGEXP is a regexp used to filter out files in the directories.
425 ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not
426 ;; included in the intersection. However, a regular file that is a dir in dir3
427 ;; is included, since dir3 files are supposed to be ancestors for merging.
428 ;; Returns a list of the form:
429 ;; ((dir1 dir2 dir3) (f1 f2 f3) (f1 f2 f3) ...)
430 ;; dir3, f3 can be nil if intersecting only 2 directories.
431 ;; If COMPARISON-FUNC is given, use it. Otherwise, use string=
432 ;; DIFF-VAR contains the name of the variable in which to return the
433 ;; difference list (which represents the differences among the contents of
434 ;; directories). The diff list is of the form:
435 ;; ((dir1 dir2 dir3) (file . num) (file . num)...)
436 ;; where num encodes the set of dirs where the file is found:
437 ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc.
438 (defun ediff-intersect-directories (jobname
439 diff-var regexp dir1 dir2
441 dir3 merge-autostore-dir comparison-func)
442 (setq comparison-func (or comparison-func 'string=))
443 (let (lis1 lis2 lis3 common auxdir1 auxdir2 auxdir3 difflist)
445 (setq auxdir1 (file-name-as-directory dir1)
446 lis1 (directory-files auxdir1 nil regexp)
447 lis1 (delete "." lis1)
448 lis1 (delete ".." lis1)
452 (ediff-add-slash-if-directory auxdir1 elt)))
454 auxdir2 (file-name-as-directory dir2)
458 (ediff-add-slash-if-directory auxdir2 elt)))
459 (directory-files auxdir2 nil regexp)))
462 (setq auxdir3 (file-name-as-directory dir3)
466 (ediff-add-slash-if-directory auxdir3 elt)))
467 (directory-files auxdir3 nil regexp))))
469 (if (stringp merge-autostore-dir)
470 (setq merge-autostore-dir
471 (file-name-as-directory merge-autostore-dir)))
472 (setq common (ediff-intersection lis1 lis2 comparison-func))
474 ;; In merge with ancestor jobs, we don't intersect with lis3.
475 ;; If there is no ancestor, we'll offer to merge without the ancestor.
476 ;; So, we intersect with lis3 only when we are doing 3-way file comparison
477 (if (and lis3 (ediff-comparison-metajob3 jobname))
478 (setq common (ediff-intersection common lis3 comparison-func)))
480 ;; copying is needed because sort sorts via side effects
481 (setq common (sort (ediff-copy-list common) 'string-lessp))
483 ;; compute difference list
484 (setq difflist (ediff-set-difference
485 (ediff-union (ediff-union lis1 lis2 comparison-func)
490 difflist (delete "." difflist)
491 ;; copying is needed because sort sorts via side effects
492 difflist (sort (ediff-copy-list (delete ".." difflist))
495 (setq difflist (mapcar (function (lambda (elt) (cons elt 1))) difflist))
497 ;; check for files belonging to lis1/2/3
498 (mapcar (function (lambda (elt)
499 (if (member (car elt) lis1)
500 (setcdr elt (* (cdr elt) 2)))
501 (if (member (car elt) lis2)
502 (setcdr elt (* (cdr elt) 3)))
503 (if (member (car elt) lis3)
504 (setcdr elt (* (cdr elt) 5)))
507 (setq difflist (cons (list regexp auxdir1 auxdir2 auxdir3) difflist))
509 ;; return the difference list back to the calling function
510 (set diff-var difflist)
513 (cons (list regexp auxdir1 auxdir2 auxdir3 merge-autostore-dir)
517 (list (concat auxdir1 elt)
521 ;; The following is done because:
522 ;; In merging with ancestor, we don't intersect
523 ;; with lis3. So, it is possible that elt is a
524 ;; file in auxdir1/2 but a directory in auxdir3
525 ;; Or elt may not exist in auxdir3 at all.
526 ;; In the first case, we add a slash at the end.
527 ;; In the second case, we insert nil.
528 (setq elt (ediff-add-slash-if-directory auxdir3 elt))
529 (if (file-exists-p (concat auxdir3 elt))
530 (concat auxdir3 elt)))))))
534 ;; find directory files that are under revision. Include subdirectories, since
535 ;; we may visit them recursively. DIR1 is the directory to inspect.
536 ;; MERGE-AUTOSTORE-DIR is the directory where to auto-store the results of
537 ;; merges. Can be nil.
538 (defun ediff-get-directory-files-under-revision (jobname
540 &optional merge-autostore-dir)
541 (let (lis1 elt common auxdir1)
542 (setq auxdir1 (file-name-as-directory dir1)
543 lis1 (directory-files auxdir1 nil regexp))
545 (if (stringp merge-autostore-dir)
546 (setq merge-autostore-dir
547 (file-name-as-directory merge-autostore-dir)))
552 ;; take files under revision control
553 (cond ((file-directory-p (concat auxdir1 elt))
555 (cons (ediff-add-slash-if-directory auxdir1 elt) common)))
556 ((file-exists-p (concat auxdir1 elt ",v"))
557 (setq common (cons elt common)))
558 ((file-exists-p (concat auxdir1 "RCS/" elt ",v"))
559 (setq common (cons elt common)))
563 (setq common (delete "./" common)
564 common (delete "../" common)
565 common (delete "RCS" common))
567 ;; copying is needed because sort sorts via side effects
568 (setq common (sort (ediff-copy-list common) 'string-lessp))
571 (cons (list regexp auxdir1 nil nil merge-autostore-dir)
572 (mapcar (function (lambda (elt)
573 (list (concat auxdir1 elt)
579 ;; If file groups selected by patterns will ever be implemented, this
580 ;; comparison function might become useful.
581 ;;;; uses external variables PAT1 PAT2 to compare str1/2
582 ;;;; patterns must be of the form ???*???? where ??? are strings of chars
583 ;;;; containing no *.
584 ;;(defun ediff-pattern= (str1 str2)
585 ;; (let (pos11 pos12 pos21 pos22 len1 len2)
587 ;; len (length epat1)
589 ;; (while (and (< pos11 len) (not (= (aref epat1 pos11) ?*)))
590 ;; (setq pos11 (1+ pos11)))
591 ;; (while (and (> pos12 0) (not (= (aref epat1 (1- pos12)) ?*)))
592 ;; (setq pos12 (1- pos12)))
595 ;; len (length epat2)
597 ;; (while (and (< pos21 len) (not (= (aref epat2 pos21) ?*)))
598 ;; (setq pos21 (1+ pos21)))
599 ;; (while (and (> pos22 0) (not (= (aref epat2 (1- pos22)) ?*)))
600 ;; (setq pos22 (1- pos22)))
602 ;; (if (and (> (length str1) pos12) (>= pos12 pos11) (> pos11 -1)
603 ;; (> (length str2) pos22) (>= pos22 pos21) (> pos21 -1))
604 ;; (string= (substring str1 pos11 pos12)
605 ;; (substring str2 pos21 pos22)))
609 ;; Prepare meta-buffer in accordance with the argument-function and
610 ;; redraw-function. Must return the created meta-buffer.
611 (defun ediff-prepare-meta-buffer (action-func meta-list
612 meta-buffer-name redraw-function
613 jobname &optional startup-hooks)
614 (let* ((meta-buffer-name
615 (ediff-unique-buffer-name meta-buffer-name "*"))
616 (meta-buffer (get-buffer-create meta-buffer-name)))
617 (ediff-with-current-buffer meta-buffer
622 (setq ediff-meta-action-function action-func
623 ediff-meta-redraw-function redraw-function
624 ediff-metajob-name jobname
625 ediff-meta-buffer meta-buffer)
627 ;; comes after ediff-meta-action-function is set
628 (ediff-setup-meta-map)
630 (if (eq ediff-metajob-name 'ediff-registry)
632 (setq ediff-registry-buffer meta-buffer
633 ediff-meta-list meta-list)
634 ;; this func is used only from registry buffer, not from other
637 ediff-meta-buffer-map "M" 'ediff-show-meta-buff-from-registry))
638 ;; Initialize the meta list -- don't do this for registry.
640 ;; We prepend '(nil nil) to all elts of meta-list, except the first.
641 ;; The first nil will later be replaced by the session buffer. The
642 ;; second is reserved for session status.
644 ;; (car ediff-meta-list) gets cons'ed with the session group buffer.
645 ;; Also, session objects A/B/C are turned into lists of the form
646 ;; (obj eq-indicator). Eq-indicator is either nil or =. Initialized to
647 ;; nil. If later it is discovered that this file is = to some other
648 ;; file in the same session, eq-indicator is changed to `='.
649 ;; For now, the eq-indicator is used only for 2 and 3-file jobs.
650 (setq ediff-meta-list
651 (cons (cons meta-buffer (car meta-list))
657 ;; convert each obj to (obj nil),
658 ;; where nil is the initial value
659 ;; for eq-indicator -- see above
661 (function (lambda (obj) (list obj nil)))
665 (or (eq meta-buffer ediff-registry-buffer)
666 (setq ediff-session-registry
667 (cons meta-buffer ediff-session-registry)))
669 ;; redraw-function uses ediff-meta-list
670 (funcall redraw-function ediff-meta-list)
672 ;; set read-only/non-modified
673 (setq buffer-read-only t)
674 (set-buffer-modified-p nil)
676 (run-hooks 'startup-hooks)
678 ;; Arrange to show directory contents differences
679 ;; Must be after run startup-hooks, since ediff-dir-difference-list is
680 ;; set inside these hooks
681 (if (eq action-func 'ediff-filegroup-action)
683 ;; put meta buffer in (car ediff-dir-difference-list)
684 (setq ediff-dir-difference-list
685 (cons (cons meta-buffer (car ediff-dir-difference-list))
686 (cdr ediff-dir-difference-list)))
688 (or (ediff-one-filegroup-metajob jobname)
689 (ediff-draw-dir-diffs ediff-dir-difference-list))
691 ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos)
692 (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions)
694 ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos)
695 (define-key ediff-meta-buffer-map "u" nil)
697 ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation)
699 ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding)
700 (cond ((ediff-collect-diffs-metajob jobname)
702 ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs))
703 ((ediff-patch-metajob jobname)
705 ediff-meta-buffer-map "P" 'ediff-meta-show-patch)))
706 (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy)
707 (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs)))
709 (if (eq ediff-metajob-name 'ediff-registry)
710 (run-hooks 'ediff-registry-setup-hook)
711 (run-hooks 'ediff-session-group-setup-hook))
712 ) ; eval in meta-buffer
715 ;; Insert the activity marker for session SESSION in the meta buffer at point
716 ;; The activity marker is either SPC (untouched session), or + (active session,
717 ;; i.e., ediff is currently run in it), or - (finished session, i.e., we've ran
718 ;; ediff in it and then exited)
719 (defun ediff-insert-session-activity-marker-in-meta-buffer (session)
721 (cond ((ediff-get-session-activity-marker session))
725 ;; Insert session status at point. Status is either ?H (marked for hiding), or
726 ;; ?I (hidden or invalid), or ?* (meaning marked for an operation; currently,
727 ;; such op can only be checking for equality)), or SPC (meaning neither marked
729 (defun ediff-insert-session-status-in-meta-buffer (session)
731 (cond ((ediff-get-session-status session)) ; session has status: ?H, ?I, ?*
732 ;; normal session, no marks or hidings
735 ;; If NEW-MARKER is non-nil, use it to substitute the current activity marker
736 ;; in the meta buffer. If nil, use SPC
737 (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker)
738 (let* ((overl (ediff-get-meta-overlay-at-pos point))
739 (session-info (ediff-overlay-get overl 'ediff-meta-info))
740 (activity-marker (ediff-get-session-activity-marker session-info))
742 (or new-marker activity-marker (setq new-marker ?\ ))
743 (goto-char (ediff-overlay-start overl))
744 (if (eq (char-after (point)) new-marker)
745 () ; if marker shown in buffer is the same as new-marker, do nothing
748 (set-buffer-modified-p nil))))
750 ;; If NEW-STATUS is non-nil, use it to substitute the current status marker in
751 ;; the meta buffer. If nil, use SPC
752 (defun ediff-replace-session-status-in-meta-buffer (point new-status)
753 (let* ((overl (ediff-get-meta-overlay-at-pos point))
754 (session-info (ediff-overlay-get overl 'ediff-meta-info))
755 (status (ediff-get-session-status session-info))
757 (setq new-status (or new-status status ?\ ))
758 (goto-char (ediff-overlay-start overl))
759 (forward-char 1) ; status is the second char in session record
760 (if (eq (char-after (point)) new-status)
761 () ; if marker shown in buffer is the same as new-marker, do nothing
764 (set-buffer-modified-p nil))))
766 ;; insert all file info in meta buffer for a given session
767 (defun ediff-insert-session-info-in-meta-buffer (session-info sessionNum)
768 (let ((f1 (ediff-get-session-objA session-info))
769 (f2 (ediff-get-session-objB session-info))
770 (f3 (ediff-get-session-objC session-info))
772 (hidden (eq (ediff-get-session-status session-info) ?I)))
773 ;; insert activity marker, i.e., SPC, - or +
774 (ediff-insert-session-activity-marker-in-meta-buffer session-info)
775 ;; insert session status, i.e., *, H
776 (ediff-insert-session-status-in-meta-buffer session-info)
777 (insert " Session " (int-to-string sessionNum) ":\n")
778 (ediff-meta-insert-file-info1 f1)
779 (ediff-meta-insert-file-info1 f2)
780 (ediff-meta-insert-file-info1 f3)
781 (ediff-set-meta-overlay pt (point) session-info sessionNum hidden)))
784 ;; this is a setup function for ediff-directories
785 ;; must return meta-buffer
786 (defun ediff-redraw-directory-group-buffer (meta-list)
787 ;; extract directories
788 (let ((meta-buf (ediff-get-group-buffer meta-list))
791 regexp elt merge-autostore-dir
792 point tmp-list buffer-read-only)
793 (ediff-with-current-buffer meta-buf
796 ;; delete phony overlays that used to represent sessions before the buff
799 (mapcar 'delete-overlay (overlays-in 1 1))
800 (map-extents 'delete-extent))
802 (insert (format ediff-meta-buffer-message
803 (ediff-abbrev-jobname ediff-metajob-name)))
805 (setq regexp (ediff-get-group-regexp meta-list)
807 (ediff-get-group-merge-autostore-dir meta-list))
809 (cond ((ediff-collect-diffs-metajob)
811 " P:\tcollect custom diffs of all marked sessions\n"))
812 ((ediff-patch-metajob)
814 " P:\tshow patch appropriately for the context (session or group)\n")))
816 " ^:\tshow parent session group\n")
817 (or (ediff-one-filegroup-metajob)
819 " D:\tshow differences among directories\n"
820 " ==:\tfor each session, show which files are identical\n"
821 " =h:\tlike ==, but also marks those sessions for hiding\n"
822 " =m:\tlike ==, but also marks those sessions for operation\n\n"))
825 (if (and (stringp regexp) (> (length regexp) 0))
827 (format "*** Filter-through regular expression: %s\n" regexp)))
828 (ediff-insert-dirs-in-meta-buffer meta-list)
829 (if (and ediff-autostore-merges (ediff-merge-metajob)
830 (stringp merge-autostore-dir))
832 "\nMerge results are automatically stored in:\n\t%s\n"
833 merge-autostore-dir)))
835 Size Last modified Name
836 ----------------------------------------------
840 ;; discard info on directories and regexp
841 (setq meta-list (cdr meta-list)
843 (while (and tmp-list empty)
844 (if (and (car tmp-list)
845 (not (eq (ediff-get-session-status (car tmp-list)) ?I)))
847 (setq tmp-list (cdr tmp-list)))
851 " ****** ****** This session group has no members\n"))
853 ;; now organize file names like this:
854 ;; use-mark sizeA dateA sizeB dateB filename
855 ;; make sure directories are displayed with a trailing slash.
857 (setq elt (car meta-list)
858 meta-list (cdr meta-list)
859 sessionNum (1+ sessionNum))
860 (if (eq (ediff-get-session-status elt) ?I)
862 (ediff-insert-session-info-in-meta-buffer elt sessionNum)))
863 (set-buffer-modified-p nil)
867 (defun ediff-update-markers-in-dir-meta-buffer (meta-list)
868 (let ((meta-buf (ediff-get-group-buffer meta-list))
869 session-info point overl buffer-read-only)
870 (ediff-with-current-buffer meta-buf
872 (goto-char (point-min))
873 (ediff-next-meta-item1)
875 (setq session-info (ediff-get-meta-info meta-buf (point) 'no-error)
876 overl (ediff-get-meta-overlay-at-pos (point)))
879 (cond ((eq (ediff-get-session-status session-info) ?I)
881 (if overl (ediff-overlay-put overl 'invisible t)))
882 ((and (eq (ediff-get-session-status session-info) ?H)
883 overl (ediff-overlay-get overl 'invisible))
885 (ediff-overlay-put overl 'invisible nil))
886 (t (ediff-replace-session-activity-marker-in-meta-buffer
888 (ediff-get-session-activity-marker session-info))
889 (ediff-replace-session-status-in-meta-buffer
891 (ediff-get-session-status session-info))))))
892 (ediff-next-meta-item1) ; advance to the next item
894 (set-buffer-modified-p nil)
898 (defun ediff-update-session-marker-in-dir-meta-buffer (session-num)
899 (let (buffer-meta-overlays session-info overl buffer-read-only)
906 (ediff-overlay-get ext 'ediff-meta-info)
907 (eq (ediff-overlay-get ext 'ediff-meta-session-number)
910 ;; Emacs doesn't have map-extents, so try harder
911 ;; Splice overlay lists to get all buffer overlays
912 (setq buffer-meta-overlays (overlay-lists)
913 buffer-meta-overlays (append (car buffer-meta-overlays)
914 (cdr buffer-meta-overlays)))
921 (ediff-overlay-get overl 'ediff-meta-info)
922 (eq (ediff-overlay-get
923 overl 'ediff-meta-session-number)
926 buffer-meta-overlays)))))
929 "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S"
931 (setq session-info (ediff-overlay-get overl 'ediff-meta-info))
932 (goto-char (ediff-overlay-start overl))
933 (ediff-replace-session-activity-marker-in-meta-buffer
935 (ediff-get-session-activity-marker session-info))
936 (ediff-replace-session-status-in-meta-buffer
938 (ediff-get-session-status session-info)))
939 (ediff-next-meta-item1))
943 ;; Check if this is a problematic session.
944 ;; Return nil if not. Otherwise, return symbol representing the problem
945 ;; At present, problematic sessions occur only in -with-ancestor comparisons
946 ;; when the ancestor is a directory rather than a file, or when there is no
947 ;; suitable ancestor file in the ancestor directory
948 (defun ediff-problematic-session-p (session)
949 (let ((f1 (ediff-get-session-objA-name session))
950 (f2 (ediff-get-session-objB-name session))
951 (f3 (ediff-get-session-objC-name session)))
952 (cond ((and (stringp f1) (not (file-directory-p f1))
953 (stringp f2) (not (file-directory-p f2))
954 ;; either invalid file name or a directory
955 (or (not (stringp f3)) (file-directory-p f3))
956 (ediff-ancestor-metajob))
957 ;; more may be added later
961 (defun ediff-meta-insert-file-info1 (fileinfo)
962 (let ((fname (car fileinfo))
963 (feq (ediff-get-file-eqstatus fileinfo))
964 (max-filename-width (if ediff-meta-truncate-filenames
965 (- (window-width) 41)
967 file-modtime file-size)
968 (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits
969 ((not (ediff-file-remote-p fname))
970 (if (file-exists-p fname)
971 ;; set real size and modtime
972 (setq file-size (ediff-file-size fname)
973 file-modtime (ediff-file-modtime fname))
974 (setq file-size -2))) ; file doesn't exist
975 ( t (setq file-size -1))) ; remote file
980 (if feq "=" " ") ; equality indicator
981 (format "%10s" (cond ((= file-size -1) "--")
982 ((< file-size -1) "--")
984 (cond ((= file-size -1) "*remote file*")
985 ((< file-size -1) "*file doesn't exist*")
986 (t (ediff-format-date (decode-time file-modtime))))
988 ;; dir names in meta lists have training slashes, so we just
989 ;; abbreviate the file name, if file exists
990 (if (and (not (stringp fname)) (< file-size -1))
991 "-------" ; file doesn't exist
992 (ediff-truncate-string-left
993 (ediff-abbreviate-file-name fname)
994 max-filename-width)))))))
996 (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr")
997 (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug")
998 (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec"))
999 "Months' associative array.")
1001 ;; returns 2char string
1002 (defsubst ediff-fill-leading-zero (num)
1005 (number-to-string num)))
1007 ;; TIME is like the output of decode-time
1008 (defun ediff-format-date (time)
1009 (format "%s %2d %4d %s:%s:%s"
1010 (cdr (assoc (nth 4 time) ediff-months)) ; month
1013 (ediff-fill-leading-zero (nth 2 time)) ; hour
1014 (ediff-fill-leading-zero (nth 1 time)) ; min
1015 (ediff-fill-leading-zero (nth 0 time)) ; sec
1018 ;; Draw the directories
1019 (defun ediff-insert-dirs-in-meta-buffer (meta-list)
1020 (let* ((dir1 (ediff-abbreviate-file-name (ediff-get-group-objA meta-list)))
1021 (dir2 (ediff-get-group-objB meta-list))
1022 (dir2 (if (stringp dir2) (ediff-abbreviate-file-name dir2)))
1023 (dir3 (ediff-get-group-objC meta-list))
1024 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3))))
1025 (insert "*** Directory A: " dir1 "\n")
1026 (if dir2 (insert "*** Directory B: " dir2 "\n"))
1027 (if dir3 (insert "*** Directory C: " dir3 "\n"))
1030 (defun ediff-draw-dir-diffs (diff-list)
1031 (if (null diff-list) (error "Lost difference info on these directories"))
1032 (let* ((buf-name (ediff-unique-buffer-name
1033 "*Ediff File Group Differences" "*"))
1034 (regexp (ediff-get-group-regexp diff-list))
1035 (dir1 (ediff-abbreviate-file-name (ediff-get-group-objA diff-list)))
1036 (dir2 (ediff-abbreviate-file-name (ediff-get-group-objB diff-list)))
1037 (dir3 (ediff-get-group-objC diff-list))
1038 (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3)))
1039 (meta-buf (ediff-get-group-buffer diff-list))
1040 (underline (make-string 26 ?-))
1043 ;; skip the directory part
1044 (setq diff-list (cdr diff-list))
1045 (setq ediff-dir-diffs-buffer (get-buffer-create buf-name))
1046 (ediff-with-current-buffer ediff-dir-diffs-buffer
1047 (use-local-map ediff-dir-diffs-buffer-map)
1049 (setq ediff-meta-buffer meta-buf)
1050 (insert "\t\t*** Directory Differences ***\n")
1053 `q': hide this buffer
1055 p,DEL: previous line\n\n")
1057 (if (and (stringp regexp) (> (length regexp) 0))
1059 (format "\n*** Filter-through regular expression: %s\n" regexp)))
1061 (insert (format "\n%-27s%-26s"
1062 (ediff-truncate-string-left
1063 (ediff-abbreviate-file-name
1064 (file-name-as-directory dir1))
1066 (ediff-truncate-string-left
1067 (ediff-abbreviate-file-name
1068 (file-name-as-directory dir2))
1071 (insert (format " %-25s\n"
1072 (ediff-truncate-string-left
1073 (ediff-abbreviate-file-name
1074 (file-name-as-directory dir3))
1077 (insert (format "%s%s" underline underline))
1079 (insert (format "%s\n\n" underline))
1082 (if (null diff-list)
1083 (insert "\n\t*** No differences ***\n"))
1086 (setq file (car (car diff-list))
1087 code (cdr (car diff-list))
1088 diff-list (cdr diff-list))
1089 (if (= (mod code 2) 0) ; dir1
1090 (insert (format "%-27s"
1091 (ediff-truncate-string-left
1092 (ediff-abbreviate-file-name
1093 (if (file-directory-p (concat dir1 file))
1094 (file-name-as-directory file)
1097 (insert (format "%-27s" "---")))
1098 (if (= (mod code 3) 0) ; dir2
1099 (insert (format "%-26s"
1100 (ediff-truncate-string-left
1101 (ediff-abbreviate-file-name
1102 (if (file-directory-p (concat dir2 file))
1103 (file-name-as-directory file)
1106 (insert (format "%-26s" "---")))
1108 (if (= (mod code 5) 0) ; dir3
1109 (insert (format " %-25s"
1110 (ediff-truncate-string-left
1111 (ediff-abbreviate-file-name
1112 (if (file-directory-p (concat dir3 file))
1113 (file-name-as-directory file)
1116 (insert (format " %-25s" "---"))))
1118 (setq buffer-read-only t)
1119 (set-buffer-modified-p nil)) ; eval in diff buffer
1122 (defun ediff-bury-dir-diffs-buffer ()
1123 "Bury the directory difference buffer. Display the meta buffer instead."
1125 (let ((buf ediff-meta-buffer)
1128 (if (setq wind (ediff-get-visible-buffer-window buf))
1129 (select-window wind)
1130 (set-window-buffer (selected-window) buf))))
1132 ;; executes in dir session group buffer
1133 ;; show buffer differences
1134 (defun ediff-show-dir-diffs ()
1135 "Display differences among the directories involved in session group."
1137 (if (ediff-one-filegroup-metajob)
1138 (error "This command is inapplicable in the present context"))
1139 (or (ediff-buffer-live-p ediff-dir-diffs-buffer)
1140 (ediff-draw-dir-diffs ediff-dir-difference-list))
1141 (let ((buf ediff-dir-diffs-buffer))
1143 (set-window-buffer (selected-window) buf)
1144 (goto-char (point-min))))
1146 (defun ediff-up-meta-hierarchy ()
1147 "Go to the parent session group buffer."
1149 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
1150 (ediff-show-meta-buffer
1151 ediff-parent-meta-buffer ediff-meta-session-number)
1152 (error "This session group has no parent")))
1155 ;; argument is ignored
1156 (defun ediff-redraw-registry-buffer (&optional ignore)
1157 (ediff-with-current-buffer ediff-registry-buffer
1158 (let ((point (point))
1159 elt bufAname bufBname bufCname cur-diff total-diffs pt
1160 job-name meta-list registry-list buffer-read-only)
1162 ;; delete phony overlays that used to represent sessions before the buff
1165 (mapcar 'delete-overlay (overlays-in 1 1))
1166 (map-extents 'delete-extent))
1168 (insert "This is a registry of all active Ediff sessions.
1171 button2, `v', RET over a session record: switch to that session
1172 M over a session record: display the associated session group
1173 R in any Ediff session: display session registry
1175 p,DEL: previous session
1176 E: browse Ediff on-line manual
1180 \t\tActive Ediff Sessions:
1181 \t\t----------------------
1184 ;; purge registry list from dead buffers
1185 (mapcar (function (lambda (elt)
1186 (if (not (ediff-buffer-live-p elt))
1187 (setq ediff-session-registry
1188 (delq elt ediff-session-registry)))))
1189 ediff-session-registry)
1191 (if (null ediff-session-registry)
1192 (insert " ******* No active Ediff sessions *******\n"))
1194 (setq registry-list ediff-session-registry)
1195 (while registry-list
1196 (setq elt (car registry-list)
1197 registry-list (cdr registry-list))
1199 (if (ediff-buffer-live-p elt)
1200 (if (ediff-with-current-buffer elt
1201 (setq job-name ediff-metajob-name
1202 meta-list ediff-meta-list)
1203 (and ediff-metajob-name
1204 (not (eq ediff-metajob-name 'ediff-registry))))
1207 (insert (format " *group*\t%s: %s\n"
1209 (ediff-abbrev-jobname job-name)))
1210 (insert (format "\t\t %s %s %s\n"
1211 (ediff-abbreviate-file-name
1212 (ediff-get-group-objA meta-list))
1213 (ediff-abbreviate-file-name
1215 (ediff-get-group-objB meta-list))
1216 (ediff-get-group-objB meta-list)
1218 (ediff-abbreviate-file-name
1220 (ediff-get-group-objC meta-list))
1221 (ediff-get-group-objC meta-list)
1223 (ediff-set-meta-overlay pt (point) elt))
1225 (ediff-with-current-buffer elt
1226 (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A)
1227 (buffer-name ediff-buffer-A)
1228 "!!!killed buffer!!!")
1229 bufBname (if (ediff-buffer-live-p ediff-buffer-B)
1230 (buffer-name ediff-buffer-B)
1231 "!!!killed buffer!!!")
1232 bufCname (cond ((not (ediff-3way-job))
1234 ((ediff-buffer-live-p ediff-buffer-C)
1235 (buffer-name ediff-buffer-C))
1236 (t "!!!killed buffer!!!")))
1237 (setq total-diffs (format "%-4d" ediff-number-of-differences)
1239 (cond ((= ediff-current-difference -1) " _")
1240 ((= ediff-current-difference
1241 ediff-number-of-differences)
1244 "%4d" (1+ ediff-current-difference))))
1245 job-name ediff-job-name))
1246 ;; back in the meta buf
1248 (insert cur-diff "/" total-diffs "\t"
1250 (format ": %s" (ediff-abbrev-jobname job-name)))
1252 "\n\t\t " bufAname " " bufBname " " bufCname "\n")
1253 (ediff-set-meta-overlay pt (point) elt))))
1255 (set-buffer-modified-p nil)
1259 ;; Sets overlay around a meta record with 'ediff-meta-info property PROP
1260 ;; If optional SESSION-NUMBER, make it a property of the overlay,
1261 ;; ediff-meta-session-number
1262 (defun ediff-set-meta-overlay (b e prop &optional session-number hidden)
1264 (setq overl (ediff-make-overlay b e))
1266 (ediff-overlay-put overl 'mouse-face 'highlight)
1267 (ediff-overlay-put overl 'highlight t))
1268 (ediff-overlay-put overl 'ediff-meta-info prop)
1269 (ediff-overlay-put overl 'invisible hidden)
1270 (if (numberp session-number)
1271 (ediff-overlay-put overl 'ediff-meta-session-number session-number))))
1273 (defun ediff-mark-for-hiding-at-pos (unmark)
1274 "Mark session for hiding. With prefix arg, unmark."
1276 (let* ((pos (ediff-event-point last-command-event))
1277 (meta-buf (ediff-event-buffer last-command-event))
1278 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1279 (info (ediff-get-meta-info meta-buf pos))
1280 (session-number (ediff-get-session-number-at-pos pos)))
1281 (ediff-mark-session-for-hiding info unmark)
1282 (ediff-next-meta-item 1)
1284 (ediff-update-meta-buffer meta-buf nil session-number))
1287 ;; Returns whether session was marked or unmarked
1288 (defun ediff-mark-session-for-hiding (info unmark)
1289 (let ((session-buf (ediff-get-session-buffer info))
1291 (cond ((eq unmark 'mark) (setq unmark nil))
1292 ((eq (ediff-get-session-status info) ?H) (setq unmark t))
1293 (unmark ; says unmark, but the marker is different from H
1296 (unmark (ediff-set-session-status info nil))
1297 ;;; (if (ediff-buffer-live-p session-buf)
1298 ;;; (error "Can't hide active session, %s" (buffer-name session-buf)))
1299 (t (ediff-set-session-status info ?H))))
1303 (defun ediff-mark-for-operation-at-pos (unmark)
1304 "Mark session for a group operation. With prefix arg, unmark."
1306 (let* ((pos (ediff-event-point last-command-event))
1307 (meta-buf (ediff-event-buffer last-command-event))
1308 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1309 (info (ediff-get-meta-info meta-buf pos))
1310 (session-number (ediff-get-session-number-at-pos pos)))
1311 (ediff-mark-session-for-operation info unmark)
1312 (ediff-next-meta-item 1)
1314 (ediff-update-meta-buffer meta-buf nil session-number))
1318 ;; returns whether session was unmarked.
1319 ;; remember: this is a toggle op
1320 (defun ediff-mark-session-for-operation (info unmark)
1322 (cond ((eq unmark 'mark) (setq unmark nil))
1323 ((eq (ediff-get-session-status info) ?*) (setq unmark t))
1324 (unmark ; says unmark, but the marker is different from *
1327 (unmark (ediff-set-session-status info nil))
1328 (t (ediff-set-session-status info ?*))))
1332 (defun ediff-hide-marked-sessions (unhide)
1333 "Hide marked sessions. With prefix arg, unhide."
1335 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1336 (meta-list (cdr ediff-meta-list))
1337 (from (if unhide ?I ?H))
1338 (to (if unhide ?H ?I))
1340 active-sessions-exist session-buf elt)
1342 (setq elt (car meta-list)
1343 meta-list (cdr meta-list)
1344 session-buf (ediff-get-session-buffer elt))
1346 (if (eq (ediff-get-session-status elt) from)
1348 (setq numMarked (1+ numMarked))
1349 (if (and (eq to ?I) (buffer-live-p session-buf))
1350 ;; shouldn't hide active sessions
1351 (setq active-sessions-exist t)
1352 (ediff-set-session-status elt to)))))
1354 (ediff-update-meta-buffer grp-buf)
1357 (message "Nothing to reveal...")
1358 (message "Nothing to hide...")))
1359 (if active-sessions-exist
1360 (message "Note: Ediff didn't hide active sessions!"))
1363 ;; Apply OPERATION to marked sessions. Operation expects one argument of type
1364 ;; meta-list member (not the first one), i.e., a regular session description.
1365 ;; Returns number of marked sessions on which operation was performed
1366 (defun ediff-operate-on-marked-sessions (operation)
1367 (let ((grp-buf (ediff-get-group-buffer ediff-meta-list))
1368 (meta-list (cdr ediff-meta-list))
1372 (diff-buffer ediff-meta-diff-buffer)
1375 (setq elt (car meta-list)
1376 meta-list (cdr meta-list)
1377 sessionNum (1+ sessionNum))
1378 (cond ((eq (ediff-get-session-status elt) marksym)
1380 (setq numMarked (1+ numMarked))
1381 (funcall operation elt sessionNum)))
1382 ((and (ediff-meta-session-p elt)
1383 (ediff-buffer-live-p
1384 (setq session-buf (ediff-get-session-buffer elt))))
1387 (ediff-with-current-buffer session-buf
1388 ;; pass meta-diff along
1389 (setq ediff-meta-diff-buffer diff-buffer)
1390 ;; collect diffs in child group
1391 (ediff-operate-on-marked-sessions operation)))))))
1392 (ediff-update-meta-buffer grp-buf 'must-redraw) ; just in case
1396 (defun ediff-append-custom-diff (session sessionNum)
1397 (or (ediff-collect-diffs-metajob)
1398 (error "Hmm, I'd hate to do it to you ..."))
1399 (let ((session-buf (ediff-get-session-buffer session))
1400 (meta-diff-buff ediff-meta-diff-buffer)
1401 (metajob ediff-metajob-name)
1402 tmp-buf custom-diff-buf)
1403 (if (ediff-buffer-live-p session-buf)
1404 (ediff-with-current-buffer session-buf
1405 (if (eq ediff-control-buffer session-buf) ; individual session
1407 (ediff-compute-custom-diffs-maybe)
1408 (setq custom-diff-buf ediff-custom-diff-buffer)))))
1410 (or (ediff-buffer-live-p meta-diff-buff)
1411 (error "Ediff: something wrong--no multiple diffs buffer"))
1413 (cond ((ediff-buffer-live-p custom-diff-buf)
1415 (set-buffer meta-diff-buff)
1416 (goto-char (point-max))
1417 (insert-buffer custom-diff-buf)
1419 ((memq metajob '(ediff-directories
1420 ediff-merge-directories
1421 ediff-merge-directories-with-ancestor))
1422 ;; get diffs by calling shell command on ediff-custom-diff-program
1424 (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer)))
1427 (format "%s %s %s %s"
1428 ediff-custom-diff-program ediff-custom-diff-options
1429 (ediff-get-session-objA-name session)
1430 (ediff-get-session-objB-name session))
1433 (set-buffer meta-diff-buff)
1434 (goto-char (point-max))
1435 (insert-buffer tmp-buf)
1438 (error "Can't make context diff for Session %d" sessionNum )))
1441 (defun ediff-collect-custom-diffs ()
1442 "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'.
1443 This operation is defined only for `ediff-directories' and
1444 `ediff-directory-revisions', since its intent is to produce
1445 multifile patches. For `ediff-directory-revisions', we insist that
1446 all marked sessions must be active."
1448 (or (ediff-buffer-live-p ediff-meta-diff-buffer)
1449 (setq ediff-meta-diff-buffer
1451 (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*"))))
1452 (ediff-with-current-buffer ediff-meta-diff-buffer
1454 (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0)
1456 (display-buffer ediff-meta-diff-buffer 'not-this-window)
1458 (message "No marked sessions found")))
1460 (defun ediff-meta-show-patch ()
1461 "Show the multi-file patch associated with this group session."
1463 (let* ((pos (ediff-event-point last-command-event))
1464 (meta-buf (ediff-event-buffer last-command-event))
1465 (info (ediff-get-meta-info meta-buf pos 'noerror))
1466 (patchbuffer ediff-meta-patchbufer))
1467 (if (ediff-buffer-live-p patchbuffer)
1468 (ediff-with-current-buffer patchbuffer
1473 (ediff-get-session-objB-name info)
1474 (ediff-get-session-objC-name info)))
1475 (set-buffer (get-buffer-create ediff-tmp-buffer))
1477 (insert-buffer patchbuffer)
1478 (display-buffer ediff-tmp-buffer 'not-this-window)
1480 (error "The patch buffer wasn't found"))))
1483 ;; This function executes in meta buffer. It knows where event happened.
1484 (defun ediff-filegroup-action ()
1485 "Execute appropriate action for the selected session."
1487 (let* ((pos (ediff-event-point last-command-event))
1488 (meta-buf (ediff-event-buffer last-command-event))
1489 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1490 (info (ediff-get-meta-info meta-buf pos))
1491 (session-buf (ediff-get-session-buffer info))
1492 (session-number (ediff-get-session-number-at-pos pos meta-buf))
1493 merge-autostore-dir file1 file2 file3 regexp)
1495 (setq file1 (ediff-get-session-objA-name info)
1496 file2 (ediff-get-session-objB-name info)
1497 file3 (ediff-get-session-objC-name info))
1499 ;; make sure we don't start on hidden sessions
1500 ;; ?H means marked for hiding. ?I means invalid (hidden).
1501 (if (memq (ediff-get-session-status info) '(?I))
1504 (if (y-or-n-p "This session is marked as hidden, unmark? ")
1506 (ediff-set-session-status info nil)
1507 (ediff-update-meta-buffer meta-buf nil session-number))
1508 (error "Aborted"))))
1510 (ediff-with-current-buffer meta-buf
1511 (setq merge-autostore-dir
1512 (ediff-get-group-merge-autostore-dir ediff-meta-list))
1513 (goto-char pos) ; if the user clicked on session--move point there
1514 ;; First handle sessions involving directories (which are themselves
1516 ;; After that handle individual sessions
1517 (cond ((ediff-meta-session-p info)
1518 ;; do ediff/ediff-merge on subdirectories
1519 (if (ediff-buffer-live-p session-buf)
1520 (ediff-show-meta-buffer session-buf)
1521 (setq regexp (read-string "Filter through regular expression: "
1522 nil 'ediff-filtering-regexp-history))
1523 (ediff-directories-internal
1524 file1 file2 file3 regexp
1525 ediff-session-action-function
1527 ;; make it update car info after startup
1529 ;; child session group should know its parent
1530 (setq ediff-parent-meta-buffer
1531 (quote (, ediff-meta-buffer))
1532 ediff-meta-session-number
1534 ;; and parent will know its child
1535 (setcar (quote (, info)) ediff-meta-buffer)))))))
1537 ;; Do ediff-revision on a subdirectory
1538 ((and (ediff-one-filegroup-metajob)
1539 (ediff-revision-metajob)
1540 (file-directory-p file1))
1541 (if (ediff-buffer-live-p session-buf)
1542 (ediff-show-meta-buffer session-buf)
1543 (setq regexp (read-string "Filter through regular expression: "
1544 nil 'ediff-filtering-regexp-history))
1545 (ediff-directory-revisions-internal
1547 ediff-session-action-function ediff-metajob-name
1548 ;; make it update car info after startup
1550 ;; child session group should know its parent and
1552 (setq ediff-parent-meta-buffer
1553 (quote (, ediff-meta-buffer))
1554 ediff-meta-session-number
1556 ;; and parent will know its child
1557 (setcar (quote (, info)) ediff-meta-buffer)))))))
1559 ;; From here on---only individual session handlers
1561 ;; handle an individual session with a live control buffer
1562 ((ediff-buffer-live-p session-buf)
1563 (ediff-with-current-buffer session-buf
1564 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1565 (ediff-recenter 'no-rehighlight)))
1567 ((ediff-problematic-session-p info)
1570 "This session has no ancestor. Merge without the ancestor? ")
1573 ;; provide startup hooks
1575 (setq ediff-meta-buffer (, (current-buffer))
1576 ediff-meta-session-number
1578 (setq ediff-merge-store-file
1582 (file-name-nondirectory file1))))
1583 ;; make ediff-startup pass
1584 ;; ediff-control-buffer back to the meta
1587 (quote (, info)) ediff-control-buffer)))))
1589 ((ediff-one-filegroup-metajob) ; needs 1 file arg
1590 (funcall ediff-session-action-function
1592 ;; provide startup hooks
1594 (setq ediff-meta-buffer (, (current-buffer))
1595 ediff-meta-session-number
1597 (setq ediff-merge-store-file
1601 (file-name-nondirectory file1))))
1602 ;; make ediff-startup pass
1603 ;; ediff-control-buffer back to the meta
1606 (quote (, info)) ediff-control-buffer))))))
1607 ((not (ediff-metajob3)) ; need 2 file args
1608 (funcall ediff-session-action-function
1610 ;; provide startup hooks
1612 (setq ediff-meta-buffer (, (current-buffer))
1613 ediff-meta-session-number
1615 (setq ediff-merge-store-file
1619 (file-name-nondirectory file1))))
1620 ;; make ediff-startup pass
1621 ;; ediff-control-buffer back to the meta
1624 (quote (, info)) ediff-control-buffer))))))
1625 ((ediff-metajob3) ; need 3 file args
1626 (funcall ediff-session-action-function
1628 ;; arrange startup hooks
1630 (setq ediff-merge-store-file
1634 (file-name-nondirectory file1))))
1635 (setq ediff-meta-buffer (, (current-buffer))
1636 ediff-meta-session-number
1638 ;; this arranges that ediff-startup will pass
1639 ;; the value of ediff-control-buffer back to
1640 ;; the meta level, to the record in the meta
1641 ;; list containing the information about the
1642 ;; session associated with that
1643 ;; ediff-control-buffer
1645 (quote (, info)) ediff-control-buffer))))))
1647 ) ; eval in meta-buf
1650 (defun ediff-registry-action ()
1651 "Switch to a selected session."
1653 (let* ((pos (ediff-event-point last-command-event))
1654 (buf (ediff-event-buffer last-command-event))
1655 (ctl-buf (ediff-get-meta-info buf pos)))
1657 (if (ediff-buffer-live-p ctl-buf)
1658 ;; check if this is ediff-control-buffer or ediff-meta-buffer
1659 (if (ediff-with-current-buffer ctl-buf
1660 (eq (key-binding "q") 'ediff-quit-meta-buffer))
1661 ;; it's a meta-buffer -- last action should just display it
1662 (ediff-show-meta-buffer ctl-buf t)
1663 ;; it's a session buffer -- invoke go back to session
1664 (ediff-with-current-buffer ctl-buf
1665 (setq ediff-mouse-pixel-position (mouse-pixel-position))
1666 (ediff-recenter 'no-rehighlight)))
1668 (message "You've selected a stale session --- try again")
1669 (ediff-update-registry))
1670 (ediff-with-current-buffer buf
1675 ;; If session number is t, means don't update meta buffer
1676 (defun ediff-show-meta-buffer (&optional meta-buf session-number)
1677 "Show the session group buffer."
1679 (let (wind frame silent)
1680 (if meta-buf (setq silent t))
1682 (setq meta-buf (or meta-buf ediff-meta-buffer))
1683 (cond ((not (bufferp meta-buf))
1684 (error "This Ediff session is not part of a session group"))
1685 ((not (ediff-buffer-live-p meta-buf))
1687 "Can't find this session's group panel -- session itself is ok")))
1689 (cond ((numberp session-number)
1690 (ediff-update-meta-buffer meta-buf nil session-number))
1691 ;; if session-number is t, don't update
1693 (t (ediff-cleanup-meta-buffer meta-buf)))
1695 (ediff-with-current-buffer meta-buf
1697 (cond ((setq wind (ediff-get-visible-buffer-window meta-buf))
1700 "Already showing the group panel for this session"))
1701 (set-window-buffer wind meta-buf)
1702 (select-window wind))
1703 ((window-live-p (setq wind ediff-window-C)) ;in merge--merge buf
1704 (set-window-buffer ediff-window-C meta-buf)
1705 (select-window wind))
1706 ((window-live-p (setq wind ediff-window-A))
1707 (set-window-buffer ediff-window-A meta-buf)
1708 (select-window wind))
1709 ((window-live-p (setq wind ediff-window-B))
1710 (set-window-buffer ediff-window-B meta-buf)
1711 (select-window wind))
1714 (ediff-get-visible-buffer-window ediff-registry-buffer))
1715 (ediff-window-display-p))
1716 (select-window wind)
1718 (set-window-buffer (selected-window) meta-buf))
1719 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
1720 (set-window-buffer (selected-window) meta-buf)))
1722 (if (and (ediff-window-display-p)
1724 (setq wind (ediff-get-visible-buffer-window meta-buf))))
1726 (setq frame (window-frame wind))
1728 (ediff-reset-mouse frame)))
1729 (run-hooks 'ediff-show-session-group-hook)
1732 (defun ediff-show-current-session-meta-buffer ()
1734 (ediff-show-meta-buffer nil ediff-meta-session-number))
1736 (defun ediff-show-meta-buff-from-registry ()
1737 "Display the session group buffer for a selected session group."
1739 (let* ((pos (ediff-event-point last-command-event))
1740 (meta-buf (ediff-event-buffer last-command-event))
1741 (info (ediff-get-meta-info meta-buf pos))
1742 (meta-or-session-buf info))
1743 (ediff-with-current-buffer meta-or-session-buf
1744 (ediff-show-meta-buffer nil t))))
1747 (defun ediff-show-registry ()
1748 "Display Ediff's registry."
1750 (ediff-update-registry)
1751 (if (not (ediff-buffer-live-p ediff-registry-buffer))
1752 (error "No active Ediff sessions or corrupted session registry"))
1754 ;; for some reason, point moves in ediff-registry-buffer, so we preserve it
1756 (ediff-with-current-buffer ediff-registry-buffer
1759 (ediff-get-visible-buffer-window ediff-registry-buffer))
1760 (message "Already showing the registry")
1761 (set-window-buffer wind ediff-registry-buffer)
1762 (select-window wind))
1763 ((window-live-p ediff-window-C)
1764 (set-window-buffer ediff-window-C ediff-registry-buffer)
1765 (select-window ediff-window-C))
1766 ((window-live-p ediff-window-A)
1767 (set-window-buffer ediff-window-A ediff-registry-buffer)
1768 (select-window ediff-window-A))
1769 ((window-live-p ediff-window-B)
1770 (set-window-buffer ediff-window-B ediff-registry-buffer)
1771 (select-window ediff-window-B))
1773 (ediff-get-visible-buffer-window ediff-meta-buffer))
1774 (ediff-window-display-p))
1775 (select-window wind)
1777 (set-window-buffer (selected-window) ediff-registry-buffer))
1778 (t (ediff-skip-unsuitable-frames 'ok-unsplittable)
1779 (set-window-buffer (selected-window) ediff-registry-buffer)))
1781 (if (ediff-window-display-p)
1785 (ediff-get-visible-buffer-window ediff-registry-buffer)))
1787 (ediff-reset-mouse frame)))
1788 (run-hooks 'ediff-show-registry-hook)
1792 (defalias 'eregistry 'ediff-show-registry)
1794 ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a
1796 ;; Check if META-BUF exists before calling this function
1797 ;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta
1798 ;; buffer. Otherwise, it will just go over the buffer and update activity marks
1799 ;; and session status.
1800 ;; SESSION-NUMBER, if specified, says which session caused the update.
1801 (defun ediff-update-meta-buffer (meta-buf &optional must-redraw session-number)
1802 (if (ediff-buffer-live-p meta-buf)
1803 (ediff-with-current-buffer meta-buf
1804 (cond (must-redraw ; completely redraw the meta buffer
1805 (funcall ediff-meta-redraw-function ediff-meta-list))
1806 ((numberp session-number) ; redraw only for the given session
1807 (ediff-update-session-marker-in-dir-meta-buffer session-number))
1808 (t ; update only what's changed, but scan the entire meta buffer
1809 (ediff-update-markers-in-dir-meta-buffer ediff-meta-list)))
1812 (defun ediff-update-registry ()
1813 (ediff-with-current-buffer (current-buffer)
1814 (if (ediff-buffer-live-p ediff-registry-buffer)
1815 (ediff-redraw-registry-buffer)
1816 (ediff-prepare-meta-buffer
1817 'ediff-registry-action
1818 ediff-session-registry
1820 'ediff-redraw-registry-buffer
1824 ;; If meta-buf exists, it is redrawn along with parent.
1825 ;; Otherwise, nothing happens.
1826 (defun ediff-cleanup-meta-buffer (meta-buffer)
1827 (if (ediff-buffer-live-p meta-buffer)
1828 (ediff-with-current-buffer meta-buffer
1829 (ediff-update-meta-buffer meta-buffer)
1830 (if (ediff-buffer-live-p ediff-parent-meta-buffer)
1831 (ediff-update-meta-buffer
1832 ediff-parent-meta-buffer nil ediff-meta-session-number)))))
1834 ;; t if no session is in progress
1835 (defun ediff-safe-to-quit (meta-buffer)
1836 (if (ediff-buffer-live-p meta-buffer)
1837 (let ((lis ediff-meta-list)
1840 ;;(ediff-update-meta-buffer meta-buffer)
1841 (ediff-with-current-buffer meta-buffer
1842 (setq lis (cdr lis)) ; discard the description part of meta-list
1843 (while (and cont lis)
1844 (if (ediff-buffer-live-p
1845 (ediff-get-group-buffer lis)) ; in progress
1847 (setq lis (cdr lis)))
1850 (defun ediff-quit-meta-buffer ()
1851 "If the group has no active session, delete the meta buffer.
1852 If no session is in progress, ask to confirm before deleting meta buffer.
1853 Otherwise, bury the meta buffer.
1854 If this is a session registry buffer then just bury it."
1856 (let* ((buf (current-buffer))
1857 (dir-diffs-buffer ediff-dir-diffs-buffer)
1858 (meta-diff-buffer ediff-meta-diff-buffer)
1859 (session-number ediff-meta-session-number)
1860 (parent-buf ediff-parent-meta-buffer)
1861 (dont-show-registry (eq buf ediff-registry-buffer)))
1862 (if dont-show-registry
1864 ;;(ediff-cleanup-meta-buffer buf)
1865 (cond ((and (ediff-safe-to-quit buf)
1866 (y-or-n-p "Quit this session group? "))
1867 (run-hooks 'ediff-quit-session-group-hook)
1869 (ediff-dispose-of-meta-buffer buf))
1870 ((ediff-safe-to-quit buf)
1874 "This session group has active sessions---cannot exit")))
1875 (ediff-update-meta-buffer parent-buf nil session-number)
1876 (ediff-kill-buffer-carefully dir-diffs-buffer)
1877 (ediff-kill-buffer-carefully meta-diff-buffer)
1878 (if (ediff-buffer-live-p parent-buf)
1880 (setq dont-show-registry t)
1881 (ediff-show-meta-buffer parent-buf session-number)))
1883 (or dont-show-registry
1884 (ediff-show-registry))))
1886 (defun ediff-dispose-of-meta-buffer (buf)
1887 (setq ediff-session-registry (delq buf ediff-session-registry))
1888 (ediff-with-current-buffer buf
1889 (if (ediff-buffer-live-p ediff-dir-diffs-buffer)
1890 (kill-buffer ediff-dir-diffs-buffer)))
1894 ;; Obtain information on a meta record where the user clicked or typed
1895 ;; BUF is the buffer where this happened and POINT is the position
1896 ;; If optional NOERROR arg is given, don't report error and return nil if no
1897 ;; meta info is found on line.
1898 (defun ediff-get-meta-info (buf point &optional noerror)
1899 (let (result olist tmp)
1900 (if (and point (ediff-buffer-live-p buf))
1901 (ediff-with-current-buffer buf
1904 (if (setq tmp (extent-at point buf 'ediff-meta-info))
1905 (ediff-overlay-get tmp 'ediff-meta-info)))
1906 (setq olist (overlays-at point))
1908 (mapcar (function (lambda (elt)
1909 (overlay-get elt 'ediff-meta-info)))
1911 (while (and olist (null (car olist))
1912 (overlay-get (car olist) 'invisible))
1913 (setq olist (cdr olist)))
1914 (setq result (car olist)))))
1919 (ediff-update-registry)
1920 (error "No session info in this line")))))
1923 (defun ediff-get-meta-overlay-at-pos (point)
1925 (extent-at point (current-buffer) 'ediff-meta-info)
1926 (let* ((overl-list (overlays-at point))
1927 (overl (car overl-list)))
1928 (while (and overl (null (overlay-get overl 'ediff-meta-info)))
1929 (setq overl-list (cdr overl-list)
1930 overl (car overl-list)))
1933 (defsubst ediff-get-session-number-at-pos (point &optional meta-buffer)
1934 (setq meta-buffer (if (ediff-buffer-live-p meta-buffer)
1937 (ediff-with-current-buffer meta-buffer
1939 (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number)))
1942 ;; Return location of the next meta overlay after point
1943 (defun ediff-next-meta-overlay-start (point)
1945 (goto-char (point-min))
1946 (let ((overl (ediff-get-meta-overlay-at-pos point)))
1950 (setq overl (next-extent overl))
1951 (setq overl (next-extent (current-buffer))))
1953 (extent-start-position overl)
1956 ;; note: end of current overlay is the beginning of the next one
1958 (next-overlay-change point))))
1962 (defun ediff-previous-meta-overlay-start (point)
1964 (goto-char (point-max))
1965 (let ((overl (ediff-get-meta-overlay-at-pos point)))
1969 (setq overl (previous-extent overl))
1970 (setq overl (previous-extent (current-buffer))))
1972 (extent-start-position overl)
1974 (if overl (setq point (overlay-start overl)))
1975 ;; to get to the beginning of prev overlay
1977 ;; trick to overcome an emacs bug--doesn't always find previous
1978 ;; overlay change correctly
1979 (setq point (1- point)))
1980 (setq point (previous-overlay-change point))
1981 ;; If we are not over an overlay after subtracting 1, it means we are
1982 ;; in the description area preceding session records. In this case,
1983 ;; goto the top of the registry buffer.
1984 (or (car (overlays-at point))
1985 (setq point (point-min)))
1988 ;; this is the action invoked when the user selects a patch from the meta
1990 (defun ediff-patch-file-form-meta (file &optional startup-hooks)
1991 (let* ((pos (ediff-event-point last-command-event))
1992 (meta-buf (ediff-event-buffer last-command-event))
1993 ;; ediff-get-meta-info gives error if meta-buf or pos are invalid
1994 (info (ediff-get-meta-info meta-buf pos))
1995 (meta-patchbuf ediff-meta-patchbufer)
1996 session-buf beg-marker end-marker)
1998 (if (or (file-directory-p file) (string-match "/dev/null" file))
1999 (error "`%s' is not an ordinary file" (file-name-as-directory file)))
2000 (setq session-buf (ediff-get-session-buffer info)
2001 beg-marker (ediff-get-session-objB-name info)
2002 end-marker (ediff-get-session-objC-name info))
2004 (or (ediff-buffer-live-p session-buf) ; either an active patch session
2005 (null session-buf) ; or it is a virgin session
2007 "Patch has been already applied to this file--cannot be repeated!"))
2009 (ediff-with-current-buffer meta-patchbuf
2012 (narrow-to-region beg-marker end-marker)
2013 (ediff-patch-file-internal meta-patchbuf file startup-hooks)))))
2016 (defun ediff-unmark-all-for-operation ()
2017 "Unmark all sessions marked for operation."
2019 (let ((list (cdr ediff-meta-list)))
2020 (while (setq elt (car list))
2021 (ediff-mark-session-for-operation elt 'unmark)
2022 (setq list (cdr list))))
2023 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2025 (defun ediff-unmark-all-for-hiding ()
2026 "Unmark all sessions marked for hiding."
2028 (let ((list (cdr ediff-meta-list)))
2029 (while (setq elt (car list))
2030 (ediff-mark-session-for-hiding elt 'unmark)
2031 (setq list (cdr list))))
2032 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2035 (defun ediff-meta-mark-equal-files ()
2036 "Run though the session list and mark identical files.
2037 This is used only for sessions that involve 2 or 3 files at the same time."
2039 (let ((list (cdr ediff-meta-list))
2040 marked1 marked2 marked3
2041 fileinfo1 fileinfo2 fileinfo3 elt)
2042 (while (setq elt (car list))
2043 (setq fileinfo1 (ediff-get-session-objA elt)
2044 fileinfo2 (ediff-get-session-objB elt)
2045 fileinfo3 (ediff-get-session-objC elt))
2046 (ediff-set-file-eqstatus fileinfo1 nil)
2047 (ediff-set-file-eqstatus fileinfo2 nil)
2048 (ediff-set-file-eqstatus fileinfo3 nil)
2053 (or (ediff-mark-if-equal fileinfo1 fileinfo2)
2055 (if (ediff-metajob3)
2057 (or (ediff-mark-if-equal fileinfo1 fileinfo3)
2059 (or (ediff-mark-if-equal fileinfo2 fileinfo3)
2060 (setq marked3 nil))))
2061 (if (and marked1 marked2 marked3)
2062 (cond ((eq last-command-char ?h)
2063 (ediff-mark-session-for-hiding elt 'mark))
2064 ((eq last-command-char ?m)
2065 (ediff-mark-session-for-operation elt 'mark))
2067 (setq list (cdr list))))
2068 (ediff-update-meta-buffer (current-buffer) 'must-redraw))
2070 ;; mark files 1 and 2 as equal, if they are.
2071 ;; returns t, if something was marked
2072 (defun ediff-mark-if-equal (fileinfo1 fileinfo2)
2073 (let ((f1 (car fileinfo1))
2074 (f2 (car fileinfo2)))
2075 (cond ((file-directory-p f1) nil)
2076 ((file-directory-p f2) nil)
2077 ((ediff-same-file-contents f1 f2)
2078 (ediff-set-file-eqstatus fileinfo1 t)
2079 (ediff-set-file-eqstatus fileinfo2 t)
2085 ;;; Local Variables:
2086 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
2087 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
2088 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
2091 ;;; ediff-mult.el ends here