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