Commit | Line | Data |
---|---|---|
eb4daa01 | 1 | ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff |
b578f267 | 2 | |
0d30b337 TTN |
3 | ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, |
4 | ;; 2003, 2004, 2005 Free Software Foundation, Inc. | |
fa2eb9ac | 5 | |
50a07e18 | 6 | ;; Author: Michael Kifer <kifer@cs.stonybrook.edu> |
fa2eb9ac MK |
7 | |
8 | ;; This file is part of GNU Emacs. | |
9 | ||
10 | ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 | ;; it under the terms of the GNU General Public License as published by | |
12 | ;; the Free Software Foundation; either version 2, or (at your option) | |
13 | ;; any later version. | |
14 | ||
15 | ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 | ;; GNU General Public License for more details. | |
19 | ||
20 | ;; You should have received a copy of the GNU General Public License | |
b578f267 | 21 | ;; along with GNU Emacs; see the file COPYING. If not, write to the |
086add15 LK |
22 | ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
23 | ;; Boston, MA 02110-1301, USA. | |
b578f267 EN |
24 | |
25 | ;;; Commentary: | |
fa2eb9ac | 26 | |
bbe6126c MK |
27 | ;; Users are encouraged to add functionality to this file. |
28 | ;; The present file contains all the infrastructure needed for that. | |
fa2eb9ac | 29 | ;; |
cd653311 | 30 | ;; Generally, to implement a new multisession capability within Ediff, |
6c83d99f | 31 | ;; you need to tell it |
fa2eb9ac MK |
32 | ;; |
33 | ;; 1. How to display the session group buffer. | |
34 | ;; This function must indicate which Ediff sessions are active (+) and | |
35 | ;; which are finished (-). | |
36 | ;; See ediff-redraw-directory-group-buffer for an example. | |
37 | ;; In all likelihood, ediff-redraw-directory-group-buffer can be used | |
38 | ;; directly or after a small modification. | |
39 | ;; 2. What action to take when the user clicks button 2 or types v,e, or | |
bbe6126c | 40 | ;; RET. See ediff-filegroup-action. |
fa2eb9ac MK |
41 | ;; 3. Provide a list of pairs or triples of file names (or buffers, |
42 | ;; depending on the particular Ediff operation you want to invoke) | |
43 | ;; in the following format: | |
743a79af | 44 | ;; (HEADER (nil nil (obj1 nil) (obj2 nil) (obj3 nil)) |
c3912d54 MK |
45 | ;; (...) ...) |
46 | ;; The function ediff-make-new-meta-list-element can be used to create | |
743a79af MK |
47 | ;; 2nd and subsequent elements of that list (i.e., after the |
48 | ;; description header). See ediff-make-new-meta-list-element for the | |
49 | ;; explanation of the two nil placeholders in such elements. | |
50 | ;; | |
51 | ;; There is API for extracting the components of the members of the | |
52 | ;; above list. Search for `API for ediff-meta-list' for details. | |
53 | ;; | |
54 | ;; HEADER must be a list of SIX elements (nil or string): | |
55 | ;; (regexp metaobj1 metaobj2 metaobj3 merge-save-buffer | |
56 | ;; comparison-function) | |
6c83d99f JB |
57 | ;; The function ediff-redraw-registry-buffer displays the |
58 | ;; 1st - 4th of these in the registry buffer. | |
743a79af MK |
59 | ;; For some jobs some of the members of the header might be nil. |
60 | ;; The meaning of metaobj1, metaobj2, and metaobj3 depend on the job. | |
61 | ;; Typically these are directories where the files to be compared are | |
62 | ;; found. | |
fa2eb9ac | 63 | ;; Also, keep in mind that the function ediff-prepare-meta-buffer |
c3912d54 MK |
64 | ;; (which see) prepends the session group buffer to the descriptor, so |
65 | ;; the descriptor becomes 7-long. | |
fa2eb9ac MK |
66 | ;; Ediff expects that your function (in 2 above) will arrange to |
67 | ;; replace this prepended nil (via setcar) with the actual ediff | |
68 | ;; control buffer associated with an appropriate Ediff session. | |
69 | ;; This is arranged through internal startup hooks that can be passed | |
70 | ;; to any of Ediff major entries (such as ediff-files, epatch, etc.). | |
bbe6126c MK |
71 | ;; See how this is done in ediff-filegroup-action. |
72 | ;; | |
743a79af MK |
73 | ;; Session descriptions are of the form |
74 | ;; (nil nil (obj1 . nil) (obj2 . nil) (obj3 . nil)) | |
75 | ;; which describe the objects relevant to the session. | |
76 | ;; Use ediff-make-new-meta-list-element to create these things. | |
77 | ;; Usually obj1/2/3 are names of files, but they may also be other | |
78 | ;; things for some jobs. For instance, obj3 is nil for jobs that | |
79 | ;; involve only two files. For patch jobs, obj2 and obj3 are markers | |
80 | ;; that specify the patch corresponding to the file | |
81 | ;; (whose name is obj1). | |
82 | ;; The nil's are placeholders, which are used internally by ediff. | |
fa2eb9ac | 83 | ;; 4. Write a function that makes a call to ediff-prepare-meta-buffer |
6c83d99f | 84 | ;; passing all this info. |
fa2eb9ac MK |
85 | ;; You may be able to use ediff-directories-internal as a template. |
86 | ;; 5. If you intend to add several related pieces of functionality, | |
87 | ;; you may want to keep the function in 4 as an internal version | |
88 | ;; and then write several top-level interactive functions that call it | |
89 | ;; with different parameters. | |
90 | ;; See how ediff-directories, ediff-merge-directories, and | |
91 | ;; ediff-merge-directories-with-ancestor all use | |
6c83d99f | 92 | ;; ediff-directories-internal. |
fa2eb9ac | 93 | ;; |
bbe6126c | 94 | ;; A useful addition here could be session groups selected by patterns |
3af0304a | 95 | ;; (which are different in each directory). For instance, one may want to |
fa2eb9ac | 96 | ;; compare files of the form abc{something}.c to files old{something}.d |
3af0304a | 97 | ;; which may be in the same or different directories. Or, one may want to |
fa2eb9ac MK |
98 | ;; compare all files of the form {something} to files of the form {something}~. |
99 | ;; | |
6c83d99f | 100 | ;; Implementing this requires writing a collating function, which should pair |
3af0304a MK |
101 | ;; up appropriate files. It will also require a generalization of the |
102 | ;; functions that do the layout of the meta- and differences buffers and of | |
bbe6126c | 103 | ;; ediff-filegroup-action. |
b578f267 EN |
104 | |
105 | ;;; Code: | |
fa2eb9ac | 106 | |
ddc90f39 MK |
107 | (provide 'ediff-mult) |
108 | ||
109 | (defgroup ediff-mult nil | |
b47b0c2c | 110 | "Multi-file and multi-buffer processing in Ediff." |
ddc90f39 MK |
111 | :prefix "ediff-" |
112 | :group 'ediff) | |
113 | ||
114 | ||
115 | ;; compiler pacifier | |
116 | (eval-when-compile | |
117 | (let ((load-path (cons (expand-file-name ".") load-path))) | |
118 | (or (featurep 'ediff-init) | |
119 | (load "ediff-init.el" nil nil 'nosuffix)) | |
120 | (or (featurep 'ediff-util) | |
121 | (load "ediff-util.el" nil nil 'nosuffix)) | |
122 | )) | |
123 | ;; end pacifier | |
124 | ||
fa2eb9ac | 125 | (require 'ediff-init) |
ddc90f39 | 126 | (require 'ediff-util) |
fa2eb9ac MK |
127 | |
128 | ;; meta-buffer | |
129 | (ediff-defvar-local ediff-meta-buffer nil "") | |
130 | (ediff-defvar-local ediff-parent-meta-buffer nil "") | |
131 | ;; the registry buffer | |
132 | (defvar ediff-registry-buffer nil) | |
133 | ||
134 | (defconst ediff-meta-buffer-message "This is an Ediff Session Group Panel: %s | |
135 | ||
136 | Useful commands: | |
328b4b70 MK |
137 | button2, v, or RET over session record: start that Ediff session |
138 | M:\tin sessions invoked from here, brings back this group panel | |
139 | R:\tdisplay the registry of active Ediff sessions | |
140 | h:\tmark session for hiding (toggle) | |
141 | x:\thide marked sessions; with prefix arg: unhide | |
142 | m:\tmark session for a non-hiding operation (toggle) | |
3ec8facd | 143 | uh/um:\tunmark all sessions marked for hiding/operation |
328b4b70 MK |
144 | n,SPC:\tnext session |
145 | p,DEL:\tprevious session | |
146 | E:\tbrowse Ediff on-line manual | |
147 | T:\ttoggle truncation of long file names | |
148 | q:\tquit this session group | |
fa2eb9ac MK |
149 | ") |
150 | ||
151 | (ediff-defvar-local ediff-meta-buffer-map nil | |
152 | "The keymap for the meta buffer.") | |
153 | (defvar ediff-dir-diffs-buffer-map (make-sparse-keymap) | |
154 | "The keymap to be installed in the buffer showing differences between | |
155 | directories.") | |
156 | ||
157 | ;; Variable specifying the action to take when the use invokes ediff in the | |
3af0304a | 158 | ;; meta buffer. This is usually ediff-registry-action or ediff-filegroup-action |
fa2eb9ac MK |
159 | (ediff-defvar-local ediff-meta-action-function nil "") |
160 | ;; Tells ediff-update-meta-buffer how to redraw it | |
161 | (ediff-defvar-local ediff-meta-redraw-function nil "") | |
bbe6126c MK |
162 | ;; Tells ediff-filegroup-action and similar procedures how to invoke Ediff for |
163 | ;; the sessions in a given session group | |
fa2eb9ac MK |
164 | (ediff-defvar-local ediff-session-action-function nil "") |
165 | ||
166 | (ediff-defvar-local ediff-metajob-name nil "") | |
167 | ||
168 | ;; buffer used to collect custom diffs from individual sessions in the group | |
169 | (ediff-defvar-local ediff-meta-diff-buffer nil "") | |
170 | ||
17561e4f MK |
171 | ;; t means recurse into subdirs when deciding which files have same contents |
172 | (ediff-defvar-local ediff-recurse-to-subdirectories nil "") | |
173 | ||
6e31f65f | 174 | ;; history var to use for filtering groups of files |
fa2eb9ac MK |
175 | (defvar ediff-filtering-regexp-history nil "") |
176 | ||
6e31f65f MK |
177 | (defcustom ediff-default-filtering-regexp nil |
178 | "The default regular expression used as a filename filter in multifile comparisons. | |
179 | Should be a sexp. For instance (car ediff-filtering-regexp-history) or nil." | |
180 | :type 'sexp | |
181 | :group 'ediff-mult) | |
182 | ||
bd698e98 MK |
183 | ;; This has the form ((meta-buf regexp dir1 dir2 dir3 merge-auto-store-dir) |
184 | ;; (ctl-buf session-status (file1 . eq-status) (file2 . eq-status) (file3 | |
185 | ;; . eq-status)) (ctl-buf session-status (file1 . eq-status) (file2 | |
186 | ;; . eq-status)) ...) | |
3af0304a MK |
187 | ;; If ctl-buf is nil, the file-pair hasn't processed yet. If it is |
188 | ;; killed-buffer object, the file pair has been processed. If it is a live | |
bd698e98 MK |
189 | ;; buffer, this means ediff is still working on the pair. |
190 | ;; Eq-status of a file is t if the file equals some other file in the same | |
191 | ;; group. | |
fa2eb9ac MK |
192 | (ediff-defvar-local ediff-meta-list nil "") |
193 | ||
328b4b70 MK |
194 | (ediff-defvar-local ediff-meta-session-number nil "") |
195 | ||
fa2eb9ac MK |
196 | |
197 | ;; the difference list between directories in a directory session group | |
198 | (ediff-defvar-local ediff-dir-difference-list nil "") | |
199 | (ediff-defvar-local ediff-dir-diffs-buffer nil "") | |
200 | ||
3af0304a | 201 | ;; The registry of Ediff sessions. A list of control buffers. |
fa2eb9ac MK |
202 | (defvar ediff-session-registry nil) |
203 | ||
328b4b70 MK |
204 | (defcustom ediff-meta-truncate-filenames t |
205 | "*If non-nil, truncate long file names in the session group buffers. | |
206 | This can be toggled with `ediff-toggle-filename-truncation'." | |
831dc66d | 207 | :type 'boolean |
328b4b70 | 208 | :group 'ediff-mult) |
8ea74b0e MK |
209 | |
210 | (defcustom ediff-meta-mode-hook nil | |
211 | "*Hooks run just after setting up meta mode." | |
212 | :type 'hook | |
213 | :group 'ediff-mult) | |
214 | ||
ddc90f39 MK |
215 | (defcustom ediff-registry-setup-hook nil |
216 | "*Hooks run just after the registry control panel is set up." | |
217 | :type 'hook | |
218 | :group 'ediff-mult) | |
657f9cb8 MK |
219 | |
220 | (defcustom ediff-before-session-group-setup-hooks nil | |
221 | "*Hooks to run before Ediff arranges the window for group-level operations. | |
222 | It is used by commands such as ediff-directories. | |
223 | This hook can be used to save the previous window config, which can be restored | |
224 | on ediff-quit, ediff-suspend, or ediff-quit-session-group-hook." | |
225 | :type 'hook | |
6c83d99f | 226 | :group 'ediff-hook) |
657f9cb8 | 227 | (defcustom ediff-after-session-group-setup-hook nil |
fa2eb9ac | 228 | "*Hooks run just after a meta-buffer controlling a session group, such as |
ddc90f39 MK |
229 | ediff-directories, is run." |
230 | :type 'hook | |
231 | :group 'ediff-mult) | |
232 | (defcustom ediff-quit-session-group-hook nil | |
233 | "*Hooks run just before exiting a session group." | |
234 | :type 'hook | |
235 | :group 'ediff-mult) | |
236 | (defcustom ediff-show-registry-hook nil | |
237 | "*Hooks run just after the registry buffer is shown." | |
238 | :type 'hook | |
239 | :group 'ediff-mult) | |
3af0304a | 240 | (defcustom ediff-show-session-group-hook '(delete-other-windows) |
ddc90f39 MK |
241 | "*Hooks run just after a session group buffer is shown." |
242 | :type 'hook | |
243 | :group 'ediff-mult) | |
244 | (defcustom ediff-meta-buffer-keymap-setup-hook nil | |
bf5d92c5 MK |
245 | "*Hooks run just after setting up the ediff-meta-buffer-map. |
246 | This keymap controls key bindings in the meta buffer and is a local variable. | |
247 | This means that you can set different bindings for different kinds of meta | |
ddc90f39 MK |
248 | buffers." |
249 | :type 'hook | |
250 | :group 'ediff-mult) | |
fa2eb9ac | 251 | |
3af0304a | 252 | ;; Buffer holding the multi-file patch. Local to the meta buffer |
bbe6126c MK |
253 | (ediff-defvar-local ediff-meta-patchbufer nil "") |
254 | ||
255 | ;;; API for ediff-meta-list | |
fa2eb9ac | 256 | |
c3912d54 MK |
257 | ;; A meta-list is either ediff-meta-list, which contains a header and the list |
258 | ;; of ediff sessions or ediff-dir-difference-list, which is a header followed | |
259 | ;; by the list of differences among the directories (i.e., files that are not | |
260 | ;; in all directories). The header is the same in all meta lists, but the rest | |
261 | ;; is different. | |
cd653311 MK |
262 | ;; Structure of the meta-list: |
263 | ;; (HEADER SESSION1 SESSION2 ...) | |
c3912d54 | 264 | ;; HEADER: (GROUP-BUF REGEXP OBJA OBJB OBJC SAVE-DIR COMPARISON-FUNC) |
cd653311 MK |
265 | ;; OBJA - first directory |
266 | ;; OBJB - second directory | |
267 | ;; OBJC - third directory | |
268 | ;; SESSION1/2/... are described below | |
bbe6126c | 269 | ;; group buffer/regexp |
bd698e98 | 270 | (defsubst ediff-get-group-buffer (meta-list) |
fa2eb9ac | 271 | (nth 0 (car meta-list))) |
92c51e07 | 272 | |
bd698e98 | 273 | (defsubst ediff-get-group-regexp (meta-list) |
fa2eb9ac | 274 | (nth 1 (car meta-list))) |
bbe6126c | 275 | ;; group objects |
bd698e98 | 276 | (defsubst ediff-get-group-objA (meta-list) |
fa2eb9ac | 277 | (nth 2 (car meta-list))) |
bd698e98 | 278 | (defsubst ediff-get-group-objB (meta-list) |
fa2eb9ac | 279 | (nth 3 (car meta-list))) |
bd698e98 | 280 | (defsubst ediff-get-group-objC (meta-list) |
fa2eb9ac | 281 | (nth 4 (car meta-list))) |
bd698e98 | 282 | (defsubst ediff-get-group-merge-autostore-dir (meta-list) |
92c51e07 | 283 | (nth 5 (car meta-list))) |
c3912d54 MK |
284 | (defsubst ediff-get-group-comparison-func (meta-list) |
285 | (nth 6 (car meta-list))) | |
92c51e07 | 286 | |
cd653311 MK |
287 | ;; ELT is a session meta descriptor (what is being preserved as |
288 | ;; 'ediff-meta-info) | |
289 | ;; The structure is: (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC) | |
c3912d54 MK |
290 | ;; STATUS is ?I (hidden or invalid), ?* (marked for operation), ?H (hidden) |
291 | ;; nil (nothing) | |
cd653311 MK |
292 | ;; OBJA/B/C is (FILENAME EQSTATUS) |
293 | ;; EQSTATUS is ?= or nil (?= means that this file is equal to some other | |
294 | ;; file in this session) | |
bbe6126c | 295 | ;; session buffer |
bd698e98 | 296 | (defsubst ediff-get-session-buffer (elt) |
fa2eb9ac | 297 | (nth 0 elt)) |
bd698e98 | 298 | (defsubst ediff-get-session-status (elt) |
fa2eb9ac | 299 | (nth 1 elt)) |
bd698e98 | 300 | (defsubst ediff-set-session-status (session-info new-status) |
bbe6126c MK |
301 | (setcar (cdr session-info) new-status)) |
302 | ;; session objects | |
bd698e98 | 303 | (defsubst ediff-get-session-objA (elt) |
fa2eb9ac | 304 | (nth 2 elt)) |
bd698e98 | 305 | (defsubst ediff-get-session-objB (elt) |
fa2eb9ac | 306 | (nth 3 elt)) |
bd698e98 | 307 | (defsubst ediff-get-session-objC (elt) |
fa2eb9ac | 308 | (nth 4 elt)) |
743a79af MK |
309 | ;; Take the "name" component of the object into acount. ObjA/C/B is of the form |
310 | ;; (name . equality-indicator) | |
bd698e98 | 311 | (defsubst ediff-get-session-objA-name (elt) |
bbe6126c | 312 | (car (nth 2 elt))) |
bd698e98 | 313 | (defsubst ediff-get-session-objB-name (elt) |
bbe6126c | 314 | (car (nth 3 elt))) |
bd698e98 | 315 | (defsubst ediff-get-session-objC-name (elt) |
bbe6126c MK |
316 | (car (nth 4 elt))) |
317 | ;; equality indicators | |
318 | (defsubst ediff-get-file-eqstatus (elt) | |
319 | (nth 1 elt)) | |
320 | (defsubst ediff-set-file-eqstatus (elt value) | |
321 | (setcar (cdr elt) value)) | |
fa2eb9ac | 322 | |
c3912d54 MK |
323 | ;; Create a new element for the meta list out of obj1/2/3, which usually are |
324 | ;; files | |
325 | ;; | |
743a79af MK |
326 | ;; The first nil in such an element is later replaced with the session buffer. |
327 | ;; The second nil is reserved for session status. | |
c3912d54 MK |
328 | ;; |
329 | ;; Also, session objects A/B/C are turned into lists of the form (obj nil). | |
743a79af | 330 | ;; This nil is a placeholder for eq-indicator. It is either nil or =. |
c3912d54 MK |
331 | ;; If it is discovered that this file is = to some other |
332 | ;; file in the same session, eq-indicator is changed to `='. | |
333 | ;; Curently, the eq-indicator is used only for 2 and 3-file jobs. | |
334 | (defun ediff-make-new-meta-list-element (obj1 obj2 obj3) | |
335 | (list nil nil (list obj1 nil) (list obj2 nil) (list obj3 nil))) | |
336 | ||
743a79af MK |
337 | ;; Constructs a meta list header. |
338 | ;; OBJA, OBJB, OBJC are usually directories involved, but can be different for | |
339 | ;; different jobs. For instance, multifile patch has only OBJA, which is the | |
340 | ;; patch buffer. | |
6c83d99f | 341 | (defun ediff-make-new-meta-list-header (regexp |
743a79af MK |
342 | objA objB objC |
343 | merge-auto-store-dir | |
344 | comparison-func) | |
345 | (list regexp objA objB objC merge-auto-store-dir comparison-func)) | |
346 | ||
328b4b70 MK |
347 | ;; The activity marker is either or + (active session, i.e., ediff is currently |
348 | ;; run in it), or - (finished session, i.e., we've ran ediff in it and then | |
3af0304a | 349 | ;; exited). Return nil, if session is neither active nor finished |
328b4b70 MK |
350 | (defun ediff-get-session-activity-marker (session) |
351 | (let ((session-buf (ediff-get-session-buffer session))) | |
352 | (cond ((null session-buf) nil) ; virgin session | |
353 | ((ediff-buffer-live-p session-buf) ?+) ;active session | |
354 | (t ?-)))) | |
355 | ||
bd698e98 MK |
356 | ;; checks if the session is a meta session |
357 | (defun ediff-meta-session-p (session-info) | |
358 | (and (stringp (ediff-get-session-objA-name session-info)) | |
6c83d99f | 359 | (file-directory-p (ediff-get-session-objA-name session-info)) |
bd698e98 MK |
360 | (stringp (ediff-get-session-objB-name session-info)) |
361 | (file-directory-p (ediff-get-session-objB-name session-info)) | |
362 | (if (stringp (ediff-get-session-objC-name session-info)) | |
363 | (file-directory-p (ediff-get-session-objC-name session-info)) t))) | |
364 | ||
fa2eb9ac MK |
365 | ;; set up the keymap in the meta buffer |
366 | (defun ediff-setup-meta-map() | |
367 | (setq ediff-meta-buffer-map (make-sparse-keymap)) | |
368 | (suppress-keymap ediff-meta-buffer-map) | |
369 | (define-key ediff-meta-buffer-map "q" 'ediff-quit-meta-buffer) | |
328b4b70 | 370 | (define-key ediff-meta-buffer-map "T" 'ediff-toggle-filename-truncation) |
fa2eb9ac MK |
371 | (define-key ediff-meta-buffer-map "R" 'ediff-show-registry) |
372 | (define-key ediff-meta-buffer-map "E" 'ediff-documentation) | |
373 | (define-key ediff-meta-buffer-map "v" ediff-meta-action-function) | |
374 | (define-key ediff-meta-buffer-map "\C-m" ediff-meta-action-function) | |
375 | (define-key ediff-meta-buffer-map " " 'ediff-next-meta-item) | |
328b4b70 | 376 | (define-key ediff-meta-buffer-map "n" 'ediff-next-meta-item) |
fa2eb9ac | 377 | (define-key ediff-meta-buffer-map "\C-?" 'ediff-previous-meta-item) |
328b4b70 | 378 | (define-key ediff-meta-buffer-map "p" 'ediff-previous-meta-item) |
fa2eb9ac MK |
379 | (define-key ediff-meta-buffer-map [delete] 'ediff-previous-meta-item) |
380 | (define-key ediff-meta-buffer-map [backspace] 'ediff-previous-meta-item) | |
bbe6126c | 381 | (or (ediff-one-filegroup-metajob) |
3ec8facd KH |
382 | (progn |
383 | (define-key ediff-meta-buffer-map "=" nil) | |
384 | (define-key ediff-meta-buffer-map "==" 'ediff-meta-mark-equal-files) | |
385 | (define-key ediff-meta-buffer-map "=m" 'ediff-meta-mark-equal-files) | |
386 | (define-key ediff-meta-buffer-map "=h" 'ediff-meta-mark-equal-files))) | |
fa2eb9ac MK |
387 | (if ediff-no-emacs-help-in-control-buffer |
388 | (define-key ediff-meta-buffer-map "\C-h" 'ediff-previous-meta-item)) | |
389 | (if ediff-emacs-p | |
390 | (define-key ediff-meta-buffer-map [mouse-2] ediff-meta-action-function) | |
391 | (define-key ediff-meta-buffer-map [button2] ediff-meta-action-function)) | |
392 | ||
bf5d92c5 MK |
393 | (use-local-map ediff-meta-buffer-map) |
394 | ;; modify ediff-meta-buffer-map here | |
395 | (run-hooks 'ediff-meta-buffer-keymap-setup-hook)) | |
fa2eb9ac | 396 | |
c3912d54 | 397 | |
fa2eb9ac MK |
398 | (defun ediff-meta-mode () |
399 | "This mode controls all operations on Ediff session groups. | |
400 | It is entered through one of the following commands: | |
401 | `ediff-directories' | |
402 | `edirs' | |
403 | `ediff-directories3' | |
404 | `edirs3' | |
405 | `ediff-merge-directories' | |
406 | `edirs-merge' | |
407 | `ediff-merge-directories-with-ancestor' | |
408 | `edirs-merge-with-ancestor' | |
409 | `ediff-directory-revisions' | |
410 | `edir-revisions' | |
411 | `ediff-merge-directory-revisions' | |
412 | `edir-merge-revisions' | |
413 | `ediff-merge-directory-revisions-with-ancestor' | |
414 | `edir-merge-revisions-with-ancestor' | |
415 | ||
416 | Commands: | |
417 | \\{ediff-meta-buffer-map}" | |
418 | (kill-all-local-variables) | |
419 | (setq major-mode 'ediff-meta-mode) | |
6f73217e | 420 | (setq mode-name "MetaEdiff") |
8ea74b0e MK |
421 | ;; don't use run-mode-hooks here! |
422 | (run-hooks 'ediff-meta-mode-hook)) | |
fa2eb9ac MK |
423 | |
424 | ||
425 | ;; the keymap for the buffer showing directory differences | |
426 | (suppress-keymap ediff-dir-diffs-buffer-map) | |
427 | (define-key ediff-dir-diffs-buffer-map "q" 'ediff-bury-dir-diffs-buffer) | |
428 | (define-key ediff-dir-diffs-buffer-map " " 'next-line) | |
328b4b70 | 429 | (define-key ediff-dir-diffs-buffer-map "n" 'next-line) |
fa2eb9ac | 430 | (define-key ediff-dir-diffs-buffer-map "\C-?" 'previous-line) |
328b4b70 | 431 | (define-key ediff-dir-diffs-buffer-map "p" 'previous-line) |
c3912d54 MK |
432 | (define-key ediff-dir-diffs-buffer-map "C" 'ediff-dir-diff-copy-file) |
433 | (if ediff-emacs-p | |
434 | (define-key ediff-dir-diffs-buffer-map [mouse-2] 'ediff-dir-diff-copy-file) | |
435 | (define-key ediff-dir-diffs-buffer-map [button2] 'ediff-dir-diff-copy-file)) | |
fa2eb9ac MK |
436 | (define-key ediff-dir-diffs-buffer-map [delete] 'previous-line) |
437 | (define-key ediff-dir-diffs-buffer-map [backspace] 'previous-line) | |
438 | ||
439 | (defun ediff-next-meta-item (count) | |
440 | "Move to the next item in Ediff registry or session group buffer. | |
3af0304a | 441 | Moves in circular fashion. With numeric prefix arg, skip this many items." |
fa2eb9ac MK |
442 | (interactive "p") |
443 | (or count (setq count 1)) | |
328b4b70 MK |
444 | (let (overl) |
445 | (while (< 0 count) | |
446 | (setq count (1- count)) | |
447 | (ediff-next-meta-item1) | |
448 | (setq overl (ediff-get-meta-overlay-at-pos (point))) | |
449 | ;; skip invisible ones | |
450 | (while (and overl (ediff-overlay-get overl 'invisible)) | |
451 | (ediff-next-meta-item1) | |
452 | (setq overl (ediff-get-meta-overlay-at-pos (point))))))) | |
fa2eb9ac MK |
453 | |
454 | ;; Move to the next meta item | |
455 | (defun ediff-next-meta-item1 () | |
456 | (let (pos) | |
457 | (setq pos (ediff-next-meta-overlay-start (point))) | |
fa2eb9ac MK |
458 | (if pos (goto-char pos)) |
459 | (if (eq ediff-metajob-name 'ediff-registry) | |
bbe6126c MK |
460 | (if (and (ediff-get-meta-info (current-buffer) pos 'noerror) |
461 | (search-forward "*Ediff" nil t)) | |
fa2eb9ac MK |
462 | (skip-chars-backward "a-zA-Z*")) |
463 | (if (> (skip-chars-forward "-+?H* \t0-9") 0) | |
464 | (backward-char 1))))) | |
465 | ||
466 | ||
467 | (defun ediff-previous-meta-item (count) | |
468 | "Move to the previous item in Ediff registry or session group buffer. | |
3af0304a | 469 | Moves in circular fashion. With numeric prefix arg, skip this many items." |
fa2eb9ac MK |
470 | (interactive "p") |
471 | (or count (setq count 1)) | |
328b4b70 MK |
472 | (let (overl) |
473 | (while (< 0 count) | |
474 | (setq count (1- count)) | |
475 | (ediff-previous-meta-item1) | |
476 | (setq overl (ediff-get-meta-overlay-at-pos (point))) | |
477 | ;; skip invisible ones | |
478 | (while (and overl (ediff-overlay-get overl 'invisible)) | |
479 | (ediff-previous-meta-item1) | |
480 | (setq overl (ediff-get-meta-overlay-at-pos (point))))))) | |
fa2eb9ac MK |
481 | |
482 | (defun ediff-previous-meta-item1 () | |
483 | (let (pos) | |
484 | (setq pos (ediff-previous-meta-overlay-start (point))) | |
485 | ;;; ;; skip deleted | |
486 | ;;; (while (ediff-get-session-status | |
487 | ;;; (ediff-get-meta-info (current-buffer) pos 'noerror)) | |
488 | ;;; (setq pos (ediff-previous-meta-overlay-start pos))) | |
6c83d99f | 489 | |
fa2eb9ac MK |
490 | (if pos (goto-char pos)) |
491 | (if (eq ediff-metajob-name 'ediff-registry) | |
bbe6126c MK |
492 | (if (and (ediff-get-meta-info (current-buffer) pos 'noerror) |
493 | (search-forward "*Ediff" nil t)) | |
fa2eb9ac MK |
494 | (skip-chars-backward "a-zA-Z*")) |
495 | (if (> (skip-chars-forward "-+?H* \t0-9") 0) | |
bbe6126c MK |
496 | (backward-char 1))) |
497 | )) | |
fa2eb9ac | 498 | |
92c51e07 MK |
499 | (defsubst ediff-add-slash-if-directory (dir file) |
500 | (if (file-directory-p (concat dir file)) | |
501 | (file-name-as-directory file) | |
502 | file)) | |
fa2eb9ac | 503 | |
328b4b70 MK |
504 | (defun ediff-toggle-filename-truncation () |
505 | "Toggle truncation of long file names in session group buffers. | |
506 | Set `ediff-meta-truncate-filenames' variable if you want to change the default | |
507 | behavior." | |
508 | (interactive) | |
509 | (setq ediff-meta-truncate-filenames (not ediff-meta-truncate-filenames)) | |
510 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) | |
511 | ||
fa2eb9ac | 512 | |
c3912d54 MK |
513 | ;; These are used to encode membership of files in directory1/2/3 |
514 | ;; Membership code of a file is a product of codes for the directories where | |
515 | ;; this file is in | |
516 | (defvar ediff-membership-code1 2) | |
517 | (defvar ediff-membership-code2 3) | |
518 | (defvar ediff-membership-code3 5) | |
519 | (defvar ediff-product-of-memcodes (* ediff-membership-code1 | |
520 | ediff-membership-code2 | |
521 | ediff-membership-code3)) | |
522 | ||
3af0304a | 523 | ;; DIR1, DIR2, DIR3 are directories. DIR3 can be nil. |
92c51e07 MK |
524 | ;; OUTPUT-DIR is a directory for auto-storing the results of merge jobs. |
525 | ;; Can be nil. | |
6dfd1bcc MK |
526 | ;; REGEXP is nil or a filter regexp; only file names that match the regexp |
527 | ;; are considered. | |
fa2eb9ac | 528 | ;; If a file is a directory in dir1 but not dir2 (or vice versa), it is not |
3af0304a | 529 | ;; included in the intersection. However, a regular file that is a dir in dir3 |
fa2eb9ac | 530 | ;; is included, since dir3 files are supposed to be ancestors for merging. |
3af0304a | 531 | ;; If COMPARISON-FUNC is given, use it. Otherwise, use string= |
743a79af MK |
532 | ;; |
533 | ;; Returns a list of the form: | |
534 | ;; (COMMON-PART DIFF-LIST) | |
535 | ;; COMMON-PART is car and DIFF-LIST is cdr. | |
536 | ;; | |
537 | ;; COMMON-PART is of the form: | |
538 | ;; (META-HEADER (f1 f2 f3) (f1 f2 f3) ...) | |
539 | ;; f3 can be nil if intersecting only 2 directories. | |
540 | ;; Each triple (f1 f2 f3) represents the files to be compared in the | |
541 | ;; corresponding ediff subsession. | |
542 | ;; | |
c3912d54 MK |
543 | ;; DIFF-LIST is of the form: |
544 | ;; (META-HEADER (file . num) (file . num)...) | |
fa2eb9ac MK |
545 | ;; where num encodes the set of dirs where the file is found: |
546 | ;; 2 - only dir1; 3 - only dir2; 5 - only dir3; 6 - dir1&2; 10 - dir1&3; etc. | |
743a79af MK |
547 | ;; META-HEADER: |
548 | ;; Contains the meta info about this ediff operation | |
c3912d54 MK |
549 | ;; (regexp dir1 dir2 dir3 merge-auto-store-dir comparison-func) |
550 | ;; Later the meta-buffer is prepended to this list. | |
743a79af MK |
551 | ;; |
552 | ;; Some operations might use a different meta header. For instance, | |
553 | ;; ediff-multifile-patch doesn't have dir2 and dir3, and regexp, | |
554 | ;; comparison-func don't apply. | |
555 | ;; | |
4ae69eac | 556 | (defun ediff-intersect-directories (jobname |
c3912d54 | 557 | regexp dir1 dir2 |
92c51e07 MK |
558 | &optional |
559 | dir3 merge-autostore-dir comparison-func) | |
fa2eb9ac | 560 | (setq comparison-func (or comparison-func 'string=)) |
c3912d54 | 561 | (let (lis1 lis2 lis3 common auxdir1 auxdir2 auxdir3 common-part difflist) |
fa2eb9ac MK |
562 | |
563 | (setq auxdir1 (file-name-as-directory dir1) | |
564 | lis1 (directory-files auxdir1 nil regexp) | |
92c51e07 MK |
565 | lis1 (delete "." lis1) |
566 | lis1 (delete ".." lis1) | |
6c83d99f | 567 | lis1 (mapcar |
3af0304a MK |
568 | (lambda (elt) |
569 | (ediff-add-slash-if-directory auxdir1 elt)) | |
92c51e07 | 570 | lis1) |
fa2eb9ac | 571 | auxdir2 (file-name-as-directory dir2) |
899a431b MK |
572 | lis2 (directory-files auxdir2 nil regexp) |
573 | lis2 (delete "." lis2) | |
574 | lis2 (delete ".." lis2) | |
6c83d99f | 575 | lis2 (mapcar |
3af0304a MK |
576 | (lambda (elt) |
577 | (ediff-add-slash-if-directory auxdir2 elt)) | |
899a431b | 578 | lis2)) |
fa2eb9ac MK |
579 | |
580 | (if (stringp dir3) | |
581 | (setq auxdir3 (file-name-as-directory dir3) | |
899a431b MK |
582 | lis3 (directory-files auxdir3 nil regexp) |
583 | lis3 (delete "." lis3) | |
584 | lis3 (delete ".." lis3) | |
6c83d99f | 585 | lis3 (mapcar |
3af0304a MK |
586 | (lambda (elt) |
587 | (ediff-add-slash-if-directory auxdir3 elt)) | |
899a431b | 588 | lis3))) |
92c51e07 | 589 | |
3af0304a | 590 | (if (ediff-nonempty-string-p merge-autostore-dir) |
92c51e07 MK |
591 | (setq merge-autostore-dir |
592 | (file-name-as-directory merge-autostore-dir))) | |
4ae69eac | 593 | (setq common (ediff-intersection lis1 lis2 comparison-func)) |
92c51e07 MK |
594 | |
595 | ;; In merge with ancestor jobs, we don't intersect with lis3. | |
596 | ;; If there is no ancestor, we'll offer to merge without the ancestor. | |
597 | ;; So, we intersect with lis3 only when we are doing 3-way file comparison | |
598 | (if (and lis3 (ediff-comparison-metajob3 jobname)) | |
599 | (setq common (ediff-intersection common lis3 comparison-func))) | |
fa2eb9ac | 600 | |
4ae69eac MK |
601 | ;; copying is needed because sort sorts via side effects |
602 | (setq common (sort (ediff-copy-list common) 'string-lessp)) | |
fa2eb9ac MK |
603 | |
604 | ;; compute difference list | |
4ae69eac MK |
605 | (setq difflist (ediff-set-difference |
606 | (ediff-union (ediff-union lis1 lis2 comparison-func) | |
607 | lis3 | |
608 | comparison-func) | |
fa2eb9ac | 609 | common |
4ae69eac | 610 | comparison-func) |
fa2eb9ac | 611 | difflist (delete "." difflist) |
4ae69eac MK |
612 | ;; copying is needed because sort sorts via side effects |
613 | difflist (sort (ediff-copy-list (delete ".." difflist)) | |
614 | 'string-lessp)) | |
fa2eb9ac | 615 | |
3af0304a | 616 | (setq difflist (mapcar (lambda (elt) (cons elt 1)) difflist)) |
fa2eb9ac MK |
617 | |
618 | ;; check for files belonging to lis1/2/3 | |
c3912d54 MK |
619 | ;; Each elt is of the norm (file . number) |
620 | ;; Number encodes the directories to which file belongs. | |
621 | ;; It is a product of a subset of ediff-membership-code1=2, | |
622 | ;; ediff-membership-code2=3, and ediff-membership-code3=5. | |
623 | ;; If file belongs to dir 1 only, the membership code is 2. | |
624 | ;; If it is in dir1 and dir3, then the membership code is 2*5=10; | |
625 | ;; if it is in dir1 and dir2, then the membership code is 2*3=6, etc. | |
3af0304a MK |
626 | (mapcar (lambda (elt) |
627 | (if (member (car elt) lis1) | |
c3912d54 | 628 | (setcdr elt (* (cdr elt) ediff-membership-code1))) |
3af0304a | 629 | (if (member (car elt) lis2) |
c3912d54 | 630 | (setcdr elt (* (cdr elt) ediff-membership-code2))) |
3af0304a | 631 | (if (member (car elt) lis3) |
c3912d54 | 632 | (setcdr elt (* (cdr elt) ediff-membership-code3))) |
3af0304a | 633 | ) |
fa2eb9ac | 634 | difflist) |
c3912d54 MK |
635 | (setq difflist (cons |
636 | ;; diff metalist header | |
743a79af MK |
637 | (ediff-make-new-meta-list-header regexp |
638 | auxdir1 auxdir2 auxdir3 | |
639 | merge-autostore-dir | |
640 | comparison-func) | |
c3912d54 | 641 | difflist)) |
6c83d99f | 642 | |
c3912d54 | 643 | (setq common-part |
6c83d99f | 644 | (cons |
c3912d54 | 645 | ;; metalist header |
743a79af MK |
646 | (ediff-make-new-meta-list-header regexp |
647 | auxdir1 auxdir2 auxdir3 | |
648 | merge-autostore-dir | |
649 | comparison-func) | |
c3912d54 | 650 | (mapcar |
6c83d99f | 651 | (lambda (elt) |
c3912d54 MK |
652 | (ediff-make-new-meta-list-element |
653 | (concat auxdir1 elt) | |
654 | (concat auxdir2 elt) | |
655 | (if lis3 | |
656 | (progn | |
657 | ;; The following is done because: In merging with | |
658 | ;; ancestor, we don't intersect with lis3. So, it is | |
659 | ;; possible that elt is a file in auxdir1/2 but a | |
660 | ;; directory in auxdir3 Or elt may not exist in auxdir3 at | |
661 | ;; all. In the first case, we add a slash at the end. In | |
662 | ;; the second case, we insert nil. | |
663 | (setq elt (ediff-add-slash-if-directory auxdir3 elt)) | |
664 | (if (file-exists-p (concat auxdir3 elt)) | |
665 | (concat auxdir3 elt)))))) | |
666 | common))) | |
fa2eb9ac | 667 | ;; return result |
c3912d54 | 668 | (cons common-part difflist) |
fa2eb9ac MK |
669 | )) |
670 | ||
328b4b70 MK |
671 | ;; find directory files that are under revision. Include subdirectories, since |
672 | ;; we may visit them recursively. DIR1 is the directory to inspect. | |
673 | ;; MERGE-AUTOSTORE-DIR is the directory where to auto-store the results of | |
3af0304a | 674 | ;; merges. Can be nil. |
92c51e07 MK |
675 | (defun ediff-get-directory-files-under-revision (jobname |
676 | regexp dir1 | |
677 | &optional merge-autostore-dir) | |
fa2eb9ac MK |
678 | (let (lis1 elt common auxdir1) |
679 | (setq auxdir1 (file-name-as-directory dir1) | |
680 | lis1 (directory-files auxdir1 nil regexp)) | |
681 | ||
3af0304a | 682 | (if (ediff-nonempty-string-p merge-autostore-dir) |
92c51e07 MK |
683 | (setq merge-autostore-dir |
684 | (file-name-as-directory merge-autostore-dir))) | |
685 | ||
fa2eb9ac MK |
686 | (while lis1 |
687 | (setq elt (car lis1) | |
688 | lis1 (cdr lis1)) | |
689 | ;; take files under revision control | |
690 | (cond ((file-directory-p (concat auxdir1 elt)) | |
328b4b70 MK |
691 | (setq common |
692 | (cons (ediff-add-slash-if-directory auxdir1 elt) common))) | |
3af0304a MK |
693 | ((and (featurep 'vc-hooks) (vc-backend (concat auxdir1 elt))) |
694 | (setq common (cons elt common))) | |
695 | ;; The following two are needed only if vc-hooks isn't loaded. | |
696 | ;; They won't recognize CVS files. | |
fa2eb9ac | 697 | ((file-exists-p (concat auxdir1 elt ",v")) |
4ae69eac MK |
698 | (setq common (cons elt common))) |
699 | ((file-exists-p (concat auxdir1 "RCS/" elt ",v")) | |
700 | (setq common (cons elt common))) | |
701 | ) ; cond | |
fa2eb9ac MK |
702 | ) ; while |
703 | ||
328b4b70 MK |
704 | (setq common (delete "./" common) |
705 | common (delete "../" common) | |
3af0304a MK |
706 | common (delete "RCS" common) |
707 | common (delete "CVS" common) | |
708 | ) | |
fa2eb9ac | 709 | |
4ae69eac MK |
710 | ;; copying is needed because sort sorts via side effects |
711 | (setq common (sort (ediff-copy-list common) 'string-lessp)) | |
fa2eb9ac MK |
712 | |
713 | ;; return result | |
6c83d99f | 714 | (cons |
c3912d54 | 715 | ;; header -- has 6 elements. Meta buffer is prepended later by |
6c83d99f | 716 | ;; ediff-prepare-meta-buffer |
743a79af MK |
717 | (ediff-make-new-meta-list-header regexp |
718 | auxdir1 nil nil | |
719 | merge-autostore-dir nil) | |
c3912d54 MK |
720 | (mapcar (lambda (elt) (ediff-make-new-meta-list-element |
721 | (concat auxdir1 elt) nil nil)) | |
722 | common)) | |
fa2eb9ac | 723 | )) |
6c83d99f | 724 | |
fa2eb9ac MK |
725 | |
726 | ;; If file groups selected by patterns will ever be implemented, this | |
727 | ;; comparison function might become useful. | |
728 | ;;;; uses external variables PAT1 PAT2 to compare str1/2 | |
729 | ;;;; patterns must be of the form ???*???? where ??? are strings of chars | |
730 | ;;;; containing no *. | |
731 | ;;(defun ediff-pattern= (str1 str2) | |
732 | ;; (let (pos11 pos12 pos21 pos22 len1 len2) | |
733 | ;; (setq pos11 0 | |
734 | ;; len (length epat1) | |
735 | ;; pos12 len) | |
736 | ;; (while (and (< pos11 len) (not (= (aref epat1 pos11) ?*))) | |
737 | ;; (setq pos11 (1+ pos11))) | |
738 | ;; (while (and (> pos12 0) (not (= (aref epat1 (1- pos12)) ?*))) | |
739 | ;; (setq pos12 (1- pos12))) | |
740 | ;; | |
741 | ;; (setq pos21 0 | |
742 | ;; len (length epat2) | |
743 | ;; pos22 len) | |
744 | ;; (while (and (< pos21 len) (not (= (aref epat2 pos21) ?*))) | |
745 | ;; (setq pos21 (1+ pos21))) | |
746 | ;; (while (and (> pos22 0) (not (= (aref epat2 (1- pos22)) ?*))) | |
747 | ;; (setq pos22 (1- pos22))) | |
748 | ;; | |
749 | ;; (if (and (> (length str1) pos12) (>= pos12 pos11) (> pos11 -1) | |
750 | ;; (> (length str2) pos22) (>= pos22 pos21) (> pos21 -1)) | |
751 | ;; (string= (substring str1 pos11 pos12) | |
752 | ;; (substring str2 pos21 pos22))) | |
753 | ;; )) | |
754 | ||
755 | ||
756 | ;; Prepare meta-buffer in accordance with the argument-function and | |
3af0304a | 757 | ;; redraw-function. Must return the created meta-buffer. |
fa2eb9ac MK |
758 | (defun ediff-prepare-meta-buffer (action-func meta-list |
759 | meta-buffer-name redraw-function | |
760 | jobname &optional startup-hooks) | |
6c83d99f | 761 | (let* ((meta-buffer-name |
fa2eb9ac MK |
762 | (ediff-unique-buffer-name meta-buffer-name "*")) |
763 | (meta-buffer (get-buffer-create meta-buffer-name))) | |
e756eb9f | 764 | (ediff-with-current-buffer meta-buffer |
fa2eb9ac MK |
765 | |
766 | ;; comes first | |
767 | (ediff-meta-mode) | |
768 | ||
769 | (setq ediff-meta-action-function action-func | |
770 | ediff-meta-redraw-function redraw-function | |
771 | ediff-metajob-name jobname | |
772 | ediff-meta-buffer meta-buffer) | |
773 | ||
774 | ;; comes after ediff-meta-action-function is set | |
775 | (ediff-setup-meta-map) | |
6c83d99f | 776 | |
fa2eb9ac MK |
777 | (if (eq ediff-metajob-name 'ediff-registry) |
778 | (progn | |
779 | (setq ediff-registry-buffer meta-buffer | |
780 | ediff-meta-list meta-list) | |
781 | ;; this func is used only from registry buffer, not from other | |
782 | ;; meta-buffs. | |
783 | (define-key | |
784 | ediff-meta-buffer-map "M" 'ediff-show-meta-buff-from-registry)) | |
c3912d54 | 785 | ;; Initialize the meta list -- we don't do this for registry. |
fa2eb9ac | 786 | (setq ediff-meta-list |
c3912d54 | 787 | ;; add meta-buffer to the list header |
fa2eb9ac | 788 | (cons (cons meta-buffer (car meta-list)) |
c3912d54 | 789 | (cdr meta-list)))) |
6c83d99f | 790 | |
fa2eb9ac MK |
791 | (or (eq meta-buffer ediff-registry-buffer) |
792 | (setq ediff-session-registry | |
793 | (cons meta-buffer ediff-session-registry))) | |
6c83d99f | 794 | |
fa2eb9ac MK |
795 | ;; redraw-function uses ediff-meta-list |
796 | (funcall redraw-function ediff-meta-list) | |
6c83d99f | 797 | |
fa2eb9ac MK |
798 | ;; set read-only/non-modified |
799 | (setq buffer-read-only t) | |
800 | (set-buffer-modified-p nil) | |
801 | ||
802 | (run-hooks 'startup-hooks) | |
92c51e07 MK |
803 | |
804 | ;; Arrange to show directory contents differences | |
805 | ;; Must be after run startup-hooks, since ediff-dir-difference-list is | |
fa2eb9ac | 806 | ;; set inside these hooks |
bbe6126c | 807 | (if (eq action-func 'ediff-filegroup-action) |
fa2eb9ac MK |
808 | (progn |
809 | ;; put meta buffer in (car ediff-dir-difference-list) | |
810 | (setq ediff-dir-difference-list | |
811 | (cons (cons meta-buffer (car ediff-dir-difference-list)) | |
812 | (cdr ediff-dir-difference-list))) | |
813 | ||
bbe6126c | 814 | (or (ediff-one-filegroup-metajob jobname) |
fa2eb9ac | 815 | (ediff-draw-dir-diffs ediff-dir-difference-list)) |
6c83d99f | 816 | (define-key |
3ec8facd KH |
817 | ediff-meta-buffer-map "h" 'ediff-mark-for-hiding-at-pos) |
818 | (define-key ediff-meta-buffer-map "x" 'ediff-hide-marked-sessions) | |
6c83d99f | 819 | (define-key |
3ec8facd KH |
820 | ediff-meta-buffer-map "m" 'ediff-mark-for-operation-at-pos) |
821 | (define-key ediff-meta-buffer-map "u" nil) | |
fa2eb9ac | 822 | (define-key |
3ec8facd | 823 | ediff-meta-buffer-map "um" 'ediff-unmark-all-for-operation) |
6c83d99f | 824 | (define-key |
3ec8facd | 825 | ediff-meta-buffer-map "uh" 'ediff-unmark-all-for-hiding) |
bbe6126c MK |
826 | (cond ((ediff-collect-diffs-metajob jobname) |
827 | (define-key | |
828 | ediff-meta-buffer-map "P" 'ediff-collect-custom-diffs)) | |
829 | ((ediff-patch-metajob jobname) | |
830 | (define-key | |
831 | ediff-meta-buffer-map "P" 'ediff-meta-show-patch))) | |
3ec8facd | 832 | (define-key ediff-meta-buffer-map "^" 'ediff-up-meta-hierarchy) |
fa2eb9ac MK |
833 | (define-key ediff-meta-buffer-map "D" 'ediff-show-dir-diffs))) |
834 | ||
835 | (if (eq ediff-metajob-name 'ediff-registry) | |
836 | (run-hooks 'ediff-registry-setup-hook) | |
657f9cb8 | 837 | (run-hooks 'ediff-after-session-group-setup-hook)) |
fa2eb9ac MK |
838 | ) ; eval in meta-buffer |
839 | meta-buffer)) | |
840 | ||
328b4b70 MK |
841 | ;; Insert the activity marker for session SESSION in the meta buffer at point |
842 | ;; The activity marker is either SPC (untouched session), or + (active session, | |
843 | ;; i.e., ediff is currently run in it), or - (finished session, i.e., we've ran | |
844 | ;; ediff in it and then exited) | |
845 | (defun ediff-insert-session-activity-marker-in-meta-buffer (session) | |
846 | (insert | |
847 | (cond ((ediff-get-session-activity-marker session)) | |
848 | ;; virgin session | |
849 | (t " ")))) | |
850 | ||
3af0304a | 851 | ;; Insert session status at point. Status is either ?H (marked for hiding), or |
328b4b70 MK |
852 | ;; ?I (hidden or invalid), or ?* (meaning marked for an operation; currently, |
853 | ;; such op can only be checking for equality)), or SPC (meaning neither marked | |
6c83d99f | 854 | ;; nor invalid) |
328b4b70 MK |
855 | (defun ediff-insert-session-status-in-meta-buffer (session) |
856 | (insert | |
857 | (cond ((ediff-get-session-status session)) ; session has status: ?H, ?I, ?* | |
858 | ;; normal session, no marks or hidings | |
859 | (t " ")))) | |
860 | ||
861 | ;; If NEW-MARKER is non-nil, use it to substitute the current activity marker | |
3af0304a | 862 | ;; in the meta buffer. If nil, use SPC |
328b4b70 MK |
863 | (defun ediff-replace-session-activity-marker-in-meta-buffer (point new-marker) |
864 | (let* ((overl (ediff-get-meta-overlay-at-pos point)) | |
865 | (session-info (ediff-overlay-get overl 'ediff-meta-info)) | |
866 | (activity-marker (ediff-get-session-activity-marker session-info)) | |
867 | buffer-read-only) | |
b47b0c2c | 868 | (or new-marker activity-marker (setq new-marker ?\s)) |
328b4b70 MK |
869 | (goto-char (ediff-overlay-start overl)) |
870 | (if (eq (char-after (point)) new-marker) | |
871 | () ; if marker shown in buffer is the same as new-marker, do nothing | |
872 | (insert new-marker) | |
873 | (delete-char 1) | |
874 | (set-buffer-modified-p nil)))) | |
875 | ||
876 | ;; If NEW-STATUS is non-nil, use it to substitute the current status marker in | |
3af0304a | 877 | ;; the meta buffer. If nil, use SPC |
328b4b70 MK |
878 | (defun ediff-replace-session-status-in-meta-buffer (point new-status) |
879 | (let* ((overl (ediff-get-meta-overlay-at-pos point)) | |
880 | (session-info (ediff-overlay-get overl 'ediff-meta-info)) | |
881 | (status (ediff-get-session-status session-info)) | |
882 | buffer-read-only) | |
b47b0c2c | 883 | (setq new-status (or new-status status ?\s)) |
328b4b70 MK |
884 | (goto-char (ediff-overlay-start overl)) |
885 | (forward-char 1) ; status is the second char in session record | |
886 | (if (eq (char-after (point)) new-status) | |
887 | () ; if marker shown in buffer is the same as new-marker, do nothing | |
888 | (insert new-status) | |
889 | (delete-char 1) | |
890 | (set-buffer-modified-p nil)))) | |
891 | ||
892 | ;; insert all file info in meta buffer for a given session | |
893 | (defun ediff-insert-session-info-in-meta-buffer (session-info sessionNum) | |
894 | (let ((f1 (ediff-get-session-objA session-info)) | |
895 | (f2 (ediff-get-session-objB session-info)) | |
896 | (f3 (ediff-get-session-objC session-info)) | |
897 | (pt (point)) | |
898 | (hidden (eq (ediff-get-session-status session-info) ?I))) | |
899 | ;; insert activity marker, i.e., SPC, - or + | |
900 | (ediff-insert-session-activity-marker-in-meta-buffer session-info) | |
901 | ;; insert session status, i.e., *, H | |
902 | (ediff-insert-session-status-in-meta-buffer session-info) | |
903 | (insert " Session " (int-to-string sessionNum) ":\n") | |
904 | (ediff-meta-insert-file-info1 f1) | |
905 | (ediff-meta-insert-file-info1 f2) | |
906 | (ediff-meta-insert-file-info1 f3) | |
907 | (ediff-set-meta-overlay pt (point) session-info sessionNum hidden))) | |
908 | ||
fa2eb9ac MK |
909 | |
910 | ;; this is a setup function for ediff-directories | |
911 | ;; must return meta-buffer | |
912 | (defun ediff-redraw-directory-group-buffer (meta-list) | |
913 | ;; extract directories | |
914 | (let ((meta-buf (ediff-get-group-buffer meta-list)) | |
915 | (empty t) | |
916 | (sessionNum 0) | |
328b4b70 | 917 | regexp elt merge-autostore-dir |
fa2eb9ac | 918 | point tmp-list buffer-read-only) |
e756eb9f | 919 | (ediff-with-current-buffer meta-buf |
fa2eb9ac MK |
920 | (setq point (point)) |
921 | (erase-buffer) | |
328b4b70 MK |
922 | ;; delete phony overlays that used to represent sessions before the buff |
923 | ;; was redrawn | |
50a07e18 MK |
924 | (ediff-cond-compile-for-xemacs-or-emacs |
925 | (map-extents 'delete-extent) ; xemacs | |
926 | (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs | |
927 | ) | |
6c83d99f | 928 | |
fa2eb9ac MK |
929 | (insert (format ediff-meta-buffer-message |
930 | (ediff-abbrev-jobname ediff-metajob-name))) | |
931 | ||
92c51e07 | 932 | (setq regexp (ediff-get-group-regexp meta-list) |
328b4b70 MK |
933 | merge-autostore-dir |
934 | (ediff-get-group-merge-autostore-dir meta-list)) | |
6c83d99f | 935 | |
bbe6126c MK |
936 | (cond ((ediff-collect-diffs-metajob) |
937 | (insert | |
328b4b70 | 938 | " P:\tcollect custom diffs of all marked sessions\n")) |
bbe6126c MK |
939 | ((ediff-patch-metajob) |
940 | (insert | |
328b4b70 | 941 | " P:\tshow patch appropriately for the context (session or group)\n"))) |
fa2eb9ac | 942 | (insert |
3ec8facd | 943 | " ^:\tshow parent session group\n") |
bbe6126c MK |
944 | (or (ediff-one-filegroup-metajob) |
945 | (insert | |
328b4b70 | 946 | " D:\tshow differences among directories\n" |
3ec8facd KH |
947 | " ==:\tfor each session, show which files are identical\n" |
948 | " =h:\tlike ==, but also marks those sessions for hiding\n" | |
949 | " =m:\tlike ==, but also marks those sessions for operation\n\n")) | |
fa2eb9ac | 950 | |
328b4b70 | 951 | (insert "\n") |
fa2eb9ac | 952 | (if (and (stringp regexp) (> (length regexp) 0)) |
ddc90f39 | 953 | (insert |
328b4b70 MK |
954 | (format "*** Filter-through regular expression: %s\n" regexp))) |
955 | (ediff-insert-dirs-in-meta-buffer meta-list) | |
92c51e07 | 956 | (if (and ediff-autostore-merges (ediff-merge-metajob) |
3af0304a | 957 | (ediff-nonempty-string-p merge-autostore-dir)) |
92c51e07 | 958 | (insert (format |
328b4b70 | 959 | "\nMerge results are automatically stored in:\n\t%s\n" |
92c51e07 | 960 | merge-autostore-dir))) |
fa2eb9ac | 961 | (insert "\n |
bbe6126c | 962 | Size Last modified Name |
328b4b70 | 963 | ---------------------------------------------- |
fa2eb9ac MK |
964 | |
965 | ") | |
6c83d99f | 966 | |
fa2eb9ac MK |
967 | ;; discard info on directories and regexp |
968 | (setq meta-list (cdr meta-list) | |
969 | tmp-list meta-list) | |
970 | (while (and tmp-list empty) | |
971 | (if (and (car tmp-list) | |
972 | (not (eq (ediff-get-session-status (car tmp-list)) ?I))) | |
973 | (setq empty nil)) | |
974 | (setq tmp-list (cdr tmp-list))) | |
975 | ||
976 | (if empty | |
977 | (insert | |
978 | " ****** ****** This session group has no members\n")) | |
6c83d99f | 979 | |
fa2eb9ac | 980 | ;; now organize file names like this: |
fa2eb9ac | 981 | ;; use-mark sizeA dateA sizeB dateB filename |
fa2eb9ac | 982 | ;; make sure directories are displayed with a trailing slash. |
fa2eb9ac MK |
983 | (while meta-list |
984 | (setq elt (car meta-list) | |
985 | meta-list (cdr meta-list) | |
986 | sessionNum (1+ sessionNum)) | |
987 | (if (eq (ediff-get-session-status elt) ?I) | |
988 | () | |
328b4b70 | 989 | (ediff-insert-session-info-in-meta-buffer elt sessionNum))) |
fa2eb9ac MK |
990 | (set-buffer-modified-p nil) |
991 | (goto-char point) | |
992 | meta-buf))) | |
993 | ||
328b4b70 MK |
994 | (defun ediff-update-markers-in-dir-meta-buffer (meta-list) |
995 | (let ((meta-buf (ediff-get-group-buffer meta-list)) | |
996 | session-info point overl buffer-read-only) | |
997 | (ediff-with-current-buffer meta-buf | |
998 | (setq point (point)) | |
999 | (goto-char (point-min)) | |
1000 | (ediff-next-meta-item1) | |
1001 | (while (not (bobp)) | |
1002 | (setq session-info (ediff-get-meta-info meta-buf (point) 'no-error) | |
1003 | overl (ediff-get-meta-overlay-at-pos (point))) | |
1004 | (if session-info | |
1005 | (progn | |
1006 | (cond ((eq (ediff-get-session-status session-info) ?I) | |
1007 | ;; Do hiding | |
1008 | (if overl (ediff-overlay-put overl 'invisible t))) | |
1009 | ((and (eq (ediff-get-session-status session-info) ?H) | |
1010 | overl (ediff-overlay-get overl 'invisible)) | |
1011 | ;; Do unhiding | |
1012 | (ediff-overlay-put overl 'invisible nil)) | |
1013 | (t (ediff-replace-session-activity-marker-in-meta-buffer | |
1014 | (point) | |
1015 | (ediff-get-session-activity-marker session-info)) | |
1016 | (ediff-replace-session-status-in-meta-buffer | |
1017 | (point) | |
1018 | (ediff-get-session-status session-info)))))) | |
1019 | (ediff-next-meta-item1) ; advance to the next item | |
1020 | ) ; end while | |
1021 | (set-buffer-modified-p nil) | |
1022 | (goto-char point)) | |
1023 | meta-buf)) | |
1024 | ||
1025 | (defun ediff-update-session-marker-in-dir-meta-buffer (session-num) | |
1026 | (let (buffer-meta-overlays session-info overl buffer-read-only) | |
1027 | (setq overl | |
50a07e18 MK |
1028 | (ediff-cond-compile-for-xemacs-or-emacs |
1029 | (map-extents ; xemacs | |
1030 | (lambda (ext maparg) | |
1031 | (if (and | |
1032 | (ediff-overlay-get ext 'ediff-meta-info) | |
1033 | (eq (ediff-overlay-get ext 'ediff-meta-session-number) | |
1034 | session-num)) | |
1035 | ext))) | |
328b4b70 MK |
1036 | ;; Emacs doesn't have map-extents, so try harder |
1037 | ;; Splice overlay lists to get all buffer overlays | |
50a07e18 MK |
1038 | (progn |
1039 | (setq buffer-meta-overlays (overlay-lists) | |
1040 | buffer-meta-overlays (append (car buffer-meta-overlays) | |
1041 | (cdr buffer-meta-overlays))) | |
1042 | (car | |
1043 | (delq nil | |
1044 | (mapcar | |
1045 | (lambda (overl) | |
1046 | (if (and | |
1047 | (ediff-overlay-get overl 'ediff-meta-info) | |
1048 | (eq (ediff-overlay-get | |
1049 | overl 'ediff-meta-session-number) | |
1050 | session-num)) | |
1051 | overl)) | |
1052 | buffer-meta-overlays)))) | |
1053 | )) | |
328b4b70 MK |
1054 | (or overl |
1055 | (error | |
1056 | "Bug in ediff-update-session-marker-in-dir-meta-buffer: no overlay with given number %S" | |
1057 | session-num)) | |
1058 | (setq session-info (ediff-overlay-get overl 'ediff-meta-info)) | |
1059 | (goto-char (ediff-overlay-start overl)) | |
1060 | (ediff-replace-session-activity-marker-in-meta-buffer | |
1061 | (point) | |
1062 | (ediff-get-session-activity-marker session-info)) | |
1063 | (ediff-replace-session-status-in-meta-buffer | |
1064 | (point) | |
1065 | (ediff-get-session-status session-info))) | |
1066 | (ediff-next-meta-item1)) | |
1067 | ||
1068 | ||
1069 | ||
fa2eb9ac | 1070 | ;; Check if this is a problematic session. |
3af0304a | 1071 | ;; Return nil if not. Otherwise, return symbol representing the problem |
fa2eb9ac | 1072 | ;; At present, problematic sessions occur only in -with-ancestor comparisons |
92c51e07 MK |
1073 | ;; when the ancestor is a directory rather than a file, or when there is no |
1074 | ;; suitable ancestor file in the ancestor directory | |
fa2eb9ac | 1075 | (defun ediff-problematic-session-p (session) |
bbe6126c MK |
1076 | (let ((f1 (ediff-get-session-objA-name session)) |
1077 | (f2 (ediff-get-session-objB-name session)) | |
1078 | (f3 (ediff-get-session-objC-name session))) | |
fa2eb9ac MK |
1079 | (cond ((and (stringp f1) (not (file-directory-p f1)) |
1080 | (stringp f2) (not (file-directory-p f2)) | |
92c51e07 MK |
1081 | ;; either invalid file name or a directory |
1082 | (or (not (stringp f3)) (file-directory-p f3)) | |
fa2eb9ac MK |
1083 | (ediff-ancestor-metajob)) |
1084 | ;; more may be added later | |
1085 | 'ancestor-is-dir) | |
1086 | (t nil)))) | |
1087 | ||
328b4b70 | 1088 | (defun ediff-meta-insert-file-info1 (fileinfo) |
92c51e07 | 1089 | (let ((fname (car fileinfo)) |
bbe6126c | 1090 | (feq (ediff-get-file-eqstatus fileinfo)) |
328b4b70 MK |
1091 | (max-filename-width (if ediff-meta-truncate-filenames |
1092 | (- (window-width) 41) | |
1093 | 500)) | |
92c51e07 | 1094 | file-modtime file-size) |
92c51e07 | 1095 | (cond ((not (stringp fname)) (setq file-size -2)) ; file doesn't exits |
4960e757 | 1096 | ((ediff-listable-file fname) |
92c51e07 MK |
1097 | (if (file-exists-p fname) |
1098 | ;; set real size and modtime | |
1099 | (setq file-size (ediff-file-size fname) | |
1100 | file-modtime (ediff-file-modtime fname)) | |
1101 | (setq file-size -2))) ; file doesn't exist | |
1102 | ( t (setq file-size -1))) ; remote file | |
bbe6126c MK |
1103 | (if (stringp fname) |
1104 | (insert | |
1105 | (format | |
1106 | "%s %s %-20s %s\n" | |
1107 | (if feq "=" " ") ; equality indicator | |
92c51e07 MK |
1108 | (format "%10s" (cond ((= file-size -1) "--") |
1109 | ((< file-size -1) "--") | |
1110 | (t file-size))) | |
1111 | (cond ((= file-size -1) "*remote file*") | |
1112 | ((< file-size -1) "*file doesn't exist*") | |
1113 | (t (ediff-format-date (decode-time file-modtime)))) | |
1114 | ||
1115 | ;; dir names in meta lists have training slashes, so we just | |
1116 | ;; abbreviate the file name, if file exists | |
1117 | (if (and (not (stringp fname)) (< file-size -1)) | |
1118 | "-------" ; file doesn't exist | |
328b4b70 MK |
1119 | (ediff-truncate-string-left |
1120 | (ediff-abbreviate-file-name fname) | |
1121 | max-filename-width))))))) | |
fa2eb9ac | 1122 | |
bbe6126c MK |
1123 | (defconst ediff-months '((1 . "Jan") (2 . "Feb") (3 . "Mar") (4 . "Apr") |
1124 | (5 . "May") (6 . "Jun") (7 . "Jul") (8 . "Aug") | |
1125 | (9 . "Sep") (10 . "Oct") (11 . "Nov") (12 . "Dec")) | |
1126 | "Months' associative array.") | |
1127 | ||
92c51e07 MK |
1128 | ;; returns 2char string |
1129 | (defsubst ediff-fill-leading-zero (num) | |
1130 | (if (< num 10) | |
1131 | (format "0%d" num) | |
1132 | (number-to-string num))) | |
1133 | ||
bbe6126c MK |
1134 | ;; TIME is like the output of decode-time |
1135 | (defun ediff-format-date (time) | |
1136 | (format "%s %2d %4d %s:%s:%s" | |
1137 | (cdr (assoc (nth 4 time) ediff-months)) ; month | |
1138 | (nth 3 time) ; day | |
1139 | (nth 5 time) ; year | |
1140 | (ediff-fill-leading-zero (nth 2 time)) ; hour | |
1141 | (ediff-fill-leading-zero (nth 1 time)) ; min | |
1142 | (ediff-fill-leading-zero (nth 0 time)) ; sec | |
1143 | )) | |
1144 | ||
328b4b70 MK |
1145 | ;; Draw the directories |
1146 | (defun ediff-insert-dirs-in-meta-buffer (meta-list) | |
1147 | (let* ((dir1 (ediff-abbreviate-file-name (ediff-get-group-objA meta-list))) | |
1148 | (dir2 (ediff-get-group-objB meta-list)) | |
1149 | (dir2 (if (stringp dir2) (ediff-abbreviate-file-name dir2))) | |
1150 | (dir3 (ediff-get-group-objC meta-list)) | |
1151 | (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3)))) | |
1152 | (insert "*** Directory A: " dir1 "\n") | |
1153 | (if dir2 (insert "*** Directory B: " dir2 "\n")) | |
1154 | (if dir3 (insert "*** Directory C: " dir3 "\n")) | |
1155 | (insert "\n"))) | |
1156 | ||
c3912d54 | 1157 | (defun ediff-draw-dir-diffs (diff-list &optional buf-name) |
fa2eb9ac | 1158 | (if (null diff-list) (error "Lost difference info on these directories")) |
c3912d54 MK |
1159 | (setq buf-name |
1160 | (or buf-name | |
1161 | (ediff-unique-buffer-name "*Ediff File Group Differences" "*"))) | |
1162 | (let* ((regexp (ediff-get-group-regexp diff-list)) | |
fa2eb9ac MK |
1163 | (dir1 (ediff-abbreviate-file-name (ediff-get-group-objA diff-list))) |
1164 | (dir2 (ediff-abbreviate-file-name (ediff-get-group-objB diff-list))) | |
1165 | (dir3 (ediff-get-group-objC diff-list)) | |
1166 | (dir3 (if (stringp dir3) (ediff-abbreviate-file-name dir3))) | |
1167 | (meta-buf (ediff-get-group-buffer diff-list)) | |
1168 | (underline (make-string 26 ?-)) | |
c3912d54 | 1169 | file membership-code saved-point |
fa2eb9ac MK |
1170 | buffer-read-only) |
1171 | ;; skip the directory part | |
1172 | (setq diff-list (cdr diff-list)) | |
1173 | (setq ediff-dir-diffs-buffer (get-buffer-create buf-name)) | |
e756eb9f | 1174 | (ediff-with-current-buffer ediff-dir-diffs-buffer |
c3912d54 | 1175 | (setq saved-point (point)) |
fa2eb9ac MK |
1176 | (use-local-map ediff-dir-diffs-buffer-map) |
1177 | (erase-buffer) | |
1178 | (setq ediff-meta-buffer meta-buf) | |
1179 | (insert "\t\t*** Directory Differences ***\n") | |
1180 | (insert " | |
1181 | Useful commands: | |
c3912d54 MK |
1182 | C,button2: over file name -- copy this file to directory that doesn't have it |
1183 | q: hide this buffer | |
1184 | n,SPC: next line | |
1185 | p,DEL: previous line\n\n") | |
1186 | ||
1187 | (insert (format "\n*** Directory A: %s\n" dir1)) | |
1188 | (if dir2 (insert (format "*** Directory B: %s\n" dir2))) | |
1189 | (if dir3 (insert (format "*** Directory C: %s\n" dir3))) | |
fa2eb9ac | 1190 | (if (and (stringp regexp) (> (length regexp) 0)) |
ddc90f39 | 1191 | (insert |
c3912d54 | 1192 | (format "*** Filter-through regular expression: %s\n" regexp))) |
fa2eb9ac | 1193 | (insert "\n") |
c3912d54 | 1194 | (insert (format "\n%-27s%-26s" "Directory A" "Directory B")) |
fa2eb9ac | 1195 | (if dir3 |
c3912d54 | 1196 | (insert (format " %-25s\n" "Directory C")) |
fa2eb9ac MK |
1197 | (insert "\n")) |
1198 | (insert (format "%s%s" underline underline)) | |
1199 | (if (stringp dir3) | |
1200 | (insert (format "%s\n\n" underline)) | |
1201 | (insert "\n\n")) | |
1202 | ||
1203 | (if (null diff-list) | |
1204 | (insert "\n\t*** No differences ***\n")) | |
1205 | ||
1206 | (while diff-list | |
1207 | (setq file (car (car diff-list)) | |
c3912d54 | 1208 | membership-code (cdr (car diff-list)) |
fa2eb9ac | 1209 | diff-list (cdr diff-list)) |
c3912d54 MK |
1210 | (if (= (mod membership-code ediff-membership-code1) 0) ; dir1 |
1211 | (let ((beg (point))) | |
1212 | (insert (format "%-27s" | |
1213 | (ediff-truncate-string-left | |
1214 | (ediff-abbreviate-file-name | |
1215 | (if (file-directory-p (concat dir1 file)) | |
1216 | (file-name-as-directory file) | |
1217 | file)) | |
1218 | 24))) | |
1219 | ;; format of meta info in the dir-diff-buffer: | |
1220 | ;; (filename-tail filename-full otherdir1 otherdir2 otherdir3) | |
1221 | (ediff-set-meta-overlay | |
1222 | beg (point) | |
1223 | (list meta-buf file (concat dir1 file) dir1 dir2 dir3))) | |
fa2eb9ac | 1224 | (insert (format "%-27s" "---"))) |
c3912d54 MK |
1225 | (if (= (mod membership-code ediff-membership-code2) 0) ; dir2 |
1226 | (let ((beg (point))) | |
1227 | (insert (format "%-26s" | |
1228 | (ediff-truncate-string-left | |
1229 | (ediff-abbreviate-file-name | |
1230 | (if (file-directory-p (concat dir2 file)) | |
1231 | (file-name-as-directory file) | |
1232 | file)) | |
1233 | 24))) | |
1234 | (ediff-set-meta-overlay | |
1235 | beg (point) | |
1236 | (list meta-buf file (concat dir2 file) dir1 dir2 dir3))) | |
fa2eb9ac MK |
1237 | (insert (format "%-26s" "---"))) |
1238 | (if (stringp dir3) | |
c3912d54 MK |
1239 | (if (= (mod membership-code ediff-membership-code3) 0) ; dir3 |
1240 | (let ((beg (point))) | |
6c83d99f | 1241 | (insert (format " %-25s" |
c3912d54 MK |
1242 | (ediff-truncate-string-left |
1243 | (ediff-abbreviate-file-name | |
1244 | (if (file-directory-p (concat dir3 file)) | |
1245 | (file-name-as-directory file) | |
1246 | file)) | |
1247 | 24))) | |
1248 | (ediff-set-meta-overlay | |
1249 | beg (point) | |
1250 | (list meta-buf file (concat dir3 file) dir1 dir2 dir3))) | |
fa2eb9ac MK |
1251 | (insert (format " %-25s" "---")))) |
1252 | (insert "\n")) | |
1253 | (setq buffer-read-only t) | |
c3912d54 MK |
1254 | (set-buffer-modified-p nil) |
1255 | (goto-char saved-point)) ; end eval in diff buffer | |
fa2eb9ac MK |
1256 | )) |
1257 | ||
1258 | (defun ediff-bury-dir-diffs-buffer () | |
3af0304a | 1259 | "Bury the directory difference buffer. Display the meta buffer instead." |
fa2eb9ac | 1260 | (interactive) |
c3912d54 MK |
1261 | ;; ediff-meta-buffer is set in ediff-draw-dir-diffs so the directory |
1262 | ;; difference buffer remembers the meta buffer | |
fa2eb9ac MK |
1263 | (let ((buf ediff-meta-buffer) |
1264 | wind) | |
c3912d54 | 1265 | (ediff-kill-buffer-carefully ediff-dir-diffs-buffer) |
fa2eb9ac MK |
1266 | (if (setq wind (ediff-get-visible-buffer-window buf)) |
1267 | (select-window wind) | |
1268 | (set-window-buffer (selected-window) buf)))) | |
1269 | ||
1270 | ;; executes in dir session group buffer | |
1271 | ;; show buffer differences | |
1272 | (defun ediff-show-dir-diffs () | |
1273 | "Display differences among the directories involved in session group." | |
1274 | (interactive) | |
bbe6126c | 1275 | (if (ediff-one-filegroup-metajob) |
fa2eb9ac MK |
1276 | (error "This command is inapplicable in the present context")) |
1277 | (or (ediff-buffer-live-p ediff-dir-diffs-buffer) | |
1278 | (ediff-draw-dir-diffs ediff-dir-difference-list)) | |
1279 | (let ((buf ediff-dir-diffs-buffer)) | |
1280 | (other-window 1) | |
1281 | (set-window-buffer (selected-window) buf) | |
1282 | (goto-char (point-min)))) | |
1283 | ||
c3912d54 MK |
1284 | ;; Format of meta info in dir-diff-buffer: |
1285 | ;; (filename-tail filename-full otherdir1 otherdir2) | |
1286 | (defun ediff-dir-diff-copy-file () | |
1287 | "Copy file described at point to directories where this file is missing." | |
1288 | (interactive) | |
1289 | (let* ((pos (ediff-event-point last-command-event)) | |
1290 | (info (ediff-get-meta-info (current-buffer) pos 'noerror)) | |
1291 | (meta-buf (car info)) | |
1292 | (file-tail (nth 1 info)) | |
1293 | (file-abs (nth 2 info)) | |
1294 | (otherdir1 (nth 3 info)) | |
1295 | (otherfile1 (if otherdir1 (concat otherdir1 file-tail))) | |
1296 | (otherdir2 (nth 4 info)) | |
1297 | (otherfile2 (if otherdir2 (concat otherdir2 file-tail))) | |
1298 | (otherdir3 (nth 5 info)) | |
1299 | (otherfile3 (if otherdir3 (concat otherdir3 file-tail))) | |
1300 | meta-list dir-diff-list | |
1301 | ) | |
1302 | (if (null info) | |
1303 | (error "No file suitable for copying described at this location")) | |
1304 | (ediff-with-current-buffer meta-buf | |
1305 | (setq meta-list ediff-meta-list | |
1306 | dir-diff-list ediff-dir-difference-list)) | |
1307 | ||
1308 | ;; copy file to directories where it doesn't exist, update | |
1309 | ;; ediff-dir-difference-list and redisplay | |
1310 | (mapcar | |
1311 | (lambda (otherfile-struct) | |
1312 | (let ((otherfile (car otherfile-struct)) | |
1313 | (file-mem-code (cdr otherfile-struct))) | |
1314 | (if otherfile | |
1315 | (or (file-exists-p otherfile) | |
1316 | (if (y-or-n-p | |
1317 | (format "Copy %s to %s ? " file-abs otherfile)) | |
1318 | (let* ((file-diff-record (assoc file-tail dir-diff-list)) | |
1319 | (new-mem-code | |
1320 | (* (cdr file-diff-record) file-mem-code))) | |
1321 | (copy-file file-abs otherfile) | |
1322 | (setcdr file-diff-record new-mem-code) | |
1323 | (ediff-draw-dir-diffs dir-diff-list (buffer-name)) | |
1324 | (sit-for 0) | |
1325 | ;; if file is in all three dirs or in two dirs and only | |
1326 | ;; two dirs are involved, delete this file's record | |
1327 | (if (or (= new-mem-code ediff-product-of-memcodes) | |
1328 | (and (> new-mem-code ediff-membership-code3) | |
1329 | (null otherfile3))) | |
1330 | (delq file-diff-record dir-diff-list)) | |
1331 | )))) | |
1332 | )) | |
1333 | ;; 2,3,5 are numbers used to encode membership of a file in | |
1334 | ;; dir1/2/3. See ediff-intersect-directories. | |
1335 | (list (cons otherfile1 2) (cons otherfile2 3) (cons otherfile3 5))) | |
1336 | ||
1337 | (if (and (file-exists-p otherfile1) | |
1338 | (file-exists-p otherfile2) | |
1339 | (or (not otherfile3) (file-exists-p otherfile3))) | |
1340 | ;; update ediff-meta-list by direct modification | |
1341 | (nconc meta-list | |
1342 | (list (ediff-make-new-meta-list-element | |
1343 | otherfile1 otherfile2 otherfile3))) | |
1344 | ) | |
1345 | (ediff-update-meta-buffer meta-buf 'must-redraw) | |
1346 | )) | |
1347 | ||
fa2eb9ac MK |
1348 | (defun ediff-up-meta-hierarchy () |
1349 | "Go to the parent session group buffer." | |
1350 | (interactive) | |
1351 | (if (ediff-buffer-live-p ediff-parent-meta-buffer) | |
328b4b70 MK |
1352 | (ediff-show-meta-buffer |
1353 | ediff-parent-meta-buffer ediff-meta-session-number) | |
fa2eb9ac | 1354 | (error "This session group has no parent"))) |
6c83d99f | 1355 | |
fa2eb9ac MK |
1356 | |
1357 | ;; argument is ignored | |
1358 | (defun ediff-redraw-registry-buffer (&optional ignore) | |
e756eb9f | 1359 | (ediff-with-current-buffer ediff-registry-buffer |
fa2eb9ac MK |
1360 | (let ((point (point)) |
1361 | elt bufAname bufBname bufCname cur-diff total-diffs pt | |
1362 | job-name meta-list registry-list buffer-read-only) | |
1363 | (erase-buffer) | |
328b4b70 MK |
1364 | ;; delete phony overlays that used to represent sessions before the buff |
1365 | ;; was redrawn | |
50a07e18 MK |
1366 | (ediff-cond-compile-for-xemacs-or-emacs |
1367 | (map-extents 'delete-extent) ; xemacs | |
1368 | (mapcar 'delete-overlay (overlays-in 1 1)) ; emacs | |
1369 | ) | |
328b4b70 | 1370 | |
fa2eb9ac MK |
1371 | (insert "This is a registry of all active Ediff sessions. |
1372 | ||
1373 | Useful commands: | |
1374 | button2, `v', RET over a session record: switch to that session | |
328b4b70 MK |
1375 | M over a session record: display the associated session group |
1376 | R in any Ediff session: display session registry | |
1377 | n,SPC: next session | |
1378 | p,DEL: previous session | |
1379 | E: browse Ediff on-line manual | |
1380 | q: bury registry | |
fa2eb9ac MK |
1381 | |
1382 | ||
1383 | \t\tActive Ediff Sessions: | |
1384 | \t\t---------------------- | |
1385 | ||
1386 | ") | |
1387 | ;; purge registry list from dead buffers | |
3af0304a MK |
1388 | (mapcar (lambda (elt) |
1389 | (if (not (ediff-buffer-live-p elt)) | |
1390 | (setq ediff-session-registry | |
1391 | (delq elt ediff-session-registry)))) | |
fa2eb9ac MK |
1392 | ediff-session-registry) |
1393 | ||
1394 | (if (null ediff-session-registry) | |
1395 | (insert " ******* No active Ediff sessions *******\n")) | |
1396 | ||
1397 | (setq registry-list ediff-session-registry) | |
1398 | (while registry-list | |
1399 | (setq elt (car registry-list) | |
1400 | registry-list (cdr registry-list)) | |
6c83d99f | 1401 | |
fa2eb9ac | 1402 | (if (ediff-buffer-live-p elt) |
e756eb9f | 1403 | (if (ediff-with-current-buffer elt |
fa2eb9ac MK |
1404 | (setq job-name ediff-metajob-name |
1405 | meta-list ediff-meta-list) | |
1406 | (and ediff-metajob-name | |
1407 | (not (eq ediff-metajob-name 'ediff-registry)))) | |
1408 | (progn | |
1409 | (setq pt (point)) | |
1410 | (insert (format " *group*\t%s: %s\n" | |
1411 | (buffer-name elt) | |
1412 | (ediff-abbrev-jobname job-name))) | |
1413 | (insert (format "\t\t %s %s %s\n" | |
1414 | (ediff-abbreviate-file-name | |
1415 | (ediff-get-group-objA meta-list)) | |
1416 | (ediff-abbreviate-file-name | |
bbe6126c MK |
1417 | (if (stringp |
1418 | (ediff-get-group-objB meta-list)) | |
1419 | (ediff-get-group-objB meta-list) | |
1420 | "")) | |
fa2eb9ac | 1421 | (ediff-abbreviate-file-name |
bbe6126c MK |
1422 | (if (stringp |
1423 | (ediff-get-group-objC meta-list)) | |
1424 | (ediff-get-group-objC meta-list) | |
1425 | "")))) | |
fa2eb9ac MK |
1426 | (ediff-set-meta-overlay pt (point) elt)) |
1427 | (progn | |
e756eb9f | 1428 | (ediff-with-current-buffer elt |
fa2eb9ac MK |
1429 | (setq bufAname (if (ediff-buffer-live-p ediff-buffer-A) |
1430 | (buffer-name ediff-buffer-A) | |
1431 | "!!!killed buffer!!!") | |
1432 | bufBname (if (ediff-buffer-live-p ediff-buffer-B) | |
1433 | (buffer-name ediff-buffer-B) | |
1434 | "!!!killed buffer!!!") | |
1435 | bufCname (cond ((not (ediff-3way-job)) | |
1436 | "") | |
1437 | ((ediff-buffer-live-p ediff-buffer-C) | |
1438 | (buffer-name ediff-buffer-C)) | |
1439 | (t "!!!killed buffer!!!"))) | |
1440 | (setq total-diffs (format "%-4d" ediff-number-of-differences) | |
1441 | cur-diff | |
1442 | (cond ((= ediff-current-difference -1) " _") | |
1443 | ((= ediff-current-difference | |
1444 | ediff-number-of-differences) | |
1445 | " $") | |
1446 | (t (format | |
1447 | "%4d" (1+ ediff-current-difference)))) | |
1448 | job-name ediff-job-name)) | |
1449 | ;; back in the meta buf | |
1450 | (setq pt (point)) | |
1451 | (insert cur-diff "/" total-diffs "\t" | |
1452 | (buffer-name elt) | |
1453 | (format ": %s" (ediff-abbrev-jobname job-name))) | |
1454 | (insert | |
1455 | "\n\t\t " bufAname " " bufBname " " bufCname "\n") | |
1456 | (ediff-set-meta-overlay pt (point) elt)))) | |
1457 | ) ; while | |
1458 | (set-buffer-modified-p nil) | |
1459 | (goto-char point) | |
1460 | ))) | |
1461 | ||
328b4b70 MK |
1462 | ;; Sets overlay around a meta record with 'ediff-meta-info property PROP |
1463 | ;; If optional SESSION-NUMBER, make it a property of the overlay, | |
1464 | ;; ediff-meta-session-number | |
cd653311 MK |
1465 | ;; PROP is either the ctl or meta buffer (used when we work with the registry) |
1466 | ;; or a session meta descriptor of the form | |
1467 | ;; (SESSION-CTL-BUFFER STATUS OBJA OBJB OBJC) | |
328b4b70 | 1468 | (defun ediff-set-meta-overlay (b e prop &optional session-number hidden) |
fa2eb9ac MK |
1469 | (let (overl) |
1470 | (setq overl (ediff-make-overlay b e)) | |
1471 | (if ediff-emacs-p | |
1472 | (ediff-overlay-put overl 'mouse-face 'highlight) | |
1473 | (ediff-overlay-put overl 'highlight t)) | |
328b4b70 MK |
1474 | (ediff-overlay-put overl 'ediff-meta-info prop) |
1475 | (ediff-overlay-put overl 'invisible hidden) | |
1476 | (if (numberp session-number) | |
1477 | (ediff-overlay-put overl 'ediff-meta-session-number session-number)))) | |
fa2eb9ac | 1478 | |
3ec8facd | 1479 | (defun ediff-mark-for-hiding-at-pos (unmark) |
3af0304a | 1480 | "Mark session for hiding. With prefix arg, unmark." |
fa2eb9ac MK |
1481 | (interactive "P") |
1482 | (let* ((pos (ediff-event-point last-command-event)) | |
1483 | (meta-buf (ediff-event-buffer last-command-event)) | |
1484 | ;; ediff-get-meta-info gives error if meta-buf or pos are invalid | |
1485 | (info (ediff-get-meta-info meta-buf pos)) | |
328b4b70 | 1486 | (session-number (ediff-get-session-number-at-pos pos))) |
3ec8facd KH |
1487 | (ediff-mark-session-for-hiding info unmark) |
1488 | (ediff-next-meta-item 1) | |
1489 | (save-excursion | |
1490 | (ediff-update-meta-buffer meta-buf nil session-number)) | |
fa2eb9ac MK |
1491 | )) |
1492 | ||
3ec8facd KH |
1493 | ;; Returns whether session was marked or unmarked |
1494 | (defun ediff-mark-session-for-hiding (info unmark) | |
1495 | (let ((session-buf (ediff-get-session-buffer info)) | |
1496 | ignore) | |
1497 | (cond ((eq unmark 'mark) (setq unmark nil)) | |
1498 | ((eq (ediff-get-session-status info) ?H) (setq unmark t)) | |
1499 | (unmark ; says unmark, but the marker is different from H | |
1500 | (setq ignore t))) | |
1501 | (cond (ignore) | |
1502 | (unmark (ediff-set-session-status info nil)) | |
1503 | ;;; (if (ediff-buffer-live-p session-buf) | |
1504 | ;;; (error "Can't hide active session, %s" (buffer-name session-buf))) | |
1505 | (t (ediff-set-session-status info ?H)))) | |
1506 | unmark) | |
6c83d99f | 1507 | |
3ec8facd KH |
1508 | |
1509 | (defun ediff-mark-for-operation-at-pos (unmark) | |
3af0304a | 1510 | "Mark session for a group operation. With prefix arg, unmark." |
fa2eb9ac MK |
1511 | (interactive "P") |
1512 | (let* ((pos (ediff-event-point last-command-event)) | |
1513 | (meta-buf (ediff-event-buffer last-command-event)) | |
1514 | ;; ediff-get-meta-info gives error if meta-buf or pos are invalid | |
328b4b70 MK |
1515 | (info (ediff-get-meta-info meta-buf pos)) |
1516 | (session-number (ediff-get-session-number-at-pos pos))) | |
3ec8facd KH |
1517 | (ediff-mark-session-for-operation info unmark) |
1518 | (ediff-next-meta-item 1) | |
1519 | (save-excursion | |
1520 | (ediff-update-meta-buffer meta-buf nil session-number)) | |
fa2eb9ac MK |
1521 | )) |
1522 | ||
3ec8facd KH |
1523 | |
1524 | ;; returns whether session was unmarked. | |
1525 | ;; remember: this is a toggle op | |
1526 | (defun ediff-mark-session-for-operation (info unmark) | |
1527 | (let (ignore) | |
1528 | (cond ((eq unmark 'mark) (setq unmark nil)) | |
1529 | ((eq (ediff-get-session-status info) ?*) (setq unmark t)) | |
1530 | (unmark ; says unmark, but the marker is different from * | |
1531 | (setq ignore t))) | |
1532 | (cond (ignore) | |
1533 | (unmark (ediff-set-session-status info nil)) | |
1534 | (t (ediff-set-session-status info ?*)))) | |
1535 | unmark) | |
1536 | ||
1537 | ||
fa2eb9ac | 1538 | (defun ediff-hide-marked-sessions (unhide) |
3af0304a | 1539 | "Hide marked sessions. With prefix arg, unhide." |
fa2eb9ac MK |
1540 | (interactive "P") |
1541 | (let ((grp-buf (ediff-get-group-buffer ediff-meta-list)) | |
1542 | (meta-list (cdr ediff-meta-list)) | |
1543 | (from (if unhide ?I ?H)) | |
1544 | (to (if unhide ?H ?I)) | |
1545 | (numMarked 0) | |
bbe6126c | 1546 | active-sessions-exist session-buf elt) |
fa2eb9ac MK |
1547 | (while meta-list |
1548 | (setq elt (car meta-list) | |
bbe6126c MK |
1549 | meta-list (cdr meta-list) |
1550 | session-buf (ediff-get-session-buffer elt)) | |
1551 | ||
fa2eb9ac MK |
1552 | (if (eq (ediff-get-session-status elt) from) |
1553 | (progn | |
1554 | (setq numMarked (1+ numMarked)) | |
bbe6126c MK |
1555 | (if (and (eq to ?I) (buffer-live-p session-buf)) |
1556 | ;; shouldn't hide active sessions | |
1557 | (setq active-sessions-exist t) | |
1558 | (ediff-set-session-status elt to))))) | |
fa2eb9ac | 1559 | (if (> numMarked 0) |
3af0304a | 1560 | (ediff-update-meta-buffer grp-buf 'must-redraw) |
fa2eb9ac MK |
1561 | (beep) |
1562 | (if unhide | |
1563 | (message "Nothing to reveal...") | |
1564 | (message "Nothing to hide..."))) | |
bbe6126c | 1565 | (if active-sessions-exist |
328b4b70 | 1566 | (message "Note: Ediff didn't hide active sessions!")) |
fa2eb9ac MK |
1567 | )) |
1568 | ||
3af0304a | 1569 | ;; Apply OPERATION to marked sessions. Operation expects one argument of type |
fa2eb9ac MK |
1570 | ;; meta-list member (not the first one), i.e., a regular session description. |
1571 | ;; Returns number of marked sessions on which operation was performed | |
1572 | (defun ediff-operate-on-marked-sessions (operation) | |
1573 | (let ((grp-buf (ediff-get-group-buffer ediff-meta-list)) | |
1574 | (meta-list (cdr ediff-meta-list)) | |
1575 | (marksym ?*) | |
1576 | (numMarked 0) | |
1577 | (sessionNum 0) | |
bd698e98 MK |
1578 | (diff-buffer ediff-meta-diff-buffer) |
1579 | session-buf elt) | |
fa2eb9ac MK |
1580 | (while meta-list |
1581 | (setq elt (car meta-list) | |
1582 | meta-list (cdr meta-list) | |
1583 | sessionNum (1+ sessionNum)) | |
bd698e98 MK |
1584 | (cond ((eq (ediff-get-session-status elt) marksym) |
1585 | (save-excursion | |
1586 | (setq numMarked (1+ numMarked)) | |
1587 | (funcall operation elt sessionNum))) | |
c3912d54 MK |
1588 | ;; The following goes into a session represented by a subdirectory |
1589 | ;; and applies operation to marked sessions there | |
6c83d99f JB |
1590 | ((and (ediff-meta-session-p elt) |
1591 | (ediff-buffer-live-p | |
bd698e98 MK |
1592 | (setq session-buf (ediff-get-session-buffer elt)))) |
1593 | (setq numMarked | |
6c83d99f | 1594 | (+ numMarked |
bd698e98 MK |
1595 | (ediff-with-current-buffer session-buf |
1596 | ;; pass meta-diff along | |
1597 | (setq ediff-meta-diff-buffer diff-buffer) | |
1598 | ;; collect diffs in child group | |
1599 | (ediff-operate-on-marked-sessions operation))))))) | |
328b4b70 | 1600 | (ediff-update-meta-buffer grp-buf 'must-redraw) ; just in case |
fa2eb9ac MK |
1601 | numMarked |
1602 | )) | |
1603 | ||
1604 | (defun ediff-append-custom-diff (session sessionNum) | |
1605 | (or (ediff-collect-diffs-metajob) | |
c3912d54 | 1606 | (error "Can't compute multifile patch in this context")) |
fa2eb9ac MK |
1607 | (let ((session-buf (ediff-get-session-buffer session)) |
1608 | (meta-diff-buff ediff-meta-diff-buffer) | |
1609 | (metajob ediff-metajob-name) | |
1610 | tmp-buf custom-diff-buf) | |
1611 | (if (ediff-buffer-live-p session-buf) | |
e756eb9f | 1612 | (ediff-with-current-buffer session-buf |
fa2eb9ac | 1613 | (if (eq ediff-control-buffer session-buf) ; individual session |
4ae69eac MK |
1614 | (progn |
1615 | (ediff-compute-custom-diffs-maybe) | |
1616 | (setq custom-diff-buf ediff-custom-diff-buffer))))) | |
fa2eb9ac MK |
1617 | |
1618 | (or (ediff-buffer-live-p meta-diff-buff) | |
c3912d54 | 1619 | (error "Ediff: something wrong--killed multiple diff's buffer")) |
fa2eb9ac MK |
1620 | |
1621 | (cond ((ediff-buffer-live-p custom-diff-buf) | |
c3912d54 MK |
1622 | ;; for live session buffers we do them first because the user may |
1623 | ;; have changed them with respect to the underlying files | |
fa2eb9ac MK |
1624 | (save-excursion |
1625 | (set-buffer meta-diff-buff) | |
1626 | (goto-char (point-max)) | |
1627 | (insert-buffer custom-diff-buf) | |
1628 | (insert "\n"))) | |
c3912d54 | 1629 | ;; if ediff session is not live, run diff directly on the files |
6c83d99f | 1630 | ((memq metajob '(ediff-directories |
4ae69eac MK |
1631 | ediff-merge-directories |
1632 | ediff-merge-directories-with-ancestor)) | |
fa2eb9ac MK |
1633 | ;; get diffs by calling shell command on ediff-custom-diff-program |
1634 | (save-excursion | |
1635 | (set-buffer (setq tmp-buf (get-buffer-create ediff-tmp-buffer))) | |
1636 | (erase-buffer) | |
1637 | (shell-command | |
1638 | (format "%s %s %s %s" | |
1639 | ediff-custom-diff-program ediff-custom-diff-options | |
bbe6126c MK |
1640 | (ediff-get-session-objA-name session) |
1641 | (ediff-get-session-objB-name session)) | |
fa2eb9ac MK |
1642 | t)) |
1643 | (save-excursion | |
1644 | (set-buffer meta-diff-buff) | |
1645 | (goto-char (point-max)) | |
1646 | (insert-buffer tmp-buf) | |
1647 | (insert "\n"))) | |
1648 | (t | |
c3912d54 MK |
1649 | (ediff-kill-buffer-carefully meta-diff-buff) |
1650 | (error "Session %d compares versions of file. Such session must be active to enable multifile patch collection" sessionNum ))) | |
4ae69eac | 1651 | )) |
fa2eb9ac MK |
1652 | |
1653 | (defun ediff-collect-custom-diffs () | |
1654 | "Collect custom diffs of marked sessions in buffer `*Ediff Multifile Diffs*'. | |
1655 | This operation is defined only for `ediff-directories' and | |
1656 | `ediff-directory-revisions', since its intent is to produce | |
3af0304a | 1657 | multifile patches. For `ediff-directory-revisions', we insist that |
fa2eb9ac MK |
1658 | all marked sessions must be active." |
1659 | (interactive) | |
1660 | (or (ediff-buffer-live-p ediff-meta-diff-buffer) | |
1661 | (setq ediff-meta-diff-buffer | |
1662 | (get-buffer-create | |
1663 | (ediff-unique-buffer-name "*Ediff Multifile Diffs" "*")))) | |
e756eb9f | 1664 | (ediff-with-current-buffer ediff-meta-diff-buffer |
c3912d54 | 1665 | (setq buffer-read-only nil) |
fa2eb9ac MK |
1666 | (erase-buffer)) |
1667 | (if (> (ediff-operate-on-marked-sessions 'ediff-append-custom-diff) 0) | |
1668 | ;; did something | |
3af0304a MK |
1669 | (progn |
1670 | (display-buffer ediff-meta-diff-buffer 'not-this-window) | |
1671 | (ediff-with-current-buffer ediff-meta-diff-buffer | |
1672 | (set-buffer-modified-p nil) | |
1673 | (setq buffer-read-only t))) | |
fa2eb9ac MK |
1674 | (beep) |
1675 | (message "No marked sessions found"))) | |
1676 | ||
bbe6126c MK |
1677 | (defun ediff-meta-show-patch () |
1678 | "Show the multi-file patch associated with this group session." | |
1679 | (interactive) | |
1680 | (let* ((pos (ediff-event-point last-command-event)) | |
1681 | (meta-buf (ediff-event-buffer last-command-event)) | |
1682 | (info (ediff-get-meta-info meta-buf pos 'noerror)) | |
1683 | (patchbuffer ediff-meta-patchbufer)) | |
1684 | (if (ediff-buffer-live-p patchbuffer) | |
e756eb9f | 1685 | (ediff-with-current-buffer patchbuffer |
bbe6126c MK |
1686 | (save-restriction |
1687 | (if (not info) | |
1688 | (widen) | |
1689 | (narrow-to-region | |
1690 | (ediff-get-session-objB-name info) | |
1691 | (ediff-get-session-objC-name info))) | |
1692 | (set-buffer (get-buffer-create ediff-tmp-buffer)) | |
1693 | (erase-buffer) | |
1694 | (insert-buffer patchbuffer) | |
1695 | (display-buffer ediff-tmp-buffer 'not-this-window) | |
1696 | )) | |
1697 | (error "The patch buffer wasn't found")))) | |
1698 | ||
6c83d99f | 1699 | |
3af0304a | 1700 | ;; This function executes in meta buffer. It knows where event happened. |
bbe6126c | 1701 | (defun ediff-filegroup-action () |
50a07e18 | 1702 | "Execute appropriate action for a selected session." |
fa2eb9ac MK |
1703 | (interactive) |
1704 | (let* ((pos (ediff-event-point last-command-event)) | |
1705 | (meta-buf (ediff-event-buffer last-command-event)) | |
1706 | ;; ediff-get-meta-info gives error if meta-buf or pos are invalid | |
1707 | (info (ediff-get-meta-info meta-buf pos)) | |
328b4b70 | 1708 | (session-buf (ediff-get-session-buffer info)) |
c004db97 | 1709 | (session-number (ediff-get-session-number-at-pos pos meta-buf)) |
81ef8960 | 1710 | (default-regexp (eval ediff-default-filtering-regexp)) |
328b4b70 | 1711 | merge-autostore-dir file1 file2 file3 regexp) |
fa2eb9ac | 1712 | |
328b4b70 | 1713 | (setq file1 (ediff-get-session-objA-name info) |
bbe6126c MK |
1714 | file2 (ediff-get-session-objB-name info) |
1715 | file3 (ediff-get-session-objC-name info)) | |
fa2eb9ac MK |
1716 | |
1717 | ;; make sure we don't start on hidden sessions | |
1718 | ;; ?H means marked for hiding. ?I means invalid (hidden). | |
bbe6126c | 1719 | (if (memq (ediff-get-session-status info) '(?I)) |
fa2eb9ac MK |
1720 | (progn |
1721 | (beep) | |
1722 | (if (y-or-n-p "This session is marked as hidden, unmark? ") | |
1723 | (progn | |
1724 | (ediff-set-session-status info nil) | |
328b4b70 | 1725 | (ediff-update-meta-buffer meta-buf nil session-number)) |
fa2eb9ac MK |
1726 | (error "Aborted")))) |
1727 | ||
e756eb9f | 1728 | (ediff-with-current-buffer meta-buf |
92c51e07 MK |
1729 | (setq merge-autostore-dir |
1730 | (ediff-get-group-merge-autostore-dir ediff-meta-list)) | |
fa2eb9ac MK |
1731 | (goto-char pos) ; if the user clicked on session--move point there |
1732 | ;; First handle sessions involving directories (which are themselves | |
1733 | ;; session groups) | |
1734 | ;; After that handle individual sessions | |
bd698e98 | 1735 | (cond ((ediff-meta-session-p info) |
fa2eb9ac MK |
1736 | ;; do ediff/ediff-merge on subdirectories |
1737 | (if (ediff-buffer-live-p session-buf) | |
1738 | (ediff-show-meta-buffer session-buf) | |
81ef8960 MK |
1739 | (setq regexp |
1740 | (read-string | |
1741 | (if (stringp default-regexp) | |
1742 | (format | |
1743 | "Filter through regular expression (default %s): " | |
1744 | default-regexp) | |
1745 | "Filter through regular expression: ") | |
1746 | nil | |
1747 | 'ediff-filtering-regexp-history | |
1748 | (eval ediff-default-filtering-regexp))) | |
fa2eb9ac MK |
1749 | (ediff-directories-internal |
1750 | file1 file2 file3 regexp | |
1751 | ediff-session-action-function | |
6c83d99f | 1752 | ediff-metajob-name |
3af0304a | 1753 | ;; make it update (car info) after startup |
6c83d99f | 1754 | `(list (lambda () |
086171bf MK |
1755 | ;; child session group should know its parent |
1756 | (setq ediff-parent-meta-buffer | |
1757 | (quote ,ediff-meta-buffer) | |
1758 | ediff-meta-session-number | |
1759 | ,session-number) | |
1760 | ;; and parent will know its child | |
1761 | (setcar (quote ,info) ediff-meta-buffer)))))) | |
fa2eb9ac MK |
1762 | |
1763 | ;; Do ediff-revision on a subdirectory | |
bbe6126c MK |
1764 | ((and (ediff-one-filegroup-metajob) |
1765 | (ediff-revision-metajob) | |
1766 | (file-directory-p file1)) | |
fa2eb9ac MK |
1767 | (if (ediff-buffer-live-p session-buf) |
1768 | (ediff-show-meta-buffer session-buf) | |
6c83d99f | 1769 | (setq regexp (read-string "Filter through regular expression: " |
fa2eb9ac MK |
1770 | nil 'ediff-filtering-regexp-history)) |
1771 | (ediff-directory-revisions-internal | |
1772 | file1 regexp | |
1773 | ediff-session-action-function ediff-metajob-name | |
3af0304a | 1774 | ;; make it update (car info) after startup |
6c83d99f | 1775 | `(list (lambda () |
086171bf MK |
1776 | ;; child session group should know its parent and |
1777 | ;; its number | |
1778 | (setq ediff-parent-meta-buffer | |
1779 | (quote ,ediff-meta-buffer) | |
1780 | ediff-meta-session-number | |
1781 | ,session-number) | |
1782 | ;; and parent will know its child | |
1783 | (setcar (quote ,info) ediff-meta-buffer)))))) | |
fa2eb9ac MK |
1784 | |
1785 | ;; From here on---only individual session handlers | |
1786 | ||
bbe6126c | 1787 | ;; handle an individual session with a live control buffer |
fa2eb9ac | 1788 | ((ediff-buffer-live-p session-buf) |
e756eb9f | 1789 | (ediff-with-current-buffer session-buf |
fa2eb9ac MK |
1790 | (setq ediff-mouse-pixel-position (mouse-pixel-position)) |
1791 | (ediff-recenter 'no-rehighlight))) | |
1792 | ||
1793 | ((ediff-problematic-session-p info) | |
1794 | (beep) | |
1795 | (if (y-or-n-p | |
3af0304a | 1796 | "This session has no ancestor. Merge without the ancestor? ") |
fa2eb9ac MK |
1797 | (ediff-merge-files |
1798 | file1 file2 | |
6c83d99f JB |
1799 | ;; provide startup hooks |
1800 | `(list (lambda () | |
3af0304a MK |
1801 | (add-hook |
1802 | 'ediff-after-quit-hook-internal | |
1803 | (lambda () | |
086171bf | 1804 | (if (ediff-buffer-live-p ,(current-buffer)) |
3af0304a | 1805 | (ediff-show-meta-buffer |
086171bf | 1806 | ,(current-buffer) ,session-number))) |
3af0304a | 1807 | nil 'local) |
086171bf | 1808 | (setq ediff-meta-buffer ,(current-buffer) |
328b4b70 | 1809 | ediff-meta-session-number |
086171bf | 1810 | ,session-number) |
92c51e07 | 1811 | (setq ediff-merge-store-file |
086171bf MK |
1812 | ,(if (ediff-nonempty-string-p |
1813 | merge-autostore-dir) | |
1814 | (concat | |
1815 | merge-autostore-dir | |
6de3983f | 1816 | ediff-merge-filename-prefix |
086171bf | 1817 | (file-name-nondirectory file1)) |
3af0304a | 1818 | )) |
92c51e07 MK |
1819 | ;; make ediff-startup pass |
1820 | ;; ediff-control-buffer back to the meta | |
1821 | ;; level; see below | |
fa2eb9ac | 1822 | (setcar |
086171bf | 1823 | (quote ,info) ediff-control-buffer)))) |
fa2eb9ac | 1824 | (error "Aborted"))) |
bbe6126c | 1825 | ((ediff-one-filegroup-metajob) ; needs 1 file arg |
fa2eb9ac MK |
1826 | (funcall ediff-session-action-function |
1827 | file1 | |
6c83d99f JB |
1828 | ;; provide startup hooks |
1829 | `(list (lambda () | |
086171bf MK |
1830 | (add-hook |
1831 | 'ediff-after-quit-hook-internal | |
1832 | (lambda () | |
1833 | (if (ediff-buffer-live-p | |
1834 | ,(current-buffer)) | |
1835 | (ediff-show-meta-buffer | |
1836 | ,(current-buffer) | |
1837 | ,session-number))) | |
1838 | nil 'local) | |
1839 | (setq ediff-meta-buffer ,(current-buffer) | |
1840 | ediff-meta-session-number | |
1841 | ,session-number) | |
1842 | (setq ediff-merge-store-file | |
1843 | ,(if (ediff-nonempty-string-p | |
1844 | merge-autostore-dir) | |
1845 | (concat | |
1846 | merge-autostore-dir | |
6de3983f | 1847 | ediff-merge-filename-prefix |
086171bf MK |
1848 | (file-name-nondirectory file1))) ) |
1849 | ;; make ediff-startup pass | |
1850 | ;; ediff-control-buffer back to the meta | |
1851 | ;; level; see below | |
1852 | (setcar | |
1853 | (quote ,info) ediff-control-buffer))))) | |
fa2eb9ac MK |
1854 | ((not (ediff-metajob3)) ; need 2 file args |
1855 | (funcall ediff-session-action-function | |
1856 | file1 file2 | |
6c83d99f JB |
1857 | ;; provide startup hooks |
1858 | `(list (lambda () | |
086171bf MK |
1859 | (add-hook |
1860 | 'ediff-after-quit-hook-internal | |
1861 | (lambda () | |
1862 | (if (ediff-buffer-live-p | |
1863 | ,(current-buffer)) | |
1864 | (ediff-show-meta-buffer | |
1865 | ,(current-buffer) | |
1866 | ,session-number))) | |
1867 | nil 'local) | |
1868 | (setq ediff-meta-buffer ,(current-buffer) | |
1869 | ediff-meta-session-number | |
1870 | ,session-number) | |
1871 | (setq ediff-merge-store-file | |
1872 | ,(if (ediff-nonempty-string-p | |
1873 | merge-autostore-dir) | |
1874 | (concat | |
1875 | merge-autostore-dir | |
6de3983f | 1876 | ediff-merge-filename-prefix |
086171bf MK |
1877 | (file-name-nondirectory file1))) ) |
1878 | ;; make ediff-startup pass | |
1879 | ;; ediff-control-buffer back to the meta | |
1880 | ;; level; see below | |
1881 | (setcar | |
1882 | (quote ,info) ediff-control-buffer))))) | |
fa2eb9ac MK |
1883 | ((ediff-metajob3) ; need 3 file args |
1884 | (funcall ediff-session-action-function | |
1885 | file1 file2 file3 | |
6c83d99f JB |
1886 | ;; arrange startup hooks |
1887 | `(list (lambda () | |
086171bf MK |
1888 | (add-hook |
1889 | 'ediff-after-quit-hook-internal | |
1890 | (lambda () | |
1891 | (if (ediff-buffer-live-p | |
1892 | ,(current-buffer)) | |
1893 | (ediff-show-meta-buffer | |
1894 | ,(current-buffer) | |
1895 | ,session-number))) | |
1896 | nil 'local) | |
1897 | (setq ediff-merge-store-file | |
1898 | ,(if (ediff-nonempty-string-p | |
1899 | merge-autostore-dir) | |
1900 | (concat | |
1901 | merge-autostore-dir | |
6de3983f | 1902 | ediff-merge-filename-prefix |
086171bf MK |
1903 | (file-name-nondirectory file1))) ) |
1904 | (setq ediff-meta-buffer , (current-buffer) | |
1905 | ediff-meta-session-number | |
1906 | ,session-number) | |
1907 | ;; this arranges that ediff-startup will pass | |
1908 | ;; the value of ediff-control-buffer back to | |
1909 | ;; the meta level, to the record in the meta | |
1910 | ;; list containing the information about the | |
1911 | ;; session associated with that | |
1912 | ;; ediff-control-buffer | |
1913 | (setcar | |
1914 | (quote ,info) ediff-control-buffer))))) | |
fa2eb9ac MK |
1915 | ) ; cond |
1916 | ) ; eval in meta-buf | |
1917 | )) | |
1918 | ||
1919 | (defun ediff-registry-action () | |
1920 | "Switch to a selected session." | |
1921 | (interactive) | |
1922 | (let* ((pos (ediff-event-point last-command-event)) | |
1923 | (buf (ediff-event-buffer last-command-event)) | |
1924 | (ctl-buf (ediff-get-meta-info buf pos))) | |
1925 | ||
1926 | (if (ediff-buffer-live-p ctl-buf) | |
1927 | ;; check if this is ediff-control-buffer or ediff-meta-buffer | |
e756eb9f | 1928 | (if (ediff-with-current-buffer ctl-buf |
fa2eb9ac MK |
1929 | (eq (key-binding "q") 'ediff-quit-meta-buffer)) |
1930 | ;; it's a meta-buffer -- last action should just display it | |
328b4b70 | 1931 | (ediff-show-meta-buffer ctl-buf t) |
fa2eb9ac | 1932 | ;; it's a session buffer -- invoke go back to session |
e756eb9f | 1933 | (ediff-with-current-buffer ctl-buf |
fa2eb9ac MK |
1934 | (setq ediff-mouse-pixel-position (mouse-pixel-position)) |
1935 | (ediff-recenter 'no-rehighlight))) | |
1936 | (beep) | |
1937 | (message "You've selected a stale session --- try again") | |
1938 | (ediff-update-registry)) | |
e756eb9f | 1939 | (ediff-with-current-buffer buf |
fa2eb9ac MK |
1940 | (goto-char pos)) |
1941 | )) | |
1942 | ||
1943 | ||
328b4b70 MK |
1944 | ;; If session number is t, means don't update meta buffer |
1945 | (defun ediff-show-meta-buffer (&optional meta-buf session-number) | |
fa2eb9ac MK |
1946 | "Show the session group buffer." |
1947 | (interactive) | |
657f9cb8 | 1948 | (run-hooks 'ediff-before-directory-setup-hooks) |
fa2eb9ac MK |
1949 | (let (wind frame silent) |
1950 | (if meta-buf (setq silent t)) | |
1951 | ||
1952 | (setq meta-buf (or meta-buf ediff-meta-buffer)) | |
1953 | (cond ((not (bufferp meta-buf)) | |
1954 | (error "This Ediff session is not part of a session group")) | |
1955 | ((not (ediff-buffer-live-p meta-buf)) | |
1956 | (error | |
1957 | "Can't find this session's group panel -- session itself is ok"))) | |
1958 | ||
328b4b70 MK |
1959 | (cond ((numberp session-number) |
1960 | (ediff-update-meta-buffer meta-buf nil session-number)) | |
1961 | ;; if session-number is t, don't update | |
1962 | (session-number) | |
1963 | (t (ediff-cleanup-meta-buffer meta-buf))) | |
1964 | ||
e756eb9f | 1965 | (ediff-with-current-buffer meta-buf |
fa2eb9ac MK |
1966 | (save-excursion |
1967 | (cond ((setq wind (ediff-get-visible-buffer-window meta-buf)) | |
1968 | (or silent | |
1969 | (message | |
1970 | "Already showing the group panel for this session")) | |
1971 | (set-window-buffer wind meta-buf) | |
1972 | (select-window wind)) | |
1973 | ((window-live-p (setq wind ediff-window-C)) ;in merge--merge buf | |
1974 | (set-window-buffer ediff-window-C meta-buf) | |
1975 | (select-window wind)) | |
1976 | ((window-live-p (setq wind ediff-window-A)) | |
1977 | (set-window-buffer ediff-window-A meta-buf) | |
1978 | (select-window wind)) | |
1979 | ((window-live-p (setq wind ediff-window-B)) | |
1980 | (set-window-buffer ediff-window-B meta-buf) | |
1981 | (select-window wind)) | |
1982 | ((and | |
1983 | (setq wind | |
1984 | (ediff-get-visible-buffer-window ediff-registry-buffer)) | |
1985 | (ediff-window-display-p)) | |
1986 | (select-window wind) | |
1987 | (other-window 1) | |
1988 | (set-window-buffer (selected-window) meta-buf)) | |
1989 | (t (ediff-skip-unsuitable-frames 'ok-unsplittable) | |
1990 | (set-window-buffer (selected-window) meta-buf))) | |
1991 | )) | |
4ae69eac | 1992 | (if (and (ediff-window-display-p) |
6c83d99f | 1993 | (window-live-p |
4ae69eac | 1994 | (setq wind (ediff-get-visible-buffer-window meta-buf)))) |
fa2eb9ac | 1995 | (progn |
4ae69eac | 1996 | (setq frame (window-frame wind)) |
fa2eb9ac MK |
1997 | (raise-frame frame) |
1998 | (ediff-reset-mouse frame))) | |
50a07e18 MK |
1999 | (sit-for 0) ; sometimes needed to synch the display and ensure that the |
2000 | ; point ends up after the just completed session | |
fa2eb9ac MK |
2001 | (run-hooks 'ediff-show-session-group-hook) |
2002 | )) | |
2003 | ||
328b4b70 MK |
2004 | (defun ediff-show-current-session-meta-buffer () |
2005 | (interactive) | |
2006 | (ediff-show-meta-buffer nil ediff-meta-session-number)) | |
2007 | ||
fa2eb9ac MK |
2008 | (defun ediff-show-meta-buff-from-registry () |
2009 | "Display the session group buffer for a selected session group." | |
2010 | (interactive) | |
2011 | (let* ((pos (ediff-event-point last-command-event)) | |
2012 | (meta-buf (ediff-event-buffer last-command-event)) | |
2013 | (info (ediff-get-meta-info meta-buf pos)) | |
2014 | (meta-or-session-buf info)) | |
e756eb9f | 2015 | (ediff-with-current-buffer meta-or-session-buf |
328b4b70 | 2016 | (ediff-show-meta-buffer nil t)))) |
fa2eb9ac MK |
2017 | |
2018 | ;;;###autoload | |
2019 | (defun ediff-show-registry () | |
2020 | "Display Ediff's registry." | |
2021 | (interactive) | |
2022 | (ediff-update-registry) | |
2023 | (if (not (ediff-buffer-live-p ediff-registry-buffer)) | |
2024 | (error "No active Ediff sessions or corrupted session registry")) | |
2025 | (let (wind frame) | |
2026 | ;; for some reason, point moves in ediff-registry-buffer, so we preserve it | |
4ae69eac | 2027 | ;; explicitly |
e756eb9f | 2028 | (ediff-with-current-buffer ediff-registry-buffer |
fa2eb9ac MK |
2029 | (save-excursion |
2030 | (cond ((setq wind | |
2031 | (ediff-get-visible-buffer-window ediff-registry-buffer)) | |
2032 | (message "Already showing the registry") | |
2033 | (set-window-buffer wind ediff-registry-buffer) | |
2034 | (select-window wind)) | |
2035 | ((window-live-p ediff-window-C) | |
2036 | (set-window-buffer ediff-window-C ediff-registry-buffer) | |
2037 | (select-window ediff-window-C)) | |
2038 | ((window-live-p ediff-window-A) | |
2039 | (set-window-buffer ediff-window-A ediff-registry-buffer) | |
2040 | (select-window ediff-window-A)) | |
2041 | ((window-live-p ediff-window-B) | |
2042 | (set-window-buffer ediff-window-B ediff-registry-buffer) | |
2043 | (select-window ediff-window-B)) | |
2044 | ((and (setq wind | |
2045 | (ediff-get-visible-buffer-window ediff-meta-buffer)) | |
2046 | (ediff-window-display-p)) | |
2047 | (select-window wind) | |
2048 | (other-window 1) | |
2049 | (set-window-buffer (selected-window) ediff-registry-buffer)) | |
2050 | (t (ediff-skip-unsuitable-frames 'ok-unsplittable) | |
2051 | (set-window-buffer (selected-window) ediff-registry-buffer))) | |
2052 | )) | |
2053 | (if (ediff-window-display-p) | |
2054 | (progn | |
6c83d99f | 2055 | (setq frame |
fa2eb9ac MK |
2056 | (window-frame |
2057 | (ediff-get-visible-buffer-window ediff-registry-buffer))) | |
2058 | (raise-frame frame) | |
2059 | (ediff-reset-mouse frame))) | |
2060 | (run-hooks 'ediff-show-registry-hook) | |
2061 | )) | |
2062 | ||
2063 | ;;;###autoload | |
2064 | (defalias 'eregistry 'ediff-show-registry) | |
2065 | ||
3af0304a | 2066 | ;; If meta-buf doesn't exist, it is created. In that case, id doesn't have a |
fa2eb9ac MK |
2067 | ;; parent meta-buf |
2068 | ;; Check if META-BUF exists before calling this function | |
328b4b70 | 2069 | ;; Optional MUST-REDRAW, if non-nil, would force redrawal of the whole meta |
3af0304a | 2070 | ;; buffer. Otherwise, it will just go over the buffer and update activity marks |
328b4b70 MK |
2071 | ;; and session status. |
2072 | ;; SESSION-NUMBER, if specified, says which session caused the update. | |
2073 | (defun ediff-update-meta-buffer (meta-buf &optional must-redraw session-number) | |
2074 | (if (ediff-buffer-live-p meta-buf) | |
2075 | (ediff-with-current-buffer meta-buf | |
3af0304a MK |
2076 | (let (overl) |
2077 | (cond (must-redraw ; completely redraw the meta buffer | |
2078 | (funcall ediff-meta-redraw-function ediff-meta-list)) | |
2079 | ((numberp session-number) ; redraw only for the given session | |
2080 | (ediff-update-session-marker-in-dir-meta-buffer | |
2081 | session-number)) | |
2082 | (t ; update what changed only, but scan the entire meta buffer | |
2083 | (ediff-update-markers-in-dir-meta-buffer ediff-meta-list))) | |
2084 | (setq overl (ediff-get-meta-overlay-at-pos (point))) | |
2085 | ;; skip the invisible sessions | |
2086 | (while (and overl (ediff-overlay-get overl 'invisible)) | |
2087 | (ediff-next-meta-item1) | |
2088 | (setq overl (ediff-get-meta-overlay-at-pos (point)))) | |
2089 | )))) | |
fa2eb9ac MK |
2090 | |
2091 | (defun ediff-update-registry () | |
e756eb9f | 2092 | (ediff-with-current-buffer (current-buffer) |
fa2eb9ac MK |
2093 | (if (ediff-buffer-live-p ediff-registry-buffer) |
2094 | (ediff-redraw-registry-buffer) | |
6c83d99f | 2095 | (ediff-prepare-meta-buffer |
fa2eb9ac MK |
2096 | 'ediff-registry-action |
2097 | ediff-session-registry | |
2098 | "*Ediff Registry" | |
2099 | 'ediff-redraw-registry-buffer | |
2100 | 'ediff-registry)) | |
2101 | )) | |
2102 | ||
6c83d99f | 2103 | ;; If meta-buf exists, it is redrawn along with parent. |
92c51e07 | 2104 | ;; Otherwise, nothing happens. |
fa2eb9ac MK |
2105 | (defun ediff-cleanup-meta-buffer (meta-buffer) |
2106 | (if (ediff-buffer-live-p meta-buffer) | |
e756eb9f | 2107 | (ediff-with-current-buffer meta-buffer |
fa2eb9ac MK |
2108 | (ediff-update-meta-buffer meta-buffer) |
2109 | (if (ediff-buffer-live-p ediff-parent-meta-buffer) | |
328b4b70 MK |
2110 | (ediff-update-meta-buffer |
2111 | ediff-parent-meta-buffer nil ediff-meta-session-number))))) | |
fa2eb9ac | 2112 | |
328b4b70 | 2113 | ;; t if no session is in progress |
fa2eb9ac MK |
2114 | (defun ediff-safe-to-quit (meta-buffer) |
2115 | (if (ediff-buffer-live-p meta-buffer) | |
2116 | (let ((lis ediff-meta-list) | |
2117 | (cont t) | |
2118 | buffer-read-only) | |
328b4b70 | 2119 | ;;(ediff-update-meta-buffer meta-buffer) |
e756eb9f | 2120 | (ediff-with-current-buffer meta-buffer |
fa2eb9ac MK |
2121 | (setq lis (cdr lis)) ; discard the description part of meta-list |
2122 | (while (and cont lis) | |
2123 | (if (ediff-buffer-live-p | |
2124 | (ediff-get-group-buffer lis)) ; in progress | |
2125 | (setq cont nil)) | |
2126 | (setq lis (cdr lis))) | |
2127 | cont)))) | |
2128 | ||
2129 | (defun ediff-quit-meta-buffer () | |
92c51e07 | 2130 | "If the group has no active session, delete the meta buffer. |
fa2eb9ac MK |
2131 | If no session is in progress, ask to confirm before deleting meta buffer. |
2132 | Otherwise, bury the meta buffer. | |
2133 | If this is a session registry buffer then just bury it." | |
2134 | (interactive) | |
2135 | (let* ((buf (current-buffer)) | |
2136 | (dir-diffs-buffer ediff-dir-diffs-buffer) | |
2137 | (meta-diff-buffer ediff-meta-diff-buffer) | |
328b4b70 | 2138 | (session-number ediff-meta-session-number) |
fa2eb9ac MK |
2139 | (parent-buf ediff-parent-meta-buffer) |
2140 | (dont-show-registry (eq buf ediff-registry-buffer))) | |
2141 | (if dont-show-registry | |
2142 | (bury-buffer) | |
328b4b70 | 2143 | ;;(ediff-cleanup-meta-buffer buf) |
fa2eb9ac MK |
2144 | (cond ((and (ediff-safe-to-quit buf) |
2145 | (y-or-n-p "Quit this session group? ")) | |
92c51e07 | 2146 | (run-hooks 'ediff-quit-session-group-hook) |
bbe6126c | 2147 | (message "") |
fa2eb9ac MK |
2148 | (ediff-dispose-of-meta-buffer buf)) |
2149 | ((ediff-safe-to-quit buf) | |
2150 | (bury-buffer)) | |
2151 | (t | |
bbe6126c MK |
2152 | (error |
2153 | "This session group has active sessions---cannot exit"))) | |
328b4b70 | 2154 | (ediff-update-meta-buffer parent-buf nil session-number) |
fa2eb9ac MK |
2155 | (ediff-kill-buffer-carefully dir-diffs-buffer) |
2156 | (ediff-kill-buffer-carefully meta-diff-buffer) | |
2157 | (if (ediff-buffer-live-p parent-buf) | |
2158 | (progn | |
2159 | (setq dont-show-registry t) | |
328b4b70 | 2160 | (ediff-show-meta-buffer parent-buf session-number))) |
fa2eb9ac MK |
2161 | ) |
2162 | (or dont-show-registry | |
2163 | (ediff-show-registry)))) | |
2164 | ||
2165 | (defun ediff-dispose-of-meta-buffer (buf) | |
2166 | (setq ediff-session-registry (delq buf ediff-session-registry)) | |
e756eb9f | 2167 | (ediff-with-current-buffer buf |
fa2eb9ac MK |
2168 | (if (ediff-buffer-live-p ediff-dir-diffs-buffer) |
2169 | (kill-buffer ediff-dir-diffs-buffer))) | |
2170 | (kill-buffer buf)) | |
6c83d99f | 2171 | |
fa2eb9ac | 2172 | |
4ae69eac | 2173 | ;; Obtain information on a meta record where the user clicked or typed |
fa2eb9ac MK |
2174 | ;; BUF is the buffer where this happened and POINT is the position |
2175 | ;; If optional NOERROR arg is given, don't report error and return nil if no | |
2176 | ;; meta info is found on line. | |
2177 | (defun ediff-get-meta-info (buf point &optional noerror) | |
2178 | (let (result olist tmp) | |
2179 | (if (and point (ediff-buffer-live-p buf)) | |
e756eb9f | 2180 | (ediff-with-current-buffer buf |
50a07e18 MK |
2181 | (ediff-cond-compile-for-xemacs-or-emacs |
2182 | (setq result ; xemacs | |
2183 | (if (setq tmp (extent-at point buf 'ediff-meta-info)) | |
2184 | (ediff-overlay-get tmp 'ediff-meta-info))) | |
2185 | (progn ; emacs | |
2186 | (setq olist (overlays-at point)) | |
2187 | (setq olist | |
2188 | (mapcar (lambda (elt) | |
2189 | (unless (overlay-get elt 'invisible) | |
2190 | (overlay-get elt 'ediff-meta-info))) | |
2191 | olist)) | |
2192 | (while (and olist (null (car olist))) | |
2193 | (setq olist (cdr olist))) | |
2194 | (setq result (car olist))) | |
2195 | ) | |
2196 | )) | |
fa2eb9ac MK |
2197 | (if result |
2198 | result | |
2199 | (if noerror | |
2200 | nil | |
2201 | (ediff-update-registry) | |
2202 | (error "No session info in this line"))))) | |
2203 | ||
328b4b70 MK |
2204 | |
2205 | (defun ediff-get-meta-overlay-at-pos (point) | |
50a07e18 MK |
2206 | (ediff-cond-compile-for-xemacs-or-emacs |
2207 | (extent-at point (current-buffer) 'ediff-meta-info) ; xemacs | |
2208 | ;; emacs | |
2209 | (let* ((overl-list (overlays-at point)) | |
2210 | (overl (car overl-list))) | |
2211 | (while (and overl (null (overlay-get overl 'ediff-meta-info))) | |
2212 | (setq overl-list (cdr overl-list) | |
2213 | overl (car overl-list))) | |
2214 | overl) | |
2215 | ) | |
2216 | ) | |
328b4b70 | 2217 | |
c004db97 MK |
2218 | (defsubst ediff-get-session-number-at-pos (point &optional meta-buffer) |
2219 | (setq meta-buffer (if (ediff-buffer-live-p meta-buffer) | |
2220 | meta-buffer | |
2221 | (current-buffer))) | |
2222 | (ediff-with-current-buffer meta-buffer | |
2223 | (ediff-overlay-get | |
2224 | (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number))) | |
328b4b70 MK |
2225 | |
2226 | ||
2227 | ;; Return location of the next meta overlay after point | |
fa2eb9ac | 2228 | (defun ediff-next-meta-overlay-start (point) |
bbe6126c MK |
2229 | (if (eobp) |
2230 | (goto-char (point-min)) | |
328b4b70 | 2231 | (let ((overl (ediff-get-meta-overlay-at-pos point))) |
50a07e18 MK |
2232 | (ediff-cond-compile-for-xemacs-or-emacs |
2233 | (progn ; xemacs | |
2234 | (if overl | |
2235 | (setq overl (next-extent overl)) | |
2236 | (setq overl (next-extent (current-buffer)))) | |
2237 | (if overl | |
2238 | (extent-start-position overl) | |
2239 | (point-max))) | |
2240 | ;; emacs | |
2241 | (if overl | |
2242 | ;; note: end of current overlay is the beginning of the next one | |
2243 | (overlay-end overl) | |
2244 | (next-overlay-change point)) | |
2245 | ) | |
2246 | ) | |
bbe6126c | 2247 | )) |
fa2eb9ac | 2248 | |
328b4b70 | 2249 | |
fa2eb9ac | 2250 | (defun ediff-previous-meta-overlay-start (point) |
bbe6126c MK |
2251 | (if (bobp) |
2252 | (goto-char (point-max)) | |
328b4b70 | 2253 | (let ((overl (ediff-get-meta-overlay-at-pos point))) |
50a07e18 MK |
2254 | (ediff-cond-compile-for-xemacs-or-emacs |
2255 | (progn | |
2256 | (if overl | |
2257 | (setq overl (previous-extent overl)) | |
2258 | (setq overl (previous-extent (current-buffer)))) | |
2259 | (if overl | |
2260 | (extent-start-position overl) | |
2261 | (point-min))) | |
2262 | (progn | |
2263 | (if overl (setq point (overlay-start overl))) | |
2264 | ;; to get to the beginning of prev overlay | |
2265 | (if (not (bobp)) | |
2266 | ;; trick to overcome an emacs bug--doesn't always find previous | |
2267 | ;; overlay change correctly | |
2268 | (setq point (1- point))) | |
2269 | (setq point (previous-overlay-change point)) | |
2270 | ;; If we are not over an overlay after subtracting 1, it means we are | |
2271 | ;; in the description area preceding session records. In this case, | |
2272 | ;; goto the top of the registry buffer. | |
2273 | (or (car (overlays-at point)) | |
2274 | (setq point (point-min))) | |
2275 | point) | |
2276 | ) | |
2277 | ))) | |
bbe6126c MK |
2278 | |
2279 | ;; this is the action invoked when the user selects a patch from the meta | |
2280 | ;; buffer. | |
2281 | (defun ediff-patch-file-form-meta (file &optional startup-hooks) | |
2282 | (let* ((pos (ediff-event-point last-command-event)) | |
2283 | (meta-buf (ediff-event-buffer last-command-event)) | |
2284 | ;; ediff-get-meta-info gives error if meta-buf or pos are invalid | |
2285 | (info (ediff-get-meta-info meta-buf pos)) | |
2286 | (meta-patchbuf ediff-meta-patchbufer) | |
2287 | session-buf beg-marker end-marker) | |
2288 | ||
2289 | (if (or (file-directory-p file) (string-match "/dev/null" file)) | |
2290 | (error "`%s' is not an ordinary file" (file-name-as-directory file))) | |
2291 | (setq session-buf (ediff-get-session-buffer info) | |
2292 | beg-marker (ediff-get-session-objB-name info) | |
2293 | end-marker (ediff-get-session-objC-name info)) | |
2294 | ||
2295 | (or (ediff-buffer-live-p session-buf) ; either an active patch session | |
2296 | (null session-buf) ; or it is a virgin session | |
2297 | (error | |
743a79af | 2298 | "Patch has already been applied to this file -- can't repeat!")) |
bbe6126c | 2299 | |
e756eb9f | 2300 | (ediff-with-current-buffer meta-patchbuf |
bbe6126c MK |
2301 | (save-restriction |
2302 | (widen) | |
2303 | (narrow-to-region beg-marker end-marker) | |
2304 | (ediff-patch-file-internal meta-patchbuf file startup-hooks))))) | |
2305 | ||
2306 | ||
3ec8facd KH |
2307 | (defun ediff-unmark-all-for-operation () |
2308 | "Unmark all sessions marked for operation." | |
2309 | (interactive) | |
3af0304a MK |
2310 | (let ((list (cdr ediff-meta-list)) |
2311 | elt) | |
3ec8facd KH |
2312 | (while (setq elt (car list)) |
2313 | (ediff-mark-session-for-operation elt 'unmark) | |
2314 | (setq list (cdr list)))) | |
2315 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) | |
2316 | ||
2317 | (defun ediff-unmark-all-for-hiding () | |
2318 | "Unmark all sessions marked for hiding." | |
2319 | (interactive) | |
3af0304a MK |
2320 | (let ((list (cdr ediff-meta-list)) |
2321 | elt) | |
3ec8facd KH |
2322 | (while (setq elt (car list)) |
2323 | (ediff-mark-session-for-hiding elt 'unmark) | |
2324 | (setq list (cdr list)))) | |
2325 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) | |
2326 | ||
2327 | ||
b9fe4732 MK |
2328 | ;; ACTION is ?h, ?m, ?=: to mark for hiding, mark for operation, or simply |
2329 | ;; indicate which are equal files | |
2330 | (defun ediff-meta-mark-equal-files (&optional action) | |
2331 | "Run through the session list and mark identical files. | |
2332 | This is used only for sessions that involve 2 or 3 files at the same time. | |
2333 | ACTION is an optional argument that can be ?h, ?m, ?=, to mark for hiding, mark | |
2334 | for operation, or simply indicate which are equal files. If it is nil, then | |
2335 | last-command-char is used to decide which action to take." | |
bbe6126c | 2336 | (interactive) |
b9fe4732 MK |
2337 | (if (null action) |
2338 | (setq action last-command-char)) | |
bbe6126c | 2339 | (let ((list (cdr ediff-meta-list)) |
3ec8facd | 2340 | marked1 marked2 marked3 |
bbe6126c | 2341 | fileinfo1 fileinfo2 fileinfo3 elt) |
3af0304a | 2342 | (message "Comparing files ...") |
bbe6126c MK |
2343 | (while (setq elt (car list)) |
2344 | (setq fileinfo1 (ediff-get-session-objA elt) | |
2345 | fileinfo2 (ediff-get-session-objB elt) | |
2346 | fileinfo3 (ediff-get-session-objC elt)) | |
2347 | (ediff-set-file-eqstatus fileinfo1 nil) | |
2348 | (ediff-set-file-eqstatus fileinfo2 nil) | |
2349 | (ediff-set-file-eqstatus fileinfo3 nil) | |
2350 | ||
3ec8facd KH |
2351 | (setq marked1 t |
2352 | marked2 t | |
2353 | marked3 t) | |
2354 | (or (ediff-mark-if-equal fileinfo1 fileinfo2) | |
2355 | (setq marked1 nil)) | |
bbe6126c MK |
2356 | (if (ediff-metajob3) |
2357 | (progn | |
3ec8facd KH |
2358 | (or (ediff-mark-if-equal fileinfo1 fileinfo3) |
2359 | (setq marked2 nil)) | |
2360 | (or (ediff-mark-if-equal fileinfo2 fileinfo3) | |
2361 | (setq marked3 nil)))) | |
2362 | (if (and marked1 marked2 marked3) | |
b9fe4732 | 2363 | (cond ((eq action ?h) |
3ec8facd | 2364 | (ediff-mark-session-for-hiding elt 'mark)) |
b9fe4732 | 2365 | ((eq action ?m) |
3ec8facd KH |
2366 | (ediff-mark-session-for-operation elt 'mark)) |
2367 | )) | |
3af0304a MK |
2368 | (setq list (cdr list))) |
2369 | (message "Comparing files ... Done")) | |
17561e4f | 2370 | (setq ediff-recurse-to-subdirectories nil) |
328b4b70 | 2371 | (ediff-update-meta-buffer (current-buffer) 'must-redraw)) |
bbe6126c MK |
2372 | |
2373 | ;; mark files 1 and 2 as equal, if they are. | |
3ec8facd | 2374 | ;; returns t, if something was marked |
bbe6126c | 2375 | (defun ediff-mark-if-equal (fileinfo1 fileinfo2) |
328b4b70 MK |
2376 | (let ((f1 (car fileinfo1)) |
2377 | (f2 (car fileinfo2))) | |
17561e4f MK |
2378 | (if (and (stringp f1) (stringp f2) (ediff-same-contents f1 f2)) |
2379 | (progn | |
2380 | (ediff-set-file-eqstatus fileinfo1 t) | |
2381 | (ediff-set-file-eqstatus fileinfo2 t) | |
2382 | )) | |
3ec8facd | 2383 | )) |
bbe6126c | 2384 | |
fa2eb9ac MK |
2385 | |
2386 | ||
2387 | ;;; Local Variables: | |
2388 | ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun) | |
e756eb9f MK |
2389 | ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1) |
2390 | ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) | |
fa2eb9ac MK |
2391 | ;;; End: |
2392 | ||
ab5796a9 | 2393 | ;;; arch-tag: c8a76898-f96f-4d9c-be9d-129134017188 |
eb4daa01 | 2394 | ;;; ediff-mult.el ends here |