|
0
|
1 ;;; emerge.el --- merge diffs under Emacs control
|
|
|
2
|
|
|
3 ;;; The author has placed this file in the public domain.
|
|
|
4
|
|
|
5 ;; Author: Dale R. Worley <drw@math.mit.edu>
|
|
|
6 ;; Version: 5xemacs
|
|
|
7 ;; Keywords: unix, tools
|
|
|
8
|
|
|
9 ;; This software was created by Dale R. Worley and is
|
|
|
10 ;; distributed free of charge. It is placed in the public domain and
|
|
|
11 ;; permission is granted to anyone to use, duplicate, modify and redistribute
|
|
|
12 ;; it provided that this notice is attached.
|
|
|
13
|
|
|
14 ;; Dale R. Worley provides absolutely NO WARRANTY OF ANY KIND
|
|
|
15 ;; with respect to this software. The entire risk as to the quality and
|
|
|
16 ;; performance of this software is with the user. IN NO EVENT WILL DALE
|
|
|
17 ;; R. WORLEY BE LIABLE TO ANYONE FOR ANY DAMAGES ARISING OUT THE
|
|
|
18 ;; USE OF THIS SOFTWARE, INCLUDING, WITHOUT LIMITATION, DAMAGES RESULTING FROM
|
|
|
19 ;; LOST DATA OR LOST PROFITS, OR FOR ANY SPECIAL, INCIDENTAL OR CONSEQUENTIAL
|
|
|
20 ;; DAMAGES.
|
|
|
21
|
|
|
22 ;;; Synched up with: FSF 19.30.
|
|
|
23
|
|
|
24 ;; LCD Archive Entry:
|
|
|
25 ;; emerge|Dale R. Worley|drw@math.mit.edu
|
|
|
26 ;; |File merge
|
|
|
27 ;; |92-12-11|version 5 gamma|~/packages/emerge.el.Z
|
|
|
28
|
|
|
29 ;;; Code
|
|
|
30
|
|
|
31 (defmacro emerge-eval-in-buffer (buffer &rest forms)
|
|
|
32 "Macro to switch to BUFFER, evaluate FORMS, returns to original buffer.
|
|
|
33 Differs from `save-excursion' in that it doesn't save the point and mark."
|
|
|
34 (` (let ((StartBuffer (current-buffer)))
|
|
|
35 (unwind-protect
|
|
|
36 (progn
|
|
|
37 (set-buffer (, buffer))
|
|
|
38 (,@ forms))
|
|
|
39 (set-buffer StartBuffer)))))
|
|
|
40
|
|
|
41 (defconst emerge-xemacs-p (not (not (string-match "XEmacs" emacs-version)))
|
|
|
42 "Non-nil if this is XEmacs. Don't alter manually, because it also
|
|
|
43 turns on work-arounds for bugs.")
|
|
|
44
|
|
|
45 (defmacro emerge-defvar-local (var value doc)
|
|
|
46 "Defines SYMBOL as an advertised variable.
|
|
|
47 Performs a defvar, then executes `make-variable-buffer-local' on
|
|
|
48 the variable. Also sets the `preserved' property, so that
|
|
|
49 `kill-all-local-variables' (called by major-mode setting commands)
|
|
|
50 won't destroy Emerge control variables."
|
|
|
51 (` (progn
|
|
|
52 (defvar (, var) (, value) (, doc))
|
|
|
53 (make-variable-buffer-local '(, var))
|
|
|
54 (put '(, var)
|
|
|
55 ;; This "if" can't be optimized by having "(, )" wrapped arount it,
|
|
|
56 ;; because byte-compilation will then try to evaluate it while
|
|
|
57 ;; macro-expanding the uses of emerge-defvar-local, and
|
|
|
58 ;; emerge-xemacs-p is not defined at that time.
|
|
|
59 (if emerge-xemacs-p 'permanent-local 'preserved)
|
|
|
60 t))))
|
|
|
61
|
|
|
62 ;; Add entries to minor-mode-alist so that emerge modes show correctly
|
|
|
63 (defvar emerge-minor-modes-list '((emerge-mode " Emerge")
|
|
|
64 (emerge-fast-mode " F")
|
|
|
65 (emerge-edit-mode " E")
|
|
|
66 (emerge-auto-advance " A")
|
|
|
67 (emerge-skip-prefers " S")))
|
|
|
68 (if (not (assq 'emerge-mode minor-mode-alist))
|
|
|
69 (setq minor-mode-alist (append emerge-minor-modes-list
|
|
|
70 minor-mode-alist)))
|
|
|
71
|
|
|
72 ;; We need to define this function so describe-mode can describe Emerge mode.
|
|
|
73 (defun emerge-mode ()
|
|
|
74 "Emerge mode is used by the Emerge file-merging package.
|
|
|
75 It is entered only through one of the functions:
|
|
|
76 `emerge-files'
|
|
|
77 `emerge-files-with-ancestor'
|
|
|
78 `emerge-buffers'
|
|
|
79 `emerge-buffers-with-ancestor'
|
|
|
80 `emerge-files-command'
|
|
|
81 `emerge-files-with-ancestor-command'
|
|
|
82 `emerge-files-remote'
|
|
|
83 `emerge-files-with-ancestor-remote'
|
|
|
84
|
|
|
85 Commands:
|
|
|
86 \\{emerge-basic-keymap}
|
|
|
87 Commands must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode,
|
|
|
88 but can be invoked directly in `fast' mode.")
|
|
|
89
|
|
|
90 (defvar emerge-version "5xemacs"
|
|
|
91 "The version of Emerge.")
|
|
|
92
|
|
|
93 (defun emerge-version ()
|
|
|
94 "Return string describing the version of Emerge.
|
|
|
95 When called interactively, displays the version."
|
|
|
96 (interactive)
|
|
|
97 (if (interactive-p)
|
|
|
98 (message "Emerge version %s" (emerge-version))
|
|
|
99 emerge-version))
|
|
|
100
|
|
|
101 ;;; Emerge configuration variables
|
|
|
102
|
|
|
103 ;; Commands that produce difference files
|
|
|
104 ;; All that can be configured is the name of the programs to execute
|
|
|
105 ;; (emerge-diff-program and emerge-diff3-program) and the options
|
|
|
106 ;; to be provided (emerge-diff-options). The order in which the file names
|
|
|
107 ;; are given is fixed.
|
|
|
108 ;; The file names are always expanded (see expand-file-name) before being
|
|
|
109 ;; passed to diff, thus they need not be invoked under a shell that
|
|
|
110 ;; understands `~'.
|
|
|
111 ;; The code which processes the diff/diff3 output depends on all the
|
|
|
112 ;; finicky details of their output, including the somewhat strange
|
|
|
113 ;; way they number lines of a file.
|
|
|
114 (defvar emerge-diff-program "diff"
|
|
|
115 "*Name of the program which compares two files.")
|
|
|
116 (defvar emerge-diff3-program "diff3"
|
|
|
117 "*Name of the program which compares three files.
|
|
|
118 Its arguments are the ancestor file and the two variant files.")
|
|
|
119 (defvar emerge-diff-options ""
|
|
|
120 "*Options to pass to `emerge-diff-program' and `emerge-diff3-program'.")
|
|
|
121 (defvar emerge-match-diff-line (let ((x "\\([0-9]+\\)\\(\\|,\\([0-9]+\\)\\)"))
|
|
|
122 (concat "^" x "\\([acd]\\)" x "$"))
|
|
|
123 "*Pattern to match lines produced by diff that describe differences.
|
|
|
124 This is as opposed to lines from the source files.")
|
|
|
125 (defvar emerge-diff-ok-lines-regexp
|
|
|
126 "^\\([0-9,]+[acd][0-9,]+$\\|[<>] \\|---\\)"
|
|
|
127 "*Regexp that matches normal output lines from `emerge-diff-program'.
|
|
|
128 Lines that do not match are assumed to be error messages.")
|
|
|
129 (defvar emerge-diff3-ok-lines-regexp
|
|
|
130 "^\\([1-3]:\\|====\\| \\)"
|
|
|
131 "*Regexp that matches normal output lines from `emerge-diff3-program'.
|
|
|
132 Lines that do not match are assumed to be error messages.")
|
|
|
133
|
|
|
134 (defvar emerge-rcs-ci-program "ci"
|
|
|
135 "*Name of the program that checks in RCS revisions.")
|
|
|
136 (defvar emerge-rcs-co-program "co"
|
|
|
137 "*Name of the program that checks out RCS revisions.")
|
|
|
138
|
|
|
139 (defvar emerge-process-local-variables nil
|
|
|
140 "*Non-nil if Emerge should process local-variables lists in merge buffers.
|
|
|
141 \(You can explicitly request processing the local-variables
|
|
|
142 by executing `(hack-local-variables)'.)")
|
|
|
143 (defvar emerge-execute-line-deletions nil
|
|
|
144 "*If non-nil: `emerge-execute-line' makes no output if an input was deleted.
|
|
|
145 It concludes that an input version has been deleted when an ancestor entry
|
|
|
146 is present, only one A or B entry is present, and an output entry is present.
|
|
|
147 If nil: In such circumstances, the A or B file that is present will be
|
|
|
148 copied to the designated output file.")
|
|
|
149
|
|
|
150 (defvar emerge-before-flag "vvvvvvvvvvvvvvvvvvvv\n"
|
|
|
151 "*Flag placed above the highlighted block of code. Must end with newline.
|
|
|
152 Must be set before Emerge is loaded, or emerge-new-flags must be run
|
|
|
153 after setting.")
|
|
|
154 (defvar emerge-after-flag "^^^^^^^^^^^^^^^^^^^^\n"
|
|
|
155 "*Flag placed below the highlighted block of code. Must end with newline.
|
|
|
156 Must be set before Emerge is loaded, or emerge-new-flags must be run
|
|
|
157 after setting.")
|
|
|
158
|
|
|
159 (defvar emerge-split-horizontally t
|
|
|
160 ;; XEmacs - even when this works, jwz hates it.
|
|
|
161 "*Flag to control whether emerge will split windows horizontally or not.
|
|
|
162 Nil means that windows will be split vertically.")
|
|
|
163
|
|
|
164 ;; Hook variables
|
|
|
165
|
|
|
166 (defvar emerge-startup-hook nil
|
|
|
167 "*Hook to run in the merge buffer after the merge has been set up.")
|
|
|
168 (defvar emerge-select-hook nil
|
|
|
169 "*Hook to run after a difference has been selected.
|
|
|
170 The variable `n' holds the (internal) number of the difference.")
|
|
|
171 (defvar emerge-unselect-hook nil
|
|
|
172 "*Hook to run after a difference has been unselected.
|
|
|
173 The variable `n' holds the (internal) number of the difference.")
|
|
|
174
|
|
|
175 ;; Variables to control the default directories of the arguments to
|
|
|
176 ;; Emerge commands.
|
|
|
177
|
|
|
178 (defvar emerge-default-last-directories nil
|
|
|
179 "*If nil, default dir for filenames in emerge is `default-directory'.
|
|
|
180 If non-nil, filenames complete in the directory of the last argument of the
|
|
|
181 same type to an `emerge-files...' command.")
|
|
|
182
|
|
|
183 (defvar emerge-last-dir-A nil
|
|
|
184 "Last directory for the first file of an `emerge-files...' command.")
|
|
|
185 (defvar emerge-last-dir-B nil
|
|
|
186 "Last directory for the second file of an `emerge-files...' command.")
|
|
|
187 (defvar emerge-last-dir-ancestor nil
|
|
|
188 "Last directory for the ancestor file of an `emerge-files...' command.")
|
|
|
189 (defvar emerge-last-dir-output nil
|
|
|
190 "Last directory for the output file of an `emerge-files...' command.")
|
|
|
191 (defvar emerge-last-revision-A nil
|
|
|
192 "Last RCS revision used for first file of an `emerge-revisions...' command.")
|
|
|
193 (defvar emerge-last-revision-B nil
|
|
|
194 "Last RCS revision used for second file of an `emerge-revisions...' command.")
|
|
|
195 (defvar emerge-last-revision-ancestor nil
|
|
|
196 "Last RCS revision used for ancestor file of an `emerge-revisions...' command.")
|
|
|
197
|
|
|
198 (defvar emerge-before-flag-length)
|
|
|
199 (defvar emerge-before-flag-lines)
|
|
|
200 (defvar emerge-before-flag-match)
|
|
|
201 (defvar emerge-after-flag-length)
|
|
|
202 (defvar emerge-after-flag-lines)
|
|
|
203 (defvar emerge-after-flag-match)
|
|
|
204 ;;(defvar emerge-diff-buffer)
|
|
|
205 ;;(defvar emerge-diff-error-buffer)
|
|
|
206 (defvar emerge-prefix-argument)
|
|
|
207 (defvar emerge-exit-func) ; was just exit-func, but fsf
|
|
|
208 ; renamed it and it's not used anywhere
|
|
|
209 (defvar emerge-globalized-difference-list)
|
|
|
210 (defvar emerge-globalized-number-of-differences)
|
|
|
211
|
|
|
212 (defvar A-begin)
|
|
|
213 (defvar A-end)
|
|
|
214 (defvar B-begin)
|
|
|
215 (defvar B-end)
|
|
|
216 (defvar merge-begin)
|
|
|
217 (defvar merge-end)
|
|
|
218 ;;(defvar diff)
|
|
|
219 (defvar diff-vector)
|
|
|
220 (defvar valid-diff)
|
|
|
221
|
|
|
222 ;; Set up the face to highlight the current difference
|
|
|
223 (if emerge-xemacs-p
|
|
|
224 (or (and (find-face 'emerge-highlight-face)
|
|
|
225 (face-differs-from-default-p 'emerge-highlight-face))
|
|
|
226 (copy-face 'bold-italic 'emerge-highlight-face)))
|
|
|
227
|
|
|
228 ;;(defvar emerge-mark-with-text (not emerge-xemacs-p))
|
|
|
229 ;; this doesn't work yet -jwz
|
|
|
230 ;; and probably never will now that there's ediff --stig
|
|
|
231 (defvar emerge-mark-with-text t)
|
|
|
232
|
|
|
233 ;; These function definitions need to be up here, because they are used
|
|
|
234 ;; during loading.
|
|
|
235 (defun emerge-new-flags ()
|
|
|
236 "Function to be called after `emerge-{before,after}-flag'.
|
|
|
237 This is called after these functions are changed to compute values that
|
|
|
238 depend on the flags."
|
|
|
239 (setq emerge-before-flag-length (length emerge-before-flag))
|
|
|
240 (setq emerge-before-flag-lines
|
|
|
241 (emerge-count-matches-string emerge-before-flag "\n"))
|
|
|
242 (setq emerge-before-flag-match (regexp-quote emerge-before-flag))
|
|
|
243 (setq emerge-after-flag-length (length emerge-after-flag))
|
|
|
244 (setq emerge-after-flag-lines
|
|
|
245 (emerge-count-matches-string emerge-after-flag "\n"))
|
|
|
246 (setq emerge-after-flag-match (regexp-quote emerge-after-flag)))
|
|
|
247
|
|
|
248 (defun emerge-count-matches-string (string regexp)
|
|
|
249 "Return the number of matches in STRING for REGEXP."
|
|
|
250 (let ((i 0)
|
|
|
251 (count 0))
|
|
|
252 (while (string-match regexp string i)
|
|
|
253 (setq count (1+ count))
|
|
|
254 (setq i (match-end 0)))
|
|
|
255 count))
|
|
|
256
|
|
|
257 ;; Calculate dependent variables
|
|
|
258 (emerge-new-flags)
|
|
|
259
|
|
|
260 (defvar emerge-min-visible-lines 3
|
|
|
261 "*Number of lines that we want to show above and below the flags when we are
|
|
|
262 displaying a difference.")
|
|
|
263
|
|
|
264 (defvar emerge-temp-file-prefix
|
|
|
265 (let ((env (or (getenv "TMPDIR")
|
|
|
266 (getenv "TMP")
|
|
|
267 (getenv "TEMP")))
|
|
|
268 d)
|
|
|
269 (setq d (if (and env (> (length env) 0))
|
|
|
270 env
|
|
|
271 "/tmp"))
|
|
|
272 (if (= (aref d (1- (length d))) ?/)
|
|
|
273 (setq d (substring d 0 -1)))
|
|
|
274 (concat d "/emerge"))
|
|
|
275 "*Prefix to put on Emerge temporary file names.
|
|
|
276 Do not start with `~/' or `~user-name/'.")
|
|
|
277
|
|
|
278 (defvar emerge-temp-file-mode 384 ; u=rw only
|
|
|
279 "*Mode for Emerge temporary files.")
|
|
|
280
|
|
|
281 (defvar emerge-combine-versions-template
|
|
|
282 "#ifdef NEW\n%b#else /* NEW */\n%a#endif /* NEW */\n"
|
|
|
283 "*Template for `emerge-combine-versions' to combine the two versions.
|
|
|
284 The template is inserted as a string, with the following interpolations:
|
|
|
285 %a the A version of the difference
|
|
|
286 %b the B version of the difference
|
|
|
287 %% the character `%'
|
|
|
288 Don't forget to end the template with a newline.
|
|
|
289 Note that this variable can be made local to a particular merge buffer by
|
|
|
290 giving a prefix argument to `emerge-set-combine-versions-template'.")
|
|
|
291
|
|
|
292 ;; Build keymaps
|
|
|
293
|
|
|
294 (defvar emerge-basic-keymap nil
|
|
|
295 "Keymap of Emerge commands.
|
|
|
296 Directly available in `fast' mode;
|
|
|
297 must be prefixed by \\<emerge-fast-keymap>\\[emerge-basic-keymap] in `edit' mode.")
|
|
|
298
|
|
|
299 (defvar emerge-fast-keymap nil
|
|
|
300 "Local keymap used in Emerge `fast' mode.
|
|
|
301 Makes Emerge commands directly available.")
|
|
|
302
|
|
|
303 (defvar emerge-command-prefix "\C-c"
|
|
|
304 "*Command prefix for Emerge commands in 'edit' mode.
|
|
|
305 Must be set before Emerge is loaded.")
|
|
|
306
|
|
|
307 ;; This function sets up the fixed keymaps. It is executed when the first
|
|
|
308 ;; Emerge is done to allow the user maximum time to set up the global keymap.
|
|
|
309 (defun emerge-setup-fixed-keymaps ()
|
|
|
310 ;; Set up the basic keymap
|
|
|
311 (setq emerge-basic-keymap (make-keymap))
|
|
|
312 (set-keymap-name emerge-basic-keymap 'emerge-basic-keymap)
|
|
|
313 (suppress-keymap emerge-basic-keymap) ; this sets 0..9 to digit-argument and
|
|
|
314 ; - to negative-argument
|
|
|
315 (define-key emerge-basic-keymap "p" 'emerge-previous-difference)
|
|
|
316 (define-key emerge-basic-keymap "n" 'emerge-next-difference)
|
|
|
317 (define-key emerge-basic-keymap "a" 'emerge-select-A)
|
|
|
318 (define-key emerge-basic-keymap "b" 'emerge-select-B)
|
|
|
319 (define-key emerge-basic-keymap "j" 'emerge-jump-to-difference)
|
|
|
320 (define-key emerge-basic-keymap "." 'emerge-find-difference)
|
|
|
321 (define-key emerge-basic-keymap "q" 'emerge-quit)
|
|
|
322 (define-key emerge-basic-keymap "\C-]" 'emerge-abort)
|
|
|
323 (define-key emerge-basic-keymap "f" 'emerge-fast-mode)
|
|
|
324 (define-key emerge-basic-keymap "e" 'emerge-edit-mode)
|
|
|
325 (define-key emerge-basic-keymap "s" nil)
|
|
|
326 (define-key emerge-basic-keymap "sa" 'emerge-auto-advance)
|
|
|
327 (define-key emerge-basic-keymap "ss" 'emerge-skip-prefers)
|
|
|
328 (define-key emerge-basic-keymap "l" 'emerge-recenter)
|
|
|
329 (define-key emerge-basic-keymap "d" nil)
|
|
|
330 (define-key emerge-basic-keymap "da" 'emerge-default-A)
|
|
|
331 (define-key emerge-basic-keymap "db" 'emerge-default-B)
|
|
|
332 (define-key emerge-basic-keymap "c" nil)
|
|
|
333 (define-key emerge-basic-keymap "ca" 'emerge-copy-as-kill-A)
|
|
|
334 (define-key emerge-basic-keymap "cb" 'emerge-copy-as-kill-B)
|
|
|
335 (define-key emerge-basic-keymap "i" nil)
|
|
|
336 (define-key emerge-basic-keymap "ia" 'emerge-insert-A)
|
|
|
337 (define-key emerge-basic-keymap "ib" 'emerge-insert-B)
|
|
|
338 (define-key emerge-basic-keymap "m" 'emerge-mark-difference)
|
|
|
339 (define-key emerge-basic-keymap "v" 'emerge-scroll-up)
|
|
|
340 (define-key emerge-basic-keymap "^" 'emerge-scroll-down)
|
|
|
341 (define-key emerge-basic-keymap "<" 'emerge-scroll-left)
|
|
|
342 (define-key emerge-basic-keymap ">" 'emerge-scroll-right)
|
|
|
343 (define-key emerge-basic-keymap "|" 'emerge-scroll-reset)
|
|
|
344 (define-key emerge-basic-keymap "x" nil)
|
|
|
345 (define-key emerge-basic-keymap "x1" 'emerge-one-line-window)
|
|
|
346 (define-key emerge-basic-keymap "xa" 'emerge-find-difference-A)
|
|
|
347 (define-key emerge-basic-keymap "xb" 'emerge-find-difference-B)
|
|
|
348 (define-key emerge-basic-keymap "xc" 'emerge-combine-versions)
|
|
|
349 (define-key emerge-basic-keymap "xC" 'emerge-combine-versions-register)
|
|
|
350 (define-key emerge-basic-keymap "xd" 'emerge-find-difference)
|
|
|
351 (define-key emerge-basic-keymap "xf" 'emerge-file-names)
|
|
|
352 (define-key emerge-basic-keymap "xj" 'emerge-join-differences)
|
|
|
353 (define-key emerge-basic-keymap "xl" 'emerge-line-numbers)
|
|
|
354 (define-key emerge-basic-keymap "xm" 'emerge-set-merge-mode)
|
|
|
355 (define-key emerge-basic-keymap "xs" 'emerge-split-difference)
|
|
|
356 (define-key emerge-basic-keymap "xt" 'emerge-trim-difference)
|
|
|
357 (define-key emerge-basic-keymap "xx" 'emerge-set-combine-versions-template)
|
|
|
358 ;; Allow emerge-basic-keymap to be referenced indirectly
|
|
|
359 (fset 'emerge-basic-keymap emerge-basic-keymap)
|
|
|
360 ;; Set up the fast mode keymap
|
|
|
361 (setq emerge-fast-keymap (make-sparse-keymap))
|
|
|
362 (set-keymap-parent emerge-fast-keymap emerge-basic-keymap)
|
|
|
363 (set-keymap-name emerge-fast-keymap 'emerge-fast-keymap)
|
|
|
364 ;; Allow prefixed commands to work in fast mode
|
|
|
365 (define-key emerge-fast-keymap emerge-command-prefix 'emerge-basic-keymap)
|
|
|
366 ;; Allow emerge-fast-keymap to be referenced indirectly
|
|
|
367 (fset 'emerge-fast-keymap emerge-fast-keymap)
|
|
|
368 ;; Suppress write-file and save-buffer
|
|
|
369 (substitute-key-definition 'write-file 'emerge-query-write-file
|
|
|
370 emerge-fast-keymap (current-global-map))
|
|
|
371 (substitute-key-definition 'save-buffer 'emerge-query-save-buffer
|
|
|
372 emerge-fast-keymap (current-global-map)))
|
|
|
373
|
|
|
374 ;;fsf (define-key emerge-basic-keymap [menu-bar] (make-sparse-keymap))
|
|
|
375 ;;fsf
|
|
|
376 ;;fsf (define-key emerge-fast-keymap [menu-bar options]
|
|
|
377 ;;fsf (cons "Options" emerge-options-menu))
|
|
|
378 ;;fsf (define-key emerge-fast-keymap [menu-bar merge]
|
|
|
379 ;;fsf (cons "Merge" emerge-merge-menu))
|
|
|
380 ;;fsf (define-key emerge-fast-keymap [menu-bar move]
|
|
|
381 ;;fsf (cons "Move" emerge-move-menu))
|
|
|
382 ;;fsf
|
|
|
383 ;;fsf (define-key emerge-move-menu [emerge-scroll-reset]
|
|
|
384 ;;fsf '("Scroll Reset" . emerge-scroll-reset))
|
|
|
385 ;;fsf (define-key emerge-move-menu [emerge-scroll-right]
|
|
|
386 ;;fsf '("Scroll Right" . emerge-scroll-right))
|
|
|
387 ;;fsf (define-key emerge-move-menu [emerge-scroll-left]
|
|
|
388 ;;fsf '("Scroll Left" . emerge-scroll-left))
|
|
|
389 ;;fsf (define-key emerge-move-menu [emerge-scroll-down]
|
|
|
390 ;;fsf '("Scroll Down" . emerge-scroll-down))
|
|
|
391 ;;fsf (define-key emerge-move-menu [emerge-scroll-up]
|
|
|
392 ;;fsf '("Scroll Up" . emerge-scroll-up))
|
|
|
393 ;;fsf (define-key emerge-move-menu [emerge-recenter]
|
|
|
394 ;;fsf '("Recenter" . emerge-recenter))
|
|
|
395 ;;fsf (define-key emerge-move-menu [emerge-mark-difference]
|
|
|
396 ;;fsf '("Mark Difference" . emerge-mark-difference))
|
|
|
397 ;;fsf (define-key emerge-move-menu [emerge-jump-to-difference]
|
|
|
398 ;;fsf '("Jump To Difference" . emerge-jump-to-difference))
|
|
|
399 ;;fsf (define-key emerge-move-menu [emerge-find-difference]
|
|
|
400 ;;fsf '("Find Difference" . emerge-find-difference))
|
|
|
401 ;;fsf (define-key emerge-move-menu [emerge-previous-difference]
|
|
|
402 ;;fsf '("Previous Difference" . emerge-previous-difference))
|
|
|
403 ;;fsf (define-key emerge-move-menu [emerge-next-difference]
|
|
|
404 ;;fsf '("Next Difference" . emerge-next-difference))
|
|
|
405 ;;fsf
|
|
|
406 ;;fsf
|
|
|
407 ;;fsf (define-key emerge-options-menu [emerge-one-line-window]
|
|
|
408 ;;fsf '("One Line Window" . emerge-one-line-window))
|
|
|
409 ;;fsf (define-key emerge-options-menu [emerge-set-merge-mode]
|
|
|
410 ;;fsf '("Set Merge Mode" . emerge-set-merge-mode))
|
|
|
411 ;;fsf (define-key emerge-options-menu [emerge-set-combine-template]
|
|
|
412 ;;fsf '("Set Combine Template..." . emerge-set-combine-template))
|
|
|
413 ;;fsf (define-key emerge-options-menu [emerge-default-B]
|
|
|
414 ;;fsf '("Default B" . emerge-default-B))
|
|
|
415 ;;fsf (define-key emerge-options-menu [emerge-default-A]
|
|
|
416 ;;fsf '("Default A" . emerge-default-A))
|
|
|
417 ;;fsf (define-key emerge-options-menu [emerge-skip-prefers]
|
|
|
418 ;;fsf '("Skip Prefers" . emerge-skip-prefers))
|
|
|
419 ;;fsf (define-key emerge-options-menu [emerge-auto-advance]
|
|
|
420 ;;fsf '("Auto Advance" . emerge-auto-advance))
|
|
|
421 ;;fsf (define-key emerge-options-menu [emerge-edit-mode]
|
|
|
422 ;;fsf '("Edit Mode" . emerge-edit-mode))
|
|
|
423 ;;fsf (define-key emerge-options-menu [emerge-fast-mode]
|
|
|
424 ;;fsf '("Fast Mode" . emerge-fast-mode))
|
|
|
425 ;;fsf
|
|
|
426 ;;fsf (define-key emerge-merge-menu [emerge-abort] '("Abort" . emerge-abort))
|
|
|
427 ;;fsf (define-key emerge-merge-menu [emerge-quit] '("Quit" . emerge-quit))
|
|
|
428 ;;fsf (define-key emerge-merge-menu [emerge-split-difference]
|
|
|
429 ;;fsf '("Split Difference" . emerge-split-difference))
|
|
|
430 ;;fsf (define-key emerge-merge-menu [emerge-join-differences]
|
|
|
431 ;;fsf '("Join Differences" . emerge-join-differences))
|
|
|
432 ;;fsf (define-key emerge-merge-menu [emerge-trim-difference]
|
|
|
433 ;;fsf '("Trim Difference" . emerge-trim-difference))
|
|
|
434 ;;fsf (define-key emerge-merge-menu [emerge-combine-versions]
|
|
|
435 ;;fsf '("Combine Versions" . emerge-combine-versions))
|
|
|
436 ;;fsf (define-key emerge-merge-menu [emerge-copy-as-kill-B]
|
|
|
437 ;;fsf '("Copy B as Kill" . emerge-copy-as-kill-B))
|
|
|
438 ;;fsf (define-key emerge-merge-menu [emerge-copy-as-kill-A]
|
|
|
439 ;;fsf '("Copy A as Kill" . emerge-copy-as-kill-A))
|
|
|
440 ;;fsf (define-key emerge-merge-menu [emerge-insert-B]
|
|
|
441 ;;fsf '("Insert B" . emerge-insert-B))
|
|
|
442 ;;fsf (define-key emerge-merge-menu [emerge-insert-A]
|
|
|
443 ;;fsf '("Insert A" . emerge-insert-A))
|
|
|
444 ;;fsf (define-key emerge-merge-menu [emerge-select-B]
|
|
|
445 ;;fsf '("Select B" . emerge-select-B))
|
|
|
446 ;;fsf (define-key emerge-merge-menu [emerge-select-A]
|
|
|
447 ;;fsf '("Select A" . emerge-select-A)))
|
|
|
448
|
|
|
449 (defvar emerge-menu
|
|
|
450 '(["Buffers ..." emerge-buffers t]
|
|
|
451 ["Buffers With Ancestor ..." emerge-buffers-with-ancestor t]
|
|
|
452 ["Files ..." emerge-files t]
|
|
|
453 ["Files with Ancestor ..." emerge-files-with-ancestor t]
|
|
|
454 ["Revisions ..." emerge-revisions t]
|
|
|
455 ["Revisions with Ancestor ..." emerge-revisions-with-ancestor t]
|
|
|
456 ["Merge Directories ..." emerge-merge-directories t])
|
|
|
457 "Menubar entry for using Emerge.")
|
|
|
458
|
|
|
459 (defvar emerge-mode-menu
|
|
|
460 '(
|
|
|
461 ["Next Difference" emerge-next-difference t]
|
|
|
462 ["Previous Difference" emerge-previous-difference t]
|
|
|
463 ("Other Motion"
|
|
|
464 ["Find Difference" emerge-find-difference t]
|
|
|
465 ["Jump To Difference" emerge-jump-to-difference t]
|
|
|
466 ["Mark Difference" emerge-mark-difference t]
|
|
|
467 ["Recenter" emerge-recenter t]
|
|
|
468 ["Scroll Up" emerge-scroll-up t]
|
|
|
469 ["Scroll Down" emerge-scroll-down t]
|
|
|
470 ["Scroll Left" emerge-scroll-left t]
|
|
|
471 ["Scroll Right" emerge-scroll-right t]
|
|
|
472 ["Scroll Reset" emerge-scroll-reset t])
|
|
|
473 "---"
|
|
|
474 ["Select A" emerge-select-A t]
|
|
|
475 ["Select B" emerge-select-B t]
|
|
|
476 ["Insert A" emerge-insert-A t]
|
|
|
477 ["Insert B" emerge-insert-B t]
|
|
|
478 ["Copy A as Kill" emerge-copy-as-kill-A t]
|
|
|
479 ["Copy B as Kill" emerge-copy-as-kill-B t]
|
|
|
480 ("Other Merge"
|
|
|
481 ["Combine Versions" emerge-combine-versions t]
|
|
|
482 ["Trim Difference" emerge-trim-difference t]
|
|
|
483 ["Join Differences" emerge-join-differences t]
|
|
|
484 ["Split Difference" emerge-split-difference t])
|
|
|
485 "---"
|
|
|
486 ("Options"
|
|
|
487 ["Fast Mode" emerge-fast-mode t]
|
|
|
488 ["Edit Mode" emerge-edit-mode t]
|
|
|
489 ["Auto Advance" emerge-auto-advance t]
|
|
|
490 ["Skip Prefers" emerge-skip-prefers t]
|
|
|
491 ["Default A" emerge-default-A t]
|
|
|
492 ["Default B" emerge-default-B t]
|
|
|
493 ["Set Combine Template..." emerge-set-combine-template t]
|
|
|
494 ["Set Merge Mode" emerge-set-merge-mode t]
|
|
|
495 ["One Line Window" emerge-one-line-window t])
|
|
|
496 ["Abort" emerge-abort t]
|
|
|
497 ["Quit" emerge-quit t])
|
|
|
498 "Menubar entry while in Emerge minor mode.")
|
|
|
499
|
|
|
500 ;; Variables which control each merge. They are local to the merge buffer.
|
|
|
501
|
|
|
502 ;; Mode variables
|
|
|
503 (emerge-defvar-local emerge-mode nil
|
|
|
504 "Indicator for emerge-mode.")
|
|
|
505 (emerge-defvar-local emerge-fast-mode nil
|
|
|
506 "Indicator for emerge-mode fast submode.")
|
|
|
507 (emerge-defvar-local emerge-edit-mode nil
|
|
|
508 "Indicator for emerge-mode edit submode.")
|
|
|
509 (emerge-defvar-local emerge-A-buffer nil
|
|
|
510 "The buffer in which the A variant is stored.")
|
|
|
511 (emerge-defvar-local emerge-B-buffer nil
|
|
|
512 "The buffer in which the B variant is stored.")
|
|
|
513 (emerge-defvar-local emerge-merge-buffer nil
|
|
|
514 "The buffer in which the merged file is manipulated.")
|
|
|
515 (emerge-defvar-local emerge-ancestor-buffer nil
|
|
|
516 "The buffer in which the ancestor variant is stored,
|
|
|
517 or nil if there is none.")
|
|
|
518
|
|
|
519 (defconst emerge-saved-variables
|
|
|
520 '((buffer-modified-p set-buffer-modified-p)
|
|
|
521 buffer-read-only
|
|
|
522 buffer-auto-save-file-name)
|
|
|
523 "Variables and properties of a buffer which are saved, modified and restored
|
|
|
524 during a merge.")
|
|
|
525 (defconst emerge-merging-values '(nil t nil)
|
|
|
526 "Values to be assigned to emerge-saved-variables during a merge.")
|
|
|
527
|
|
|
528 (emerge-defvar-local emerge-A-buffer-values nil
|
|
|
529 "Remembers emerge-saved-variables for emerge-A-buffer.")
|
|
|
530 (emerge-defvar-local emerge-B-buffer-values nil
|
|
|
531 "Remembers emerge-saved-variables for emerge-B-buffer.")
|
|
|
532
|
|
|
533 (emerge-defvar-local emerge-difference-list nil
|
|
|
534 "Vector of differences between the variants, and markers in the buffers to
|
|
|
535 show where they are. Each difference is represented by a vector of seven
|
|
|
536 elements. The first two are markers to the beginning and end of the difference
|
|
|
537 section in the A buffer, the second two are markers for the B buffer, the third
|
|
|
538 two are markers for the merge buffer, and the last element is the \"state\" of
|
|
|
539 that difference in the merge buffer.
|
|
|
540 A section of a buffer is described by two markers, one to the beginning of
|
|
|
541 the first line of the section, and one to the beginning of the first line
|
|
|
542 after the section. (If the section is empty, both markers point to the same
|
|
|
543 point.) If the section is part of the selected difference, then the markers
|
|
|
544 are moved into the flags, so the user can edit the section without disturbing
|
|
|
545 the markers.
|
|
|
546 The \"states\" are:
|
|
|
547 A the merge buffer currently contains the A variant
|
|
|
548 B the merge buffer currently contains the B variant
|
|
|
549 default-A the merge buffer contains the A variant by default,
|
|
|
550 but this difference hasn't been selected yet, so
|
|
|
551 change-default commands can alter it
|
|
|
552 default-B the merge buffer contains the B variant by default,
|
|
|
553 but this difference hasn't been selected yet, so
|
|
|
554 change-default commands can alter it
|
|
|
555 prefer-A in a three-file merge, the A variant is the preferred
|
|
|
556 choice
|
|
|
557 prefer-B in a three-file merge, the B variant is the preferred
|
|
|
558 choice")
|
|
|
559 (emerge-defvar-local emerge-current-difference -1
|
|
|
560 "The difference that is currently selected.")
|
|
|
561 (emerge-defvar-local emerge-number-of-differences nil
|
|
|
562 "Number of differences found.")
|
|
|
563 (emerge-defvar-local emerge-edit-keymap nil
|
|
|
564 "The local keymap for the merge buffer, with the emerge commands defined in
|
|
|
565 it. Used to save the local keymap during fast mode, when the local keymap is
|
|
|
566 replaced by emerge-fast-keymap.")
|
|
|
567 (emerge-defvar-local emerge-old-keymap nil
|
|
|
568 "The original local keymap for the merge buffer.")
|
|
|
569 (emerge-defvar-local emerge-auto-advance nil
|
|
|
570 "*If non-nil, emerge-select-A and emerge-select-B automatically advance to
|
|
|
571 the next difference.")
|
|
|
572 (emerge-defvar-local emerge-skip-prefers nil
|
|
|
573 "*If non-nil, differences for which there is a preference are automatically
|
|
|
574 skipped.")
|
|
|
575 (emerge-defvar-local emerge-quit-hook nil
|
|
|
576 "Hooks to run in the merge buffer after the merge has been finished.
|
|
|
577 `emerge-prefix-argument' will hold the prefix argument of the `emerge-quit'
|
|
|
578 command.
|
|
|
579 This is *not* a user option, since Emerge uses it for its own processing.")
|
|
|
580 (emerge-defvar-local emerge-output-description nil
|
|
|
581 "Describes output destination of emerge, for `emerge-file-names'.")
|
|
|
582
|
|
|
583 ;;; Setup functions for two-file mode.
|
|
|
584
|
|
|
585 (defun emerge-files-internal (file-A file-B &optional startup-hooks quit-hooks
|
|
|
586 output-file)
|
|
|
587 (if (not (file-readable-p file-A))
|
|
|
588 (error "File \"%s\" does not exist or is not readable" file-A))
|
|
|
589 (if (not (file-readable-p file-B))
|
|
|
590 (error "File \"%s\" does not exist or is not readable" file-B))
|
|
|
591 (let ((buffer-A (find-file-noselect file-A))
|
|
|
592 (buffer-B (find-file-noselect file-B)))
|
|
|
593 ;; Record the directories of the files
|
|
|
594 (setq emerge-last-dir-A (file-name-directory file-A))
|
|
|
595 (setq emerge-last-dir-B (file-name-directory file-B))
|
|
|
596 (if output-file
|
|
|
597 (setq emerge-last-dir-output (file-name-directory output-file)))
|
|
|
598 ;; Make sure the entire files are seen, and they reflect what is on disk
|
|
|
599 (emerge-eval-in-buffer
|
|
|
600 buffer-A
|
|
|
601 (widen)
|
|
|
602 (if (emerge-remote-file-p)
|
|
|
603 (progn
|
|
|
604 ;; Store in a local file
|
|
|
605 (setq file-A (emerge-make-temp-file "A"))
|
|
|
606 (write-region (point-min) (point-max) file-A nil 'no-message)
|
|
|
607 (setq startup-hooks
|
|
|
608 (cons (` (lambda () (delete-file (, file-A))))
|
|
|
609 startup-hooks)))
|
|
|
610 ;; Verify that the file matches the buffer
|
|
|
611 (emerge-verify-file-buffer)))
|
|
|
612 (emerge-eval-in-buffer
|
|
|
613 buffer-B
|
|
|
614 (widen)
|
|
|
615 (if (emerge-remote-file-p)
|
|
|
616 (progn
|
|
|
617 ;; Store in a local file
|
|
|
618 (setq file-B (emerge-make-temp-file "B"))
|
|
|
619 (write-region (point-min) (point-max) file-B nil 'no-message)
|
|
|
620 (setq startup-hooks
|
|
|
621 (cons (` (lambda () (delete-file (, file-B))))
|
|
|
622 startup-hooks)))
|
|
|
623 ;; Verify that the file matches the buffer
|
|
|
624 (emerge-verify-file-buffer)))
|
|
|
625 (emerge-setup buffer-A file-A buffer-B file-B startup-hooks quit-hooks
|
|
|
626 output-file)))
|
|
|
627
|
|
|
628 ;; Start up Emerge on two files
|
|
|
629 (defun emerge-setup (buffer-A file-A buffer-B file-B startup-hooks quit-hooks
|
|
|
630 output-file)
|
|
|
631 (setq file-A (expand-file-name file-A))
|
|
|
632 (setq file-B (expand-file-name file-B))
|
|
|
633 (setq output-file (and output-file (expand-file-name output-file)))
|
|
|
634 (let* ((merge-buffer-name (emerge-unique-buffer-name "*merge" "*"))
|
|
|
635 ;; create the merge buffer from buffer A, so it inherits buffer A's
|
|
|
636 ;; default directory, etc.
|
|
|
637 (merge-buffer (emerge-eval-in-buffer
|
|
|
638 buffer-A
|
|
|
639 (get-buffer-create merge-buffer-name))))
|
|
|
640 (emerge-eval-in-buffer
|
|
|
641 merge-buffer
|
|
|
642 (emerge-copy-modes buffer-A)
|
|
|
643 (setq buffer-read-only nil)
|
|
|
644 (auto-save-mode 1)
|
|
|
645 (setq emerge-mode t)
|
|
|
646 (setq emerge-A-buffer buffer-A)
|
|
|
647 (setq emerge-B-buffer buffer-B)
|
|
|
648 (setq emerge-ancestor-buffer nil)
|
|
|
649 (setq emerge-merge-buffer merge-buffer)
|
|
|
650 (setq emerge-output-description
|
|
|
651 (if output-file
|
|
|
652 (concat "Output to file: " output-file)
|
|
|
653 (concat "Output to buffer: " (buffer-name merge-buffer))))
|
|
|
654 (insert-buffer emerge-A-buffer)
|
|
|
655 (emerge-set-keys)
|
|
|
656 (setq emerge-difference-list (emerge-make-diff-list file-A file-B))
|
|
|
657 (setq emerge-number-of-differences (length emerge-difference-list))
|
|
|
658 (setq emerge-current-difference -1)
|
|
|
659 (setq emerge-quit-hook quit-hooks)
|
|
|
660 (emerge-remember-buffer-characteristics)
|
|
|
661 (emerge-handle-local-variables))
|
|
|
662 (emerge-setup-windows buffer-A buffer-B merge-buffer t)
|
|
|
663 (emerge-eval-in-buffer merge-buffer
|
|
|
664 (run-hooks 'startup-hooks 'emerge-startup-hook)
|
|
|
665 (setq buffer-read-only t))))
|
|
|
666
|
|
|
667 ;; Generate the Emerge difference list between two files
|
|
|
668 (defun emerge-make-diff-list (file-A file-B)
|
|
|
669 (let ((diff-buffer (get-buffer-create "*emerge-diff*")))
|
|
|
670 (emerge-eval-in-buffer
|
|
|
671 diff-buffer
|
|
|
672 (erase-buffer)
|
|
|
673 (shell-command
|
|
|
674 (format "%s %s %s %s"
|
|
|
675 emerge-diff-program emerge-diff-options
|
|
|
676 (emerge-protect-metachars file-A)
|
|
|
677 (emerge-protect-metachars file-B))
|
|
|
678 t))
|
|
|
679 (emerge-prepare-error-list emerge-diff-ok-lines-regexp diff-buffer)
|
|
|
680 (emerge-convert-diffs-to-markers
|
|
|
681 emerge-A-buffer emerge-B-buffer emerge-merge-buffer
|
|
|
682 (emerge-extract-diffs diff-buffer))))
|
|
|
683
|
|
|
684 (defun emerge-extract-diffs (diff-buffer)
|
|
|
685 (let (list)
|
|
|
686 (emerge-eval-in-buffer
|
|
|
687 diff-buffer
|
|
|
688 (goto-char (point-min))
|
|
|
689 (while (re-search-forward emerge-match-diff-line nil t)
|
|
|
690 (let* ((a-begin (string-to-int (buffer-substring (match-beginning 1)
|
|
|
691 (match-end 1))))
|
|
|
692 (a-end (let ((b (match-beginning 3))
|
|
|
693 (e (match-end 3)))
|
|
|
694 (if b
|
|
|
695 (string-to-int (buffer-substring b e))
|
|
|
696 a-begin)))
|
|
|
697 (diff-type (buffer-substring (match-beginning 4) (match-end 4)))
|
|
|
698 (b-begin (string-to-int (buffer-substring (match-beginning 5)
|
|
|
699 (match-end 5))))
|
|
|
700 (b-end (let ((b (match-beginning 7))
|
|
|
701 (e (match-end 7)))
|
|
|
702 (if b
|
|
|
703 (string-to-int (buffer-substring b e))
|
|
|
704 b-begin))))
|
|
|
705 ;; fix the beginning and end numbers, because diff is somewhat
|
|
|
706 ;; strange about how it numbers lines
|
|
|
707 (if (string-equal diff-type "a")
|
|
|
708 (progn
|
|
|
709 (setq b-end (1+ b-end))
|
|
|
710 (setq a-begin (1+ a-begin))
|
|
|
711 (setq a-end a-begin))
|
|
|
712 (if (string-equal diff-type "d")
|
|
|
713 (progn
|
|
|
714 (setq a-end (1+ a-end))
|
|
|
715 (setq b-begin (1+ b-begin))
|
|
|
716 (setq b-end b-begin))
|
|
|
717 ;; (string-equal diff-type "c")
|
|
|
718 (progn
|
|
|
719 (setq a-end (1+ a-end))
|
|
|
720 (setq b-end (1+ b-end)))))
|
|
|
721 (setq list (cons (vector a-begin a-end
|
|
|
722 b-begin b-end
|
|
|
723 'default-A)
|
|
|
724 list)))))
|
|
|
725 (nreverse list)))
|
|
|
726
|
|
|
727 ;; Set up buffer of diff/diff3 error messages.
|
|
|
728 (defun emerge-prepare-error-list (ok-regexp diff-buffer)
|
|
|
729 (setq emerge-diff-error-buffer (get-buffer-create "*emerge-diff-errors*"))
|
|
|
730 (emerge-eval-in-buffer
|
|
|
731 emerge-diff-error-buffer
|
|
|
732 (erase-buffer)
|
|
|
733 (insert-buffer diff-buffer)
|
|
|
734 (delete-matching-lines ok-regexp)))
|
|
|
735
|
|
|
736 ;;; Top-level and setup functions for three-file mode.
|
|
|
737
|
|
|
738 (defun emerge-files-with-ancestor-internal (file-A file-B file-ancestor
|
|
|
739 &optional startup-hooks quit-hooks
|
|
|
740 output-file)
|
|
|
741 (if (not (file-readable-p file-A))
|
|
|
742 (error "File \"%s\" does not exist or is not readable" file-A))
|
|
|
743 (if (not (file-readable-p file-B))
|
|
|
744 (error "File \"%s\" does not exist or is not readable" file-B))
|
|
|
745 (if (not (file-readable-p file-ancestor))
|
|
|
746 (error "File \"%s\" does not exist or is not readable" file-ancestor))
|
|
|
747 (let ((buffer-A (find-file-noselect file-A))
|
|
|
748 (buffer-B (find-file-noselect file-B))
|
|
|
749 (buffer-ancestor (find-file-noselect file-ancestor)))
|
|
|
750 ;; Record the directories of the files
|
|
|
751 (setq emerge-last-dir-A (file-name-directory file-A))
|
|
|
752 (setq emerge-last-dir-B (file-name-directory file-B))
|
|
|
753 (setq emerge-last-dir-ancestor (file-name-directory file-ancestor))
|
|
|
754 (if output-file
|
|
|
755 (setq emerge-last-dir-output (file-name-directory output-file)))
|
|
|
756 ;; Make sure the entire files are seen, and they reflect what is on disk
|
|
|
757 (emerge-eval-in-buffer
|
|
|
758 buffer-A
|
|
|
759 (widen)
|
|
|
760 (if (emerge-remote-file-p)
|
|
|
761 (progn
|
|
|
762 ;; Store in a local file
|
|
|
763 (setq file-A (emerge-make-temp-file "A"))
|
|
|
764 (write-region (point-min) (point-max) file-A nil 'no-message)
|
|
|
765 (setq startup-hooks
|
|
|
766 (cons (` (lambda () (delete-file (, file-A))))
|
|
|
767 startup-hooks)))
|
|
|
768 ;; Verify that the file matches the buffer
|
|
|
769 (emerge-verify-file-buffer)))
|
|
|
770 (emerge-eval-in-buffer
|
|
|
771 buffer-B
|
|
|
772 (widen)
|
|
|
773 (if (emerge-remote-file-p)
|
|
|
774 (progn
|
|
|
775 ;; Store in a local file
|
|
|
776 (setq file-B (emerge-make-temp-file "B"))
|
|
|
777 (write-region (point-min) (point-max) file-B nil 'no-message)
|
|
|
778 (setq startup-hooks
|
|
|
779 (cons (` (lambda () (delete-file (, file-B))))
|
|
|
780 startup-hooks)))
|
|
|
781 ;; Verify that the file matches the buffer
|
|
|
782 (emerge-verify-file-buffer)))
|
|
|
783 (emerge-eval-in-buffer
|
|
|
784 buffer-ancestor
|
|
|
785 (widen)
|
|
|
786 (if (emerge-remote-file-p)
|
|
|
787 (progn
|
|
|
788 ;; Store in a local file
|
|
|
789 (setq file-ancestor (emerge-make-temp-file "anc"))
|
|
|
790 (write-region (point-min) (point-max) file-ancestor nil 'no-message)
|
|
|
791 (setq startup-hooks
|
|
|
792 (cons (` (lambda () (delete-file (, file-ancestor))))
|
|
|
793 startup-hooks)))
|
|
|
794 ;; Verify that the file matches the buffer
|
|
|
795 (emerge-verify-file-buffer)))
|
|
|
796 (emerge-setup-with-ancestor buffer-A file-A buffer-B file-B
|
|
|
797 buffer-ancestor file-ancestor
|
|
|
798 startup-hooks quit-hooks output-file)))
|
|
|
799
|
|
|
800 ;; Start up Emerge on two files with an ancestor
|
|
|
801 (defun emerge-setup-with-ancestor (buffer-A file-A buffer-B file-B
|
|
|
802 buffer-ancestor file-ancestor
|
|
|
803 &optional startup-hooks quit-hooks
|
|
|
804 output-file)
|
|
|
805 (setq file-A (expand-file-name file-A))
|
|
|
806 (setq file-B (expand-file-name file-B))
|
|
|
807 (setq file-ancestor (expand-file-name file-ancestor))
|
|
|
808 (setq output-file (and output-file (expand-file-name output-file)))
|
|
|
809 (let* ((merge-buffer-name (emerge-unique-buffer-name "*merge" "*"))
|
|
|
810 ;; create the merge buffer from buffer A, so it inherits buffer A's
|
|
|
811 ;; default directory, etc.
|
|
|
812 (merge-buffer (emerge-eval-in-buffer
|
|
|
813 buffer-A
|
|
|
814 (get-buffer-create merge-buffer-name))))
|
|
|
815 (emerge-eval-in-buffer
|
|
|
816 merge-buffer
|
|
|
817 (emerge-copy-modes buffer-A)
|
|
|
818 (setq buffer-read-only nil)
|
|
|
819 (auto-save-mode 1)
|
|
|
820 (setq emerge-mode t)
|
|
|
821 (setq emerge-A-buffer buffer-A)
|
|
|
822 (setq emerge-B-buffer buffer-B)
|
|
|
823 (setq emerge-ancestor-buffer buffer-ancestor)
|
|
|
824 (setq emerge-merge-buffer merge-buffer)
|
|
|
825 (setq emerge-output-description
|
|
|
826 (if output-file
|
|
|
827 (concat "Output to file: " output-file)
|
|
|
828 (concat "Output to buffer: " (buffer-name merge-buffer))))
|
|
|
829 (insert-buffer emerge-A-buffer)
|
|
|
830 (emerge-set-keys)
|
|
|
831 (setq emerge-difference-list
|
|
|
832 (emerge-make-diff3-list file-A file-B file-ancestor))
|
|
|
833 (setq emerge-number-of-differences (length emerge-difference-list))
|
|
|
834 (setq emerge-current-difference -1)
|
|
|
835 (setq emerge-quit-hook quit-hooks)
|
|
|
836 (emerge-remember-buffer-characteristics)
|
|
|
837 (emerge-select-prefer-Bs)
|
|
|
838 (emerge-handle-local-variables))
|
|
|
839 (emerge-setup-windows buffer-A buffer-B merge-buffer t)
|
|
|
840 (emerge-eval-in-buffer merge-buffer
|
|
|
841 (run-hooks 'startup-hooks 'emerge-startup-hook)
|
|
|
842 (setq buffer-read-only t))))
|
|
|
843
|
|
|
844 ;; Generate the Emerge difference list between two files with an ancestor
|
|
|
845 (defun emerge-make-diff3-list (file-A file-B file-ancestor)
|
|
|
846 (let ((diff-buffer (get-buffer-create "*emerge-diff*")))
|
|
|
847 (emerge-eval-in-buffer
|
|
|
848 diff-buffer
|
|
|
849 (erase-buffer)
|
|
|
850 (shell-command
|
|
|
851 (format "%s %s %s %s %s"
|
|
|
852 emerge-diff3-program emerge-diff-options
|
|
|
853 ;; #### - fsf reverses file-ancestor and file-A, why?
|
|
|
854 (emerge-protect-metachars file-ancestor)
|
|
|
855 (emerge-protect-metachars file-A)
|
|
|
856 (emerge-protect-metachars file-B))
|
|
|
857 t))
|
|
|
858 (emerge-prepare-error-list emerge-diff3-ok-lines-regexp diff-buffer)
|
|
|
859 (emerge-convert-diffs-to-markers
|
|
|
860 emerge-A-buffer emerge-B-buffer emerge-merge-buffer
|
|
|
861 (emerge-extract-diffs3 diff-buffer))))
|
|
|
862
|
|
|
863 (defun emerge-extract-diffs3 (diff-buffer)
|
|
|
864 (let (list)
|
|
|
865 (emerge-eval-in-buffer
|
|
|
866 diff-buffer
|
|
|
867 (while (re-search-forward "^====\\(.?\\)$" nil t)
|
|
|
868 ;; leave point after matched line
|
|
|
869 (beginning-of-line 2)
|
|
|
870 (let ((agreement (buffer-substring (match-beginning 1) (match-end 1))))
|
|
|
871 ;; if the A and B files are the same, ignore the difference
|
|
|
872 (if (not (string-equal agreement "1")) ; this goes with the file-A/ancestor reversal
|
|
|
873 (setq list
|
|
|
874 (cons
|
|
|
875 (let* ((pos (point))
|
|
|
876 (group-2 (emerge-get-diff3-group "2"))
|
|
|
877 (group-3 (progn (goto-char pos)
|
|
|
878 (emerge-get-diff3-group "3"))))
|
|
|
879 (vector (car group-2) (car (cdr group-2))
|
|
|
880 (car group-3) (car (cdr group-3))
|
|
|
881 (cond ((string-equal agreement "2") 'prefer-A)
|
|
|
882 ((string-equal agreement "3") 'prefer-B)
|
|
|
883 (t 'default-A))))
|
|
|
884 list))))))
|
|
|
885 (nreverse list)))
|
|
|
886
|
|
|
887 (defun emerge-get-diff3-group (file)
|
|
|
888 ;; This save-excursion allows emerge-get-diff3-group to be called for the
|
|
|
889 ;; various groups of lines (1, 2, 3) in any order, and for the lines to
|
|
|
890 ;; appear in any order. The reason this is necessary is that Gnu diff3
|
|
|
891 ;; can produce the groups in the order 1, 2, 3 or 1, 3, 2.
|
|
|
892 (save-excursion
|
|
|
893 (re-search-forward
|
|
|
894 (concat "^" file ":\\([0-9]+\\)\\(,\\([0-9]+\\)\\)?\\([ac]\\)$"))
|
|
|
895 (beginning-of-line 2)
|
|
|
896 ;; treatment depends on whether it is an "a" group or a "c" group
|
|
|
897 (if (string-equal (buffer-substring (match-beginning 4) (match-end 4)) "c")
|
|
|
898 ;; it is a "c" group
|
|
|
899 (if (match-beginning 2)
|
|
|
900 ;; it has two numbers
|
|
|
901 (list (string-to-int
|
|
|
902 (buffer-substring (match-beginning 1) (match-end 1)))
|
|
|
903 (1+ (string-to-int
|
|
|
904 (buffer-substring (match-beginning 3) (match-end 3)))))
|
|
|
905 ;; it has one number
|
|
|
906 (let ((x (string-to-int
|
|
|
907 (buffer-substring (match-beginning 1) (match-end 1)))))
|
|
|
908 (list x (1+ x))))
|
|
|
909 ;; it is an "a" group
|
|
|
910 (let ((x (1+ (string-to-int
|
|
|
911 (buffer-substring (match-beginning 1) (match-end 1))))))
|
|
|
912 (list x x)))))
|
|
|
913
|
|
|
914 ;;; Functions to start Emerge on files
|
|
|
915
|
|
|
916 ;;;###autoload
|
|
|
917 (defun emerge-files (arg file-A file-B file-out &optional startup-hooks
|
|
|
918 quit-hooks)
|
|
|
919 "Run Emerge on two files."
|
|
|
920 (interactive
|
|
|
921 (let (f)
|
|
|
922 (list current-prefix-arg
|
|
|
923 (setq f (emerge-read-file-name "File A to merge" emerge-last-dir-A
|
|
|
924 nil nil t))
|
|
|
925 (emerge-read-file-name "File B to merge" emerge-last-dir-B nil f t)
|
|
|
926 (and current-prefix-arg
|
|
|
927 (emerge-read-file-name "Output file" emerge-last-dir-output
|
|
|
928 f f nil)))))
|
|
|
929 (emerge-files-internal
|
|
|
930 file-A file-B startup-hooks
|
|
|
931 (if file-out
|
|
|
932 (cons (` (lambda () (emerge-files-exit (, file-out))))
|
|
|
933 quit-hooks)
|
|
|
934 quit-hooks)
|
|
|
935 file-out))
|
|
|
936
|
|
|
937 ;;;###autoload
|
|
|
938 (fset 'emerge 'emerge-files)
|
|
|
939
|
|
|
940 ;;;###autoload
|
|
|
941 (defun emerge-files-with-ancestor (arg file-A file-B file-ancestor file-out
|
|
|
942 &optional startup-hooks quit-hooks)
|
|
|
943 "Run Emerge on two files, giving another file as the ancestor."
|
|
|
944 (interactive
|
|
|
945 (let (f)
|
|
|
946 (list current-prefix-arg
|
|
|
947 (setq f (emerge-read-file-name "File A to merge" emerge-last-dir-A
|
|
|
948 nil nil t))
|
|
|
949 (emerge-read-file-name "File B to merge" emerge-last-dir-B nil f t)
|
|
|
950 (emerge-read-file-name "Ancestor file" emerge-last-dir-ancestor
|
|
|
951 nil f t)
|
|
|
952 (and current-prefix-arg
|
|
|
953 (emerge-read-file-name "Output file" emerge-last-dir-output
|
|
|
954 f f nil)))))
|
|
|
955 (emerge-files-with-ancestor-internal
|
|
|
956 file-A file-B file-ancestor startup-hooks
|
|
|
957 (if file-out
|
|
|
958 (cons (` (lambda () (emerge-files-exit (, file-out))))
|
|
|
959 quit-hooks)
|
|
|
960 quit-hooks)
|
|
|
961 file-out))
|
|
|
962
|
|
|
963 ;; Write the merge buffer out in place of the file the A buffer is visiting.
|
|
|
964 (defun emerge-files-exit (file-out)
|
|
|
965 ;; if merge was successful was given, save to disk
|
|
|
966 (if (not emerge-prefix-argument)
|
|
|
967 (emerge-write-and-delete file-out)))
|
|
|
968
|
|
|
969 ;;; Functions to start Emerge on buffers
|
|
|
970
|
|
|
971 ;;;###autoload
|
|
|
972 (defun emerge-buffers (buffer-A buffer-B &optional startup-hooks quit-hooks)
|
|
|
973 "Run Emerge on two buffers."
|
|
|
974 (interactive "bBuffer A to merge: \nbBuffer B to merge: ")
|
|
|
975 (let ((emerge-file-A (emerge-make-temp-file "A"))
|
|
|
976 (emerge-file-B (emerge-make-temp-file "B")))
|
|
|
977 (emerge-eval-in-buffer
|
|
|
978 buffer-A
|
|
|
979 (write-region (point-min) (point-max) emerge-file-A nil 'no-message))
|
|
|
980 (emerge-eval-in-buffer
|
|
|
981 buffer-B
|
|
|
982 (write-region (point-min) (point-max) emerge-file-B nil 'no-message))
|
|
|
983 (emerge-setup (get-buffer buffer-A) emerge-file-A
|
|
|
984 (get-buffer buffer-B) emerge-file-B
|
|
|
985 (cons (` (lambda ()
|
|
|
986 (delete-file (, emerge-file-A))
|
|
|
987 (delete-file (, emerge-file-B))))
|
|
|
988 startup-hooks)
|
|
|
989 quit-hooks
|
|
|
990 nil)))
|
|
|
991
|
|
|
992 ;;;###autoload
|
|
|
993 (defun emerge-buffers-with-ancestor (buffer-A buffer-B buffer-ancestor
|
|
|
994 &optional startup-hooks
|
|
|
995 quit-hooks)
|
|
|
996 "Run Emerge on two buffers, giving another buffer as the ancestor."
|
|
|
997 (interactive
|
|
|
998 "bBuffer A to merge: \nbBuffer B to merge: \nbAncestor buffer: ")
|
|
|
999 (let ((emerge-file-A (emerge-make-temp-file "A"))
|
|
|
1000 (emerge-file-B (emerge-make-temp-file "B"))
|
|
|
1001 (emerge-file-ancestor (emerge-make-temp-file "anc")))
|
|
|
1002 (emerge-eval-in-buffer
|
|
|
1003 buffer-A
|
|
|
1004 (write-region (point-min) (point-max) emerge-file-A nil 'no-message))
|
|
|
1005 (emerge-eval-in-buffer
|
|
|
1006 buffer-B
|
|
|
1007 (write-region (point-min) (point-max) emerge-file-B nil 'no-message))
|
|
|
1008 (emerge-eval-in-buffer
|
|
|
1009 buffer-ancestor
|
|
|
1010 (write-region (point-min) (point-max) emerge-file-ancestor nil
|
|
|
1011 'no-message))
|
|
|
1012 (emerge-setup-with-ancestor (get-buffer buffer-A) emerge-file-A
|
|
|
1013 (get-buffer buffer-B) emerge-file-B
|
|
|
1014 (get-buffer buffer-ancestor)
|
|
|
1015 emerge-file-ancestor
|
|
|
1016 (cons (` (lambda ()
|
|
|
1017 (delete-file (, emerge-file-A))
|
|
|
1018 (delete-file (, emerge-file-B))
|
|
|
1019 (delete-file
|
|
|
1020 (, emerge-file-ancestor))))
|
|
|
1021 startup-hooks)
|
|
|
1022 quit-hooks
|
|
|
1023 nil)))
|
|
|
1024
|
|
|
1025 ;;; Functions to start Emerge from the command line
|
|
|
1026
|
|
|
1027 ;;;###autoload
|
|
|
1028 (defun emerge-files-command ()
|
|
|
1029 (let ((file-a (nth 0 command-line-args-left))
|
|
|
1030 (file-b (nth 1 command-line-args-left))
|
|
|
1031 (file-out (nth 2 command-line-args-left)))
|
|
|
1032 (setq command-line-args-left (nthcdr 3 command-line-args-left))
|
|
|
1033 (emerge-files-internal
|
|
|
1034 file-a file-b nil
|
|
|
1035 (list (` (lambda () (emerge-command-exit (, file-out))))))))
|
|
|
1036
|
|
|
1037 ;;;###autoload
|
|
|
1038 (defun emerge-files-with-ancestor-command ()
|
|
|
1039 (let (file-a file-b file-anc file-out)
|
|
|
1040 ;; check for a -a flag, for filemerge compatibility
|
|
|
1041 (if (string= (car command-line-args-left) "-a")
|
|
|
1042 ;; arguments are "-a ancestor file-a file-b file-out"
|
|
|
1043 (progn
|
|
|
1044 (setq file-a (nth 2 command-line-args-left))
|
|
|
1045 (setq file-b (nth 3 command-line-args-left))
|
|
|
1046 (setq file-anc (nth 1 command-line-args-left))
|
|
|
1047 (setq file-out (nth 4 command-line-args-left))
|
|
|
1048 (setq command-line-args-left (nthcdr 5 command-line-args-left)))
|
|
|
1049 ;; arguments are "file-a file-b ancestor file-out"
|
|
|
1050 (setq file-a (nth 0 command-line-args-left))
|
|
|
1051 (setq file-b (nth 1 command-line-args-left))
|
|
|
1052 (setq file-anc (nth 2 command-line-args-left))
|
|
|
1053 (setq file-out (nth 3 command-line-args-left))
|
|
|
1054 (setq command-line-args-left (nthcdr 4 command-line-args-left)))
|
|
|
1055 (emerge-files-with-ancestor-internal
|
|
|
1056 file-a file-b file-anc nil
|
|
|
1057 (list (` (lambda () (emerge-command-exit (, file-out))))))))
|
|
|
1058
|
|
|
1059 (defun emerge-command-exit (file-out)
|
|
|
1060 (emerge-write-and-delete file-out)
|
|
|
1061 (kill-emacs (if emerge-prefix-argument 1 0)))
|
|
|
1062
|
|
|
1063 ;;; Functions to start Emerge via remote request
|
|
|
1064
|
|
|
1065 ;;;###autoload
|
|
|
1066 (defun emerge-files-remote (file-a file-b file-out)
|
|
|
1067 (emerge-files-internal
|
|
|
1068 file-a file-b nil
|
|
|
1069 (list (` (lambda () (emerge-remote-exit (, file-out) '(, emerge-exit-func)))))
|
|
|
1070 file-out)
|
|
|
1071 (throw 'client-wait nil))
|
|
|
1072
|
|
|
1073 ;;;###autoload
|
|
|
1074 (defun emerge-files-with-ancestor-remote (file-a file-b file-anc file-out)
|
|
|
1075 (emerge-files-with-ancestor-internal
|
|
|
1076 file-a file-b file-anc nil
|
|
|
1077 (list (` (lambda () (emerge-remote-exit (, file-out) '(, emerge-exit-func)))))
|
|
|
1078 file-out)
|
|
|
1079 (throw 'client-wait nil))
|
|
|
1080
|
|
|
1081 (defun emerge-remote-exit (file-out emerge-exit-func)
|
|
|
1082 (emerge-write-and-delete file-out)
|
|
|
1083 (kill-buffer emerge-merge-buffer)
|
|
|
1084 (funcall emerge-exit-func (if emerge-prefix-argument 1 0)))
|
|
|
1085
|
|
|
1086 ;;; Functions to start Emerge on RCS versions
|
|
|
1087
|
|
|
1088 ;;;###autoload
|
|
|
1089 (defun emerge-revisions (arg file revision-A revision-B
|
|
|
1090 &optional startup-hooks quit-hooks)
|
|
|
1091 "Emerge two RCS revisions of a file."
|
|
|
1092 (interactive
|
|
|
1093 (list current-prefix-arg
|
|
|
1094 (read-file-name "File to merge: " nil nil 'confirm)
|
|
|
1095 (read-string "Revision A to merge: " emerge-last-revision-A)
|
|
|
1096 (read-string "Revision B to merge: " emerge-last-revision-B)))
|
|
|
1097 (setq emerge-last-revision-A revision-A
|
|
|
1098 emerge-last-revision-B revision-B)
|
|
|
1099 (emerge-revisions-internal
|
|
|
1100 file revision-A revision-B startup-hooks
|
|
|
1101 (if arg
|
|
|
1102 (cons (` (lambda ()
|
|
|
1103 (shell-command
|
|
|
1104 (, (format "%s %s" emerge-rcs-ci-program file)))))
|
|
|
1105 quit-hooks)
|
|
|
1106 quit-hooks)))
|
|
|
1107
|
|
|
1108 ;;;###autoload
|
|
|
1109 (defun emerge-revisions-with-ancestor (arg file revision-A
|
|
|
1110 revision-B ancestor
|
|
|
1111 &optional
|
|
|
1112 startup-hooks quit-hooks)
|
|
|
1113 "Emerge two RCS revisions of a file, with another revision as ancestor."
|
|
|
1114 (interactive
|
|
|
1115 (list current-prefix-arg
|
|
|
1116 (read-file-name "File to merge: " nil nil 'confirm)
|
|
|
1117 (read-string "Revision A to merge: " emerge-last-revision-A)
|
|
|
1118 (read-string "Revision B to merge: " emerge-last-revision-B)
|
|
|
1119 (read-string "Ancestor: " emerge-last-revision-ancestor)))
|
|
|
1120 (setq emerge-last-revision-A revision-A
|
|
|
1121 emerge-last-revision-B revision-B
|
|
|
1122 emerge-last-revision-ancestor ancestor)
|
|
|
1123 (emerge-revision-with-ancestor-internal
|
|
|
1124 file revision-A revision-B ancestor startup-hooks
|
|
|
1125 (if arg
|
|
|
1126 (let ((cmd ))
|
|
|
1127 (cons (` (lambda ()
|
|
|
1128 (shell-command
|
|
|
1129 (, (format "%s %s" emerge-rcs-ci-program file)))))
|
|
|
1130 quit-hooks))
|
|
|
1131 quit-hooks)))
|
|
|
1132
|
|
|
1133 (defun emerge-revisions-internal (file revision-A revision-B &optional
|
|
|
1134 startup-hooks quit-hooks output-file)
|
|
|
1135 (let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A)))
|
|
|
1136 (buffer-B (get-buffer-create (format "%s,%s" file revision-B)))
|
|
|
1137 (emerge-file-A (emerge-make-temp-file "A"))
|
|
|
1138 (emerge-file-B (emerge-make-temp-file "B")))
|
|
|
1139 ;; Get the revisions into buffers
|
|
|
1140 (emerge-eval-in-buffer
|
|
|
1141 buffer-A
|
|
|
1142 (erase-buffer)
|
|
|
1143 (shell-command
|
|
|
1144 (format "%s -q -p%s %s" emerge-rcs-co-program revision-A file)
|
|
|
1145 t)
|
|
|
1146 (write-region (point-min) (point-max) emerge-file-A nil 'no-message)
|
|
|
1147 (set-buffer-modified-p nil))
|
|
|
1148 (emerge-eval-in-buffer
|
|
|
1149 buffer-B
|
|
|
1150 (erase-buffer)
|
|
|
1151 (shell-command
|
|
|
1152 (format "%s -q -p%s %s" emerge-rcs-co-program revision-B file)
|
|
|
1153 t)
|
|
|
1154 (write-region (point-min) (point-max) emerge-file-B nil 'no-message)
|
|
|
1155 (set-buffer-modified-p nil))
|
|
|
1156 ;; Do the merge
|
|
|
1157 (emerge-setup buffer-A emerge-file-A
|
|
|
1158 buffer-B emerge-file-B
|
|
|
1159 (cons (` (lambda ()
|
|
|
1160 (delete-file (, emerge-file-A))
|
|
|
1161 (delete-file (, emerge-file-B))))
|
|
|
1162 startup-hooks)
|
|
|
1163 (cons (` (lambda () (emerge-files-exit (, file))))
|
|
|
1164 quit-hooks)
|
|
|
1165 nil)))
|
|
|
1166
|
|
|
1167 (defun emerge-revision-with-ancestor-internal (file revision-A revision-B
|
|
|
1168 ancestor
|
|
|
1169 &optional startup-hooks
|
|
|
1170 quit-hooks output-file)
|
|
|
1171 (let ((buffer-A (get-buffer-create (format "%s,%s" file revision-A)))
|
|
|
1172 (buffer-B (get-buffer-create (format "%s,%s" file revision-B)))
|
|
|
1173 (buffer-ancestor (get-buffer-create (format "%s,%s" file ancestor)))
|
|
|
1174 (emerge-file-A (emerge-make-temp-file "A"))
|
|
|
1175 (emerge-file-B (emerge-make-temp-file "B"))
|
|
|
1176 (emerge-ancestor (emerge-make-temp-file "ancestor")))
|
|
|
1177 ;; Get the revisions into buffers
|
|
|
1178 (emerge-eval-in-buffer
|
|
|
1179 buffer-A
|
|
|
1180 (erase-buffer)
|
|
|
1181 (shell-command
|
|
|
1182 (format "%s -q -p%s %s" emerge-rcs-co-program
|
|
|
1183 revision-A file)
|
|
|
1184 t)
|
|
|
1185 (write-region (point-min) (point-max) emerge-file-A nil 'no-message)
|
|
|
1186 (set-buffer-modified-p nil))
|
|
|
1187 (emerge-eval-in-buffer
|
|
|
1188 buffer-B
|
|
|
1189 (erase-buffer)
|
|
|
1190 (shell-command
|
|
|
1191 (format "%s -q -p%s %s" emerge-rcs-co-program revision-B file)
|
|
|
1192 t)
|
|
|
1193 (write-region (point-min) (point-max) emerge-file-B nil 'no-message)
|
|
|
1194 (set-buffer-modified-p nil))
|
|
|
1195 (emerge-eval-in-buffer
|
|
|
1196 buffer-ancestor
|
|
|
1197 (erase-buffer)
|
|
|
1198 (shell-command
|
|
|
1199 (format "%s -q -p%s %s" emerge-rcs-co-program ancestor file)
|
|
|
1200 t)
|
|
|
1201 (write-region (point-min) (point-max) emerge-ancestor nil 'no-message)
|
|
|
1202 (set-buffer-modified-p nil))
|
|
|
1203 ;; Do the merge
|
|
|
1204 (emerge-setup-with-ancestor
|
|
|
1205 buffer-A emerge-file-A buffer-B emerge-file-B
|
|
|
1206 buffer-ancestor emerge-ancestor
|
|
|
1207 (cons (` (lambda ()
|
|
|
1208 (delete-file (, emerge-file-A))
|
|
|
1209 (delete-file (, emerge-file-B))
|
|
|
1210 (delete-file (, emerge-ancestor))))
|
|
|
1211 startup-hooks)
|
|
|
1212 (cons (` (lambda () (emerge-files-exit (, file))))
|
|
|
1213 quit-hooks)
|
|
|
1214 output-file)))
|
|
|
1215
|
|
|
1216 ;;; Function to start Emerge based on a line in a file
|
|
|
1217
|
|
|
1218 (defun emerge-execute-line ()
|
|
|
1219 "Run Emerge using files named in current text line.
|
|
|
1220 Looks in that line for whitespace-separated entries of these forms:
|
|
|
1221 a=file1
|
|
|
1222 b=file2
|
|
|
1223 ancestor=file3
|
|
|
1224 output=file4
|
|
|
1225 to specify the files to use in Emerge.
|
|
|
1226
|
|
|
1227 In addition, if only one of `a=file' or `b=file' is present,
|
|
|
1228 and `output=file' is present:
|
|
|
1229 If `emerge-execute-line-deletions' is non-nil and `ancestor=file'
|
|
|
1230 is present, it is assumed that the file in question has been deleted,
|
|
|
1231 and it is not copied to the output file.
|
|
|
1232 Otherwise, the A or B file present is copied to the output file."
|
|
|
1233 (interactive)
|
|
|
1234 (let (file-A file-B file-ancestor file-out
|
|
|
1235 (case-fold-search t))
|
|
|
1236 ;; Stop if at end of buffer (even though we might be in a line, if
|
|
|
1237 ;; the line does not end with newline)
|
|
|
1238 (if (eobp)
|
|
|
1239 (error "At end of buffer"))
|
|
|
1240 ;; Go to the beginning of the line
|
|
|
1241 (beginning-of-line)
|
|
|
1242 ;; Skip any initial whitespace
|
|
|
1243 (if (looking-at "[ \t]*")
|
|
|
1244 (goto-char (match-end 0)))
|
|
|
1245 ;; Process the entire line
|
|
|
1246 (while (not (eolp))
|
|
|
1247 ;; Get the next entry
|
|
|
1248 (if (looking-at "\\([a-z]+\\)=\\([^ \t\n]+\\)[ \t]*")
|
|
|
1249 ;; Break apart the tab (before =) and the filename (after =)
|
|
|
1250 (let ((tag (downcase
|
|
|
1251 (buffer-substring (match-beginning 1) (match-end 1))))
|
|
|
1252 (file (buffer-substring (match-beginning 2) (match-end 2))))
|
|
|
1253 ;; Move point after the entry
|
|
|
1254 (goto-char (match-end 0))
|
|
|
1255 ;; Store the filename in the right variable
|
|
|
1256 (cond
|
|
|
1257 ((string-equal tag "a")
|
|
|
1258 (if file-A
|
|
|
1259 (error "This line has two `A' entries"))
|
|
|
1260 (setq file-A file))
|
|
|
1261 ((string-equal tag "b")
|
|
|
1262 (if file-B
|
|
|
1263 (error "This line has two `B' entries"))
|
|
|
1264 (setq file-B file))
|
|
|
1265 ((or (string-equal tag "anc") (string-equal tag "ancestor"))
|
|
|
1266 (if file-ancestor
|
|
|
1267 (error "This line has two `ancestor' entries"))
|
|
|
1268 (setq file-ancestor file))
|
|
|
1269 ((or (string-equal tag "out") (string-equal tag "output"))
|
|
|
1270 (if file-out
|
|
|
1271 (error "This line has two `output' entries"))
|
|
|
1272 (setq file-out file))
|
|
|
1273 (t
|
|
|
1274 (error "Unrecognized entry"))))
|
|
|
1275 ;; If the match on the entry pattern failed
|
|
|
1276 (error "Unparsable entry")))
|
|
|
1277 ;; Make sure that file-A and file-B are present
|
|
|
1278 (if (not (or (and file-A file-B) file-out))
|
|
|
1279 (error "Must have both `A' and `B' entries"))
|
|
|
1280 (if (not (or file-A file-B))
|
|
|
1281 (error "Must have `A' or `B' entry"))
|
|
|
1282 ;; Go to the beginning of the next line, so next execution will use
|
|
|
1283 ;; next line in buffer.
|
|
|
1284 (beginning-of-line 2)
|
|
|
1285 ;; Execute the correct command
|
|
|
1286 (cond
|
|
|
1287 ;; Merge of two files with ancestor
|
|
|
1288 ((and file-A file-B file-ancestor)
|
|
|
1289 (message "Merging %s and %s..." file-A file-B)
|
|
|
1290 (emerge-files-with-ancestor (not (not file-out)) file-A file-B
|
|
|
1291 file-ancestor file-out
|
|
|
1292 nil
|
|
|
1293 ;; When done, return to this buffer.
|
|
|
1294 (list
|
|
|
1295 (` (lambda ()
|
|
|
1296 (switch-to-buffer (, (current-buffer)))
|
|
|
1297 (message "Merge done."))))))
|
|
|
1298 ;; Merge of two files without ancestor
|
|
|
1299 ((and file-A file-B)
|
|
|
1300 (message "Merging %s and %s..." file-A file-B)
|
|
|
1301 (emerge-files (not (not file-out)) file-A file-B file-out
|
|
|
1302 nil
|
|
|
1303 ;; When done, return to this buffer.
|
|
|
1304 (list
|
|
|
1305 (` (lambda ()
|
|
|
1306 (switch-to-buffer (, (current-buffer)))
|
|
|
1307 (message "Merge done."))))))
|
|
|
1308 ;; There is an output file (or there would have been an error above),
|
|
|
1309 ;; but only one input file.
|
|
|
1310 ;; The file appears to have been deleted in one version; do nothing.
|
|
|
1311 ((and file-ancestor emerge-execute-line-deletions)
|
|
|
1312 (message "No action."))
|
|
|
1313 ;; The file should be copied from the version that contains it
|
|
|
1314 (t (let ((input-file (or file-A file-B)))
|
|
|
1315 (message "Copying...")
|
|
|
1316 (copy-file input-file file-out)
|
|
|
1317 (message "%s copied to %s." input-file file-out))))))
|
|
|
1318
|
|
|
1319 ;;; Sample function for creating information for emerge-execute-line
|
|
|
1320
|
|
|
1321 (defvar emerge-merge-directories-filename-regexp "[^.]"
|
|
|
1322 "Regexp describing files to be processed by `emerge-merge-directories'.")
|
|
|
1323
|
|
|
1324 ;;;###autoload
|
|
|
1325 (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir)
|
|
|
1326 (interactive
|
|
|
1327 (list
|
|
|
1328 (read-file-name "A directory: " nil nil 'confirm)
|
|
|
1329 (read-file-name "B directory: " nil nil 'confirm)
|
|
|
1330 (read-file-name "Ancestor directory (null for none): " nil nil 'confirm)
|
|
|
1331 (read-file-name "Output directory (null for none): " nil nil 'confirm)))
|
|
|
1332 ;; Check that we're not on a line
|
|
|
1333 (if (not (and (bolp) (eolp)))
|
|
|
1334 (error "There is text on this line"))
|
|
|
1335 ;; Turn null strings into nil to indicate directories not used.
|
|
|
1336 (if (and ancestor-dir (string-equal ancestor-dir ""))
|
|
|
1337 (setq ancestor-dir nil))
|
|
|
1338 (if (and output-dir (string-equal output-dir ""))
|
|
|
1339 (setq output-dir nil))
|
|
|
1340 ;; Canonicalize the directory names
|
|
|
1341 (setq a-dir (expand-file-name a-dir))
|
|
|
1342 (if (not (string-equal (substring a-dir -1) "/"))
|
|
|
1343 (setq a-dir (concat a-dir "/")))
|
|
|
1344 (setq b-dir (expand-file-name b-dir))
|
|
|
1345 (if (not (string-equal (substring b-dir -1) "/"))
|
|
|
1346 (setq b-dir (concat b-dir "/")))
|
|
|
1347 (if ancestor-dir
|
|
|
1348 (progn
|
|
|
1349 (setq ancestor-dir (expand-file-name ancestor-dir))
|
|
|
1350 (if (not (string-equal (substring ancestor-dir -1) "/"))
|
|
|
1351 (setq ancestor-dir (concat ancestor-dir "/")))))
|
|
|
1352 (if output-dir
|
|
|
1353 (progn
|
|
|
1354 (setq output-dir (expand-file-name output-dir))
|
|
|
1355 (if (not (string-equal (substring output-dir -1) "/"))
|
|
|
1356 (setq output-dir (concat output-dir "/")))))
|
|
|
1357 ;; Set the mark to where we start
|
|
|
1358 (push-mark)
|
|
|
1359 ;; Find out what files are in the directories.
|
|
|
1360 (let* ((a-dir-files
|
|
|
1361 (directory-files a-dir nil emerge-merge-directories-filename-regexp))
|
|
|
1362 (b-dir-files
|
|
|
1363 (directory-files b-dir nil emerge-merge-directories-filename-regexp))
|
|
|
1364 (ancestor-dir-files
|
|
|
1365 (and ancestor-dir
|
|
|
1366 (directory-files ancestor-dir nil
|
|
|
1367 emerge-merge-directories-filename-regexp)))
|
|
|
1368 (all-files (sort (nconc (copy-sequence a-dir-files)
|
|
|
1369 (copy-sequence b-dir-files)
|
|
|
1370 (copy-sequence ancestor-dir-files))
|
|
|
1371 (function string-lessp))))
|
|
|
1372 ;; Remove duplicates from all-files.
|
|
|
1373 (let ((p all-files))
|
|
|
1374 (while p
|
|
|
1375 (if (and (cdr p) (string-equal (car p) (car (cdr p))))
|
|
|
1376 (setcdr p (cdr (cdr p)))
|
|
|
1377 (setq p (cdr p)))))
|
|
|
1378 ;; Generate the control lines for the various files.
|
|
|
1379 (while all-files
|
|
|
1380 (let ((f (car all-files)))
|
|
|
1381 (setq all-files (cdr all-files))
|
|
|
1382 (if (and a-dir-files (string-equal (car a-dir-files) f))
|
|
|
1383 (progn
|
|
|
1384 (insert "A=" a-dir f "\t")
|
|
|
1385 (setq a-dir-files (cdr a-dir-files))))
|
|
|
1386 (if (and b-dir-files (string-equal (car b-dir-files) f))
|
|
|
1387 (progn
|
|
|
1388 (insert "B=" b-dir f "\t")
|
|
|
1389 (setq b-dir-files (cdr b-dir-files))))
|
|
|
1390 (if (and ancestor-dir-files (string-equal (car ancestor-dir-files) f))
|
|
|
1391 (progn
|
|
|
1392 (insert "ancestor=" ancestor-dir f "\t")
|
|
|
1393 (setq ancestor-dir-files (cdr ancestor-dir-files))))
|
|
|
1394 (if output-dir
|
|
|
1395 (insert "output=" output-dir f "\t"))
|
|
|
1396 (backward-delete-char 1)
|
|
|
1397 (insert "\n")))))
|
|
|
1398
|
|
|
1399 ;;; Common setup routines
|
|
|
1400
|
|
|
1401 ;; Set up the window configuration. If POS is given, set the points to
|
|
|
1402 ;; the beginnings of the buffers.
|
|
|
1403 (defun emerge-setup-windows (buffer-A buffer-B merge-buffer &optional pos)
|
|
|
1404 ;; Make sure we are not in the minibuffer window when we try to delete
|
|
|
1405 ;; all other windows.
|
|
|
1406 (if (eq (selected-window) (minibuffer-window))
|
|
|
1407 (other-window 1))
|
|
|
1408 (delete-other-windows)
|
|
|
1409 (switch-to-buffer merge-buffer)
|
|
|
1410 (emerge-refresh-mode-line)
|
|
|
1411 ;; in v18, split-window and split-window-vertically were the same,
|
|
|
1412 ;; but in v19, split-window-vertically might select the other window.
|
|
|
1413 ;; (split-window-vertically)
|
|
|
1414 (split-window)
|
|
|
1415 (if emerge-split-horizontally
|
|
|
1416 (split-window-horizontally)
|
|
|
1417 (split-window))
|
|
|
1418 (switch-to-buffer buffer-A)
|
|
|
1419 (if pos
|
|
|
1420 (goto-char (point-min)))
|
|
|
1421 (other-window 1)
|
|
|
1422 (switch-to-buffer buffer-B)
|
|
|
1423 (if pos
|
|
|
1424 (goto-char (point-min)))
|
|
|
1425 (other-window 1)
|
|
|
1426 (if pos
|
|
|
1427 (goto-char (point-min)))
|
|
|
1428 ;; If diff/diff3 reports errors, display them rather than the merge buffer.
|
|
|
1429 (if (/= 0 (emerge-eval-in-buffer emerge-diff-error-buffer (buffer-size)))
|
|
|
1430 (progn
|
|
|
1431 (ding)
|
|
|
1432 (message "Errors found in diff/diff3 output. Merge buffer is %s."
|
|
|
1433 (buffer-name emerge-merge-buffer))
|
|
|
1434 (switch-to-buffer emerge-diff-error-buffer))))
|
|
|
1435
|
|
|
1436 ;; Set up the keymap in the merge buffer
|
|
|
1437 (defun emerge-set-keys ()
|
|
|
1438 ;; Set up fixed keymaps if necessary
|
|
|
1439 (if (not emerge-basic-keymap)
|
|
|
1440 (emerge-setup-fixed-keymaps))
|
|
|
1441 ;; Save the old local map
|
|
|
1442 (setq emerge-old-keymap (current-local-map))
|
|
|
1443 ;; Construct the edit keymap
|
|
|
1444 (setq emerge-edit-keymap (if emerge-old-keymap
|
|
|
1445 (copy-keymap emerge-old-keymap)
|
|
|
1446 (make-sparse-keymap)))
|
|
|
1447 ;; Install the Emerge commands
|
|
|
1448 (emerge-force-define-key emerge-edit-keymap emerge-command-prefix
|
|
|
1449 'emerge-basic-keymap)
|
|
|
1450 ;;fsf (define-key emerge-edit-keymap [menu-bar] (make-sparse-keymap))
|
|
|
1451 ;;fsf
|
|
|
1452 ;;fsf ;; Create the additional menu bar items.
|
|
|
1453 ;;fsf (define-key emerge-edit-keymap [menu-bar options]
|
|
|
1454 ;;fsf (cons "Options" emerge-options-menu))
|
|
|
1455 ;;fsf (define-key emerge-edit-keymap [menu-bar merge]
|
|
|
1456 ;;fsf (cons "Merge" emerge-merge-menu))
|
|
|
1457 ;;fsf (define-key emerge-edit-keymap [menu-bar move]
|
|
|
1458 ;;fsf (cons "Move" emerge-move-menu))
|
|
|
1459
|
|
|
1460 ;; Suppress write-file and save-buffer
|
|
|
1461 (substitute-key-definition 'write-file 'emerge-query-write-file
|
|
|
1462 emerge-edit-keymap (current-global-map))
|
|
|
1463 (substitute-key-definition 'save-buffer 'emerge-query-save-buffer
|
|
|
1464 emerge-edit-keymap (current-global-map))
|
|
|
1465 (substitute-key-definition 'write-file 'emerge-query-write-file
|
|
|
1466 emerge-edit-keymap (current-global-map))
|
|
|
1467 (substitute-key-definition 'save-buffer 'emerge-query-save-buffer
|
|
|
1468 emerge-edit-keymap (current-global-map))
|
|
|
1469 (use-local-map emerge-fast-keymap)
|
|
|
1470 (make-local-variable 'current-menubar)
|
|
|
1471 (add-menu nil "Emerge" emerge-mode-menu)
|
|
|
1472 (setq emerge-edit-mode nil)
|
|
|
1473 (setq emerge-fast-mode t))
|
|
|
1474
|
|
|
1475 (defun emerge-remember-buffer-characteristics ()
|
|
|
1476 "Record certain properties of the buffers being merged.
|
|
|
1477 Must be called in the merge buffer. Remembers read-only, modified,
|
|
|
1478 auto-save, and saves them in buffer local variables. Sets the buffers
|
|
|
1479 read-only and turns off `auto-save-mode'.
|
|
|
1480 These characteristics are restored by `emerge-restore-buffer-characteristics'."
|
|
|
1481 ;; force auto-save, because we will turn off auto-saving in buffers for the
|
|
|
1482 ;; duration
|
|
|
1483 (do-auto-save)
|
|
|
1484 ;; remember and alter buffer characteristics
|
|
|
1485 (setq emerge-A-buffer-values
|
|
|
1486 (emerge-eval-in-buffer
|
|
|
1487 emerge-A-buffer
|
|
|
1488 (prog1
|
|
|
1489 (emerge-save-variables emerge-saved-variables)
|
|
|
1490 (emerge-restore-variables emerge-saved-variables
|
|
|
1491 emerge-merging-values))))
|
|
|
1492 (setq emerge-B-buffer-values
|
|
|
1493 (emerge-eval-in-buffer
|
|
|
1494 emerge-B-buffer
|
|
|
1495 (prog1
|
|
|
1496 (emerge-save-variables emerge-saved-variables)
|
|
|
1497 (emerge-restore-variables emerge-saved-variables
|
|
|
1498 emerge-merging-values)))))
|
|
|
1499
|
|
|
1500 (defun emerge-restore-buffer-characteristics ()
|
|
|
1501 "Restores characteristics saved by `emerge-remember-buffer-characteristics'."
|
|
|
1502 (let ((A-values emerge-A-buffer-values)
|
|
|
1503 (B-values emerge-B-buffer-values))
|
|
|
1504 (emerge-eval-in-buffer emerge-A-buffer
|
|
|
1505 (emerge-restore-variables emerge-saved-variables
|
|
|
1506 A-values))
|
|
|
1507 (emerge-eval-in-buffer emerge-B-buffer
|
|
|
1508 (emerge-restore-variables emerge-saved-variables
|
|
|
1509 B-values))))
|
|
|
1510 ;; Move to line DESIRED-LINE assuming we are at line CURRENT-LINE.
|
|
|
1511 ;; Return DESIRED-LINE.
|
|
|
1512 (defun emerge-goto-line (desired-line current-line)
|
|
|
1513 (forward-line (- desired-line current-line))
|
|
|
1514 desired-line)
|
|
|
1515
|
|
|
1516 (defun emerge-convert-diffs-to-markers (A-buffer
|
|
|
1517 B-buffer
|
|
|
1518 merge-buffer
|
|
|
1519 lineno-list)
|
|
|
1520 (let* (marker-list
|
|
|
1521 (A-point-min (emerge-eval-in-buffer A-buffer (point-min)))
|
|
|
1522 (offset (1- A-point-min))
|
|
|
1523 (B-point-min (emerge-eval-in-buffer B-buffer (point-min)))
|
|
|
1524 ;; Record current line number in each buffer
|
|
|
1525 ;; so we don't have to count from the beginning.
|
|
|
1526 (a-line 1)
|
|
|
1527 (b-line 1))
|
|
|
1528 (emerge-eval-in-buffer A-buffer (goto-char (point-min)))
|
|
|
1529 (emerge-eval-in-buffer B-buffer (goto-char (point-min)))
|
|
|
1530 (while lineno-list
|
|
|
1531 (let* ((list-element (car lineno-list))
|
|
|
1532 a-begin-marker
|
|
|
1533 a-end-marker
|
|
|
1534 b-begin-marker
|
|
|
1535 b-end-marker
|
|
|
1536 merge-begin-marker
|
|
|
1537 merge-end-marker
|
|
|
1538 (a-begin (aref list-element 0))
|
|
|
1539 (a-end (aref list-element 1))
|
|
|
1540 (b-begin (aref list-element 2))
|
|
|
1541 (b-end (aref list-element 3))
|
|
|
1542 (state (aref list-element 4)))
|
|
|
1543 ;; place markers at the appropriate places in the buffers
|
|
|
1544 (emerge-eval-in-buffer
|
|
|
1545 A-buffer
|
|
|
1546 (setq a-line (emerge-goto-line a-begin a-line))
|
|
|
1547 (setq a-begin-marker (point-marker))
|
|
|
1548 (setq a-line (emerge-goto-line a-end a-line))
|
|
|
1549 (setq a-end-marker (point-marker)))
|
|
|
1550 (emerge-eval-in-buffer
|
|
|
1551 B-buffer
|
|
|
1552 (setq b-line (emerge-goto-line b-begin b-line))
|
|
|
1553 (setq b-begin-marker (point-marker))
|
|
|
1554 (setq b-line (emerge-goto-line b-end b-line))
|
|
|
1555 (setq b-end-marker (point-marker)))
|
|
|
1556 (setq merge-begin-marker (set-marker
|
|
|
1557 (make-marker)
|
|
|
1558 (- (marker-position a-begin-marker)
|
|
|
1559 offset)
|
|
|
1560 merge-buffer))
|
|
|
1561 (setq merge-end-marker (set-marker
|
|
|
1562 (make-marker)
|
|
|
1563 (- (marker-position a-end-marker)
|
|
|
1564 offset)
|
|
|
1565 merge-buffer))
|
|
|
1566 ;; record all the markers for this difference
|
|
|
1567 (setq marker-list (cons (vector a-begin-marker a-end-marker
|
|
|
1568 b-begin-marker b-end-marker
|
|
|
1569 merge-begin-marker merge-end-marker
|
|
|
1570 state)
|
|
|
1571 marker-list)))
|
|
|
1572 (setq lineno-list (cdr lineno-list)))
|
|
|
1573 ;; convert the list of difference information into a vector for
|
|
|
1574 ;; fast access
|
|
|
1575 (setq emerge-difference-list (apply 'vector (nreverse marker-list)))))
|
|
|
1576
|
|
|
1577 ;; If we have an ancestor, select all B variants that we prefer
|
|
|
1578 (defun emerge-select-prefer-Bs ()
|
|
|
1579 (let ((n 0))
|
|
|
1580 (while (< n emerge-number-of-differences)
|
|
|
1581 (if (eq (aref (aref emerge-difference-list n) 6) 'prefer-B)
|
|
|
1582 (progn
|
|
|
1583 (emerge-unselect-and-select-difference n t)
|
|
|
1584 (emerge-select-B)
|
|
|
1585 (aset (aref emerge-difference-list n) 6 'prefer-B)))
|
|
|
1586 (setq n (1+ n))))
|
|
|
1587 (emerge-unselect-and-select-difference -1))
|
|
|
1588
|
|
|
1589 ;; Process the local-variables list at the end of the merged file, if
|
|
|
1590 ;; requested.
|
|
|
1591 (defun emerge-handle-local-variables ()
|
|
|
1592 (if emerge-process-local-variables
|
|
|
1593 (condition-case err
|
|
|
1594 (hack-local-variables t)
|
|
|
1595 (error (message "Local-variables error in merge buffer: %s"
|
|
|
1596 (prin1-to-string err))))))
|
|
|
1597
|
|
|
1598 ;;; Common exit routines
|
|
|
1599
|
|
|
1600 (defun emerge-write-and-delete (file-out)
|
|
|
1601 ;; clear screen format
|
|
|
1602 (delete-other-windows)
|
|
|
1603 ;; delete A, B, and ancestor buffers, if they haven't been changed
|
|
|
1604 (if (not (buffer-modified-p emerge-A-buffer))
|
|
|
1605 (kill-buffer emerge-A-buffer))
|
|
|
1606 (if (not (buffer-modified-p emerge-B-buffer))
|
|
|
1607 (kill-buffer emerge-B-buffer))
|
|
|
1608 (if (and emerge-ancestor-buffer
|
|
|
1609 (not (buffer-modified-p emerge-ancestor-buffer)))
|
|
|
1610 (kill-buffer emerge-ancestor-buffer))
|
|
|
1611 ;; Write merge buffer to file
|
|
|
1612 (and file-out
|
|
|
1613 (write-file file-out)))
|
|
|
1614
|
|
|
1615 ;;; Commands
|
|
|
1616
|
|
|
1617 (defun emerge-recenter (&optional arg)
|
|
|
1618 "Bring the highlighted region of all three merge buffers into view.
|
|
|
1619 This brings the buffers into view if they are in windows.
|
|
|
1620 With an argument, reestablish the default three-window display."
|
|
|
1621 (interactive "P")
|
|
|
1622 ;; If there is an argument, rebuild the window structure
|
|
|
1623 (if arg
|
|
|
1624 (emerge-setup-windows emerge-A-buffer emerge-B-buffer
|
|
|
1625 emerge-merge-buffer))
|
|
|
1626 ;; Redisplay whatever buffers are showing, if there is a selected difference
|
|
|
1627 (if (and (>= emerge-current-difference 0)
|
|
|
1628 (< emerge-current-difference emerge-number-of-differences))
|
|
|
1629 (let* ((merge-buffer emerge-merge-buffer)
|
|
|
1630 (buffer-A emerge-A-buffer)
|
|
|
1631 (buffer-B emerge-B-buffer)
|
|
|
1632 (window-A (get-buffer-window buffer-A 'visible))
|
|
|
1633 (window-B (get-buffer-window buffer-B 'visible))
|
|
|
1634 (merge-window (get-buffer-window merge-buffer))
|
|
|
1635 (diff-vector
|
|
|
1636 (aref emerge-difference-list emerge-current-difference)))
|
|
|
1637 ;; note that emerge-{before,after}-flag-length are meaningless
|
|
|
1638 ;; when (not emerge-mark-with-text). -jwz.
|
|
|
1639 (if window-A (progn
|
|
|
1640 (select-window window-A)
|
|
|
1641 (emerge-position-region
|
|
|
1642 (- (aref diff-vector 0)
|
|
|
1643 (if emerge-mark-with-text
|
|
|
1644 (1- emerge-before-flag-length)
|
|
|
1645 0))
|
|
|
1646 (+ (aref diff-vector 1)
|
|
|
1647 (if emerge-mark-with-text
|
|
|
1648 (1- emerge-after-flag-length)
|
|
|
1649 0))
|
|
|
1650 (1+ (aref diff-vector 0)))))
|
|
|
1651 (if window-B (progn
|
|
|
1652 (select-window window-B)
|
|
|
1653 (emerge-position-region
|
|
|
1654 (- (aref diff-vector 2)
|
|
|
1655 (if emerge-mark-with-text
|
|
|
1656 (1- emerge-before-flag-length)
|
|
|
1657 0))
|
|
|
1658 (+ (aref diff-vector 3)
|
|
|
1659 (if emerge-mark-with-text
|
|
|
1660 (1- emerge-after-flag-length)
|
|
|
1661 0))
|
|
|
1662 (1+ (aref diff-vector 2)))))
|
|
|
1663 (if merge-window (progn
|
|
|
1664 (select-window merge-window)
|
|
|
1665 (emerge-position-region
|
|
|
1666 (- (aref diff-vector 4)
|
|
|
1667 (if emerge-mark-with-text
|
|
|
1668 (1- emerge-before-flag-length)
|
|
|
1669 0))
|
|
|
1670 (+ (aref diff-vector 5)
|
|
|
1671 (if emerge-mark-with-text
|
|
|
1672 (1- emerge-after-flag-length)
|
|
|
1673 0))
|
|
|
1674 (1+ (aref diff-vector 4))))))))
|
|
|
1675
|
|
|
1676 ;;; Window scrolling operations
|
|
|
1677 ;; These operations are designed to scroll all three windows the same amount,
|
|
|
1678 ;; so as to keep the text in them aligned.
|
|
|
1679
|
|
|
1680 ;; Perform some operation on all three windows (if they are showing).
|
|
|
1681 ;; Catches all errors on the operation in the A and B windows, but not
|
|
|
1682 ;; in the merge window. Usually, errors come from scrolling off the
|
|
|
1683 ;; beginning or end of the buffer, and this gives a nice error message:
|
|
|
1684 ;; End of buffer is reported in the merge buffer, but if the scroll was
|
|
|
1685 ;; possible in the A or B windows, it is performed there before the error
|
|
|
1686 ;; is reported.
|
|
|
1687 (defun emerge-operate-on-windows (operation arg)
|
|
|
1688 (let* ((merge-buffer emerge-merge-buffer)
|
|
|
1689 (buffer-A emerge-A-buffer)
|
|
|
1690 (buffer-B emerge-B-buffer)
|
|
|
1691 (window-A (get-buffer-window buffer-A 'visible))
|
|
|
1692 (window-B (get-buffer-window buffer-B 'visible))
|
|
|
1693 (merge-window (get-buffer-window merge-buffer)))
|
|
|
1694 (if window-A (progn
|
|
|
1695 (select-window window-A)
|
|
|
1696 (condition-case nil
|
|
|
1697 (funcall operation arg)
|
|
|
1698 (error))))
|
|
|
1699 (if window-B (progn
|
|
|
1700 (select-window window-B)
|
|
|
1701 (condition-case nil
|
|
|
1702 (funcall operation arg)
|
|
|
1703 (error))))
|
|
|
1704 (if merge-window (progn
|
|
|
1705 (select-window merge-window)
|
|
|
1706 (funcall operation arg)))))
|
|
|
1707
|
|
|
1708 (defun emerge-scroll-up (&optional arg)
|
|
|
1709 "Scroll up all three merge buffers, if they are in windows.
|
|
|
1710 With argument N, scroll N lines; otherwise scroll by nearly
|
|
|
1711 the height of the merge window.
|
|
|
1712 `C-u -' alone as argument scrolls half the height of the merge window."
|
|
|
1713 (interactive "P")
|
|
|
1714 (emerge-operate-on-windows
|
|
|
1715 'scroll-up
|
|
|
1716 ;; calculate argument to scroll-up
|
|
|
1717 ;; if there is an explicit argument
|
|
|
1718 (if (and arg (not (equal arg '-)))
|
|
|
1719 ;; use it
|
|
|
1720 (prefix-numeric-value arg)
|
|
|
1721 ;; if not, see if we can determine a default amount (the window height)
|
|
|
1722 (let ((merge-window (get-buffer-window emerge-merge-buffer)))
|
|
|
1723 (if (null merge-window)
|
|
|
1724 ;; no window, use nil
|
|
|
1725 nil
|
|
|
1726 (let ((default-amount
|
|
|
1727 (- (window-height merge-window) 1 next-screen-context-lines)))
|
|
|
1728 ;; the window was found
|
|
|
1729 (if arg
|
|
|
1730 ;; C-u as argument means half of default amount
|
|
|
1731 (/ default-amount 2)
|
|
|
1732 ;; no argument means default amount
|
|
|
1733 default-amount)))))))
|
|
|
1734
|
|
|
1735 (defun emerge-scroll-down (&optional arg)
|
|
|
1736 "Scroll down all three merge buffers, if they are in windows.
|
|
|
1737 With argument N, scroll N lines; otherwise scroll by nearly
|
|
|
1738 the height of the merge window.
|
|
|
1739 `C-u -' alone as argument scrolls half the height of the merge window."
|
|
|
1740 (interactive "P")
|
|
|
1741 (emerge-operate-on-windows
|
|
|
1742 'scroll-down
|
|
|
1743 ;; calculate argument to scroll-down
|
|
|
1744 ;; if there is an explicit argument
|
|
|
1745 (if (and arg (not (equal arg '-)))
|
|
|
1746 ;; use it
|
|
|
1747 (prefix-numeric-value arg)
|
|
|
1748 ;; if not, see if we can determine a default amount (the window height)
|
|
|
1749 (let ((merge-window (get-buffer-window emerge-merge-buffer)))
|
|
|
1750 (if (null merge-window)
|
|
|
1751 ;; no window, use nil
|
|
|
1752 nil
|
|
|
1753 (let ((default-amount
|
|
|
1754 (- (window-height merge-window) 1 next-screen-context-lines)))
|
|
|
1755 ;; the window was found
|
|
|
1756 (if arg
|
|
|
1757 ;; C-u as argument means half of default amount
|
|
|
1758 (/ default-amount 2)
|
|
|
1759 ;; no argument means default amount
|
|
|
1760 default-amount)))))))
|
|
|
1761
|
|
|
1762 (defun emerge-scroll-left (&optional arg)
|
|
|
1763 "Scroll left all three merge buffers, if they are in windows.
|
|
|
1764 If an argument is given, that is how many columns are scrolled, else nearly
|
|
|
1765 the width of the A and B windows. `C-u -' alone as argument scrolls half the
|
|
|
1766 width of the A and B windows."
|
|
|
1767 (interactive "P")
|
|
|
1768 (emerge-operate-on-windows
|
|
|
1769 'scroll-left
|
|
|
1770 ;; calculate argument to scroll-left
|
|
|
1771 ;; if there is an explicit argument
|
|
|
1772 (if (and arg (not (equal arg '-)))
|
|
|
1773 ;; use it
|
|
|
1774 (prefix-numeric-value arg)
|
|
|
1775 ;; if not, see if we can determine a default amount
|
|
|
1776 ;; (half the window width)
|
|
|
1777 (let ((merge-window (get-buffer-window emerge-merge-buffer)))
|
|
|
1778 (if (null merge-window)
|
|
|
1779 ;; no window, use nil
|
|
|
1780 nil
|
|
|
1781 (let ((default-amount
|
|
|
1782 (- (/ (window-width merge-window) 2) 3)))
|
|
|
1783 ;; the window was found
|
|
|
1784 (if arg
|
|
|
1785 ;; C-u as argument means half of default amount
|
|
|
1786 (/ default-amount 2)
|
|
|
1787 ;; no argument means default amount
|
|
|
1788 default-amount)))))))
|
|
|
1789
|
|
|
1790 (defun emerge-scroll-right (&optional arg)
|
|
|
1791 "Scroll right all three merge buffers, if they are in windows.
|
|
|
1792 If an argument is given, that is how many columns are scrolled, else nearly
|
|
|
1793 the width of the A and B windows. `C-u -' alone as argument scrolls half the
|
|
|
1794 width of the A and B windows."
|
|
|
1795 (interactive "P")
|
|
|
1796 (emerge-operate-on-windows
|
|
|
1797 'scroll-right
|
|
|
1798 ;; calculate argument to scroll-right
|
|
|
1799 ;; if there is an explicit argument
|
|
|
1800 (if (and arg (not (equal arg '-)))
|
|
|
1801 ;; use it
|
|
|
1802 (prefix-numeric-value arg)
|
|
|
1803 ;; if not, see if we can determine a default amount
|
|
|
1804 ;; (half the window width)
|
|
|
1805 (let ((merge-window (get-buffer-window emerge-merge-buffer)))
|
|
|
1806 (if (null merge-window)
|
|
|
1807 ;; no window, use nil
|
|
|
1808 nil
|
|
|
1809 (let ((default-amount
|
|
|
1810 (- (/ (window-width merge-window) 2) 3)))
|
|
|
1811 ;; the window was found
|
|
|
1812 (if arg
|
|
|
1813 ;; C-u as argument means half of default amount
|
|
|
1814 (/ default-amount 2)
|
|
|
1815 ;; no argument means default amount
|
|
|
1816 default-amount)))))))
|
|
|
1817
|
|
|
1818 (defun emerge-scroll-reset ()
|
|
|
1819 "Reset horizontal scrolling in Emerge.
|
|
|
1820 This resets the horizontal scrolling of all three merge buffers
|
|
|
1821 to the left margin, if they are in windows."
|
|
|
1822 (interactive)
|
|
|
1823 (emerge-operate-on-windows
|
|
|
1824 (function (lambda (x) (set-window-hscroll (selected-window) 0)))
|
|
|
1825 nil))
|
|
|
1826
|
|
|
1827 ;; Attempt to show the region nicely.
|
|
|
1828 ;; If there are min-lines lines above and below the region, then don't do
|
|
|
1829 ;; anything.
|
|
|
1830 ;; If not, recenter the region to make it so.
|
|
|
1831 ;; If that isn't possible, remove context lines balancedly from top and botton
|
|
|
1832 ;; so the entire region shows.
|
|
|
1833 ;; If that isn't possible, show the top of the region.
|
|
|
1834 ;; BEG must be at the beginning of a line.
|
|
|
1835 (defun emerge-position-region (beg end pos)
|
|
|
1836 ;; First test whether the entire region is visible with
|
|
|
1837 ;; emerge-min-visible-lines above and below it
|
|
|
1838 (if (not (and (<= (progn
|
|
|
1839 (move-to-window-line emerge-min-visible-lines)
|
|
|
1840 (point))
|
|
|
1841 beg)
|
|
|
1842 (<= end (progn
|
|
|
1843 (move-to-window-line
|
|
|
1844 (- (1+ emerge-min-visible-lines)))
|
|
|
1845 (point)))))
|
|
|
1846 ;; We failed that test, see if it fits at all
|
|
|
1847 ;; Meanwhile positioning it correctly in case it doesn't fit
|
|
|
1848 (progn
|
|
|
1849 (set-window-start (selected-window) beg)
|
|
|
1850 (if (pos-visible-in-window-p end)
|
|
|
1851 ;; Determine the number of lines that the region occupies
|
|
|
1852 (let ((lines 0))
|
|
|
1853 (while (> end (progn
|
|
|
1854 (move-to-window-line lines)
|
|
|
1855 (point)))
|
|
|
1856 (setq lines (1+ lines)))
|
|
|
1857 ;; And position the beginning on the right line
|
|
|
1858 (goto-char beg)
|
|
|
1859 (recenter (/ (1+ (- (1- (window-height (selected-window)))
|
|
|
1860 lines))
|
|
|
1861 2))))))
|
|
|
1862 (goto-char pos))
|
|
|
1863
|
|
|
1864 (defun emerge-next-difference ()
|
|
|
1865 "Advance to the next difference."
|
|
|
1866 (interactive)
|
|
|
1867 (if (< emerge-current-difference emerge-number-of-differences)
|
|
|
1868 (let ((n (1+ emerge-current-difference)))
|
|
|
1869 (while (and emerge-skip-prefers
|
|
|
1870 (< n emerge-number-of-differences)
|
|
|
1871 (memq (aref (aref emerge-difference-list n) 6)
|
|
|
1872 '(prefer-A prefer-B)))
|
|
|
1873 (setq n (1+ n)))
|
|
|
1874 (let ((buffer-read-only nil))
|
|
|
1875 (emerge-unselect-and-select-difference n)))
|
|
|
1876 (error "At end")))
|
|
|
1877
|
|
|
1878 (defun emerge-previous-difference ()
|
|
|
1879 "Go to the previous difference."
|
|
|
1880 (interactive)
|
|
|
1881 (if (> emerge-current-difference -1)
|
|
|
1882 (let ((n (1- emerge-current-difference)))
|
|
|
1883 (while (and emerge-skip-prefers
|
|
|
1884 (> n -1)
|
|
|
1885 (memq (aref (aref emerge-difference-list n) 6)
|
|
|
1886 '(prefer-A prefer-B)))
|
|
|
1887 (setq n (1- n)))
|
|
|
1888 (let ((buffer-read-only nil))
|
|
|
1889 (emerge-unselect-and-select-difference n)))
|
|
|
1890 (error "At beginning")))
|
|
|
1891
|
|
|
1892 (defun emerge-jump-to-difference (difference-number)
|
|
|
1893 "Go to the N-th difference."
|
|
|
1894 (interactive "p")
|
|
|
1895 (let ((buffer-read-only nil))
|
|
|
1896 (setq difference-number (1- difference-number))
|
|
|
1897 (if (and (>= difference-number -1)
|
|
|
1898 (< difference-number (1+ emerge-number-of-differences)))
|
|
|
1899 (emerge-unselect-and-select-difference difference-number)
|
|
|
1900 (error "Bad difference number"))))
|
|
|
1901
|
|
|
1902 (defun emerge-abort ()
|
|
|
1903 "Abort the Emerge session."
|
|
|
1904 (interactive)
|
|
|
1905 (emerge-quit t))
|
|
|
1906
|
|
|
1907 (defun emerge-quit (arg)
|
|
|
1908 "Finish the Emerge session and exit Emerge.
|
|
|
1909 Prefix argument means to abort rather than successfully finish.
|
|
|
1910 The difference depends on how the merge was started,
|
|
|
1911 but usually means to not write over one of the original files, or to signal
|
|
|
1912 to some process which invoked Emerge a failure code.
|
|
|
1913
|
|
|
1914 Unselects the selected difference, if any, restores the read-only and modified
|
|
|
1915 flags of the merged file buffers, restores the local keymap of the merge
|
|
|
1916 buffer, and sets off various emerge flags. Using Emerge commands in this
|
|
|
1917 buffer after this will cause serious problems."
|
|
|
1918 (interactive "P")
|
|
|
1919 (if (prog1
|
|
|
1920 (y-or-n-p
|
|
|
1921 (if (not arg)
|
|
|
1922 "Do you really want to successfully finish this merge? "
|
|
|
1923 "Do you really want to abort this merge? "))
|
|
|
1924 (message ""))
|
|
|
1925 (emerge-really-quit arg)))
|
|
|
1926
|
|
|
1927 ;; Perform the quit operations.
|
|
|
1928 (defun emerge-really-quit (arg)
|
|
|
1929 (setq buffer-read-only nil)
|
|
|
1930 (emerge-unselect-and-select-difference -1)
|
|
|
1931 (emerge-restore-buffer-characteristics)
|
|
|
1932 ;; null out the difference markers so they don't slow down future editing
|
|
|
1933 ;; operations
|
|
|
1934 (mapcar (function (lambda (d)
|
|
|
1935 (set-marker (aref d 0) nil)
|
|
|
1936 (set-marker (aref d 1) nil)
|
|
|
1937 (set-marker (aref d 2) nil)
|
|
|
1938 (set-marker (aref d 3) nil)
|
|
|
1939 (set-marker (aref d 4) nil)
|
|
|
1940 (set-marker (aref d 5) nil)))
|
|
|
1941 emerge-difference-list)
|
|
|
1942 ;; allow them to be garbage collected
|
|
|
1943 (setq emerge-difference-list nil)
|
|
|
1944 ;; restore the menubar
|
|
|
1945 ;; don't make the menubar become un-local because the major mode might
|
|
|
1946 ;; have already made it local and added an item.
|
|
|
1947 (delete-menu-item '("Emerge"))
|
|
|
1948 ;; restore the local map
|
|
|
1949 (use-local-map emerge-old-keymap)
|
|
|
1950 ;; turn off all the emerge modes
|
|
|
1951 (setq emerge-mode nil)
|
|
|
1952 (setq emerge-fast-mode nil)
|
|
|
1953 (setq emerge-edit-mode nil)
|
|
|
1954 (setq emerge-auto-advance nil)
|
|
|
1955 (setq emerge-skip-prefers nil)
|
|
|
1956 ;; restore mode line
|
|
|
1957 (kill-local-variable 'mode-line-buffer-identification)
|
|
|
1958 (let ((emerge-prefix-argument arg))
|
|
|
1959 (run-hooks 'emerge-quit-hook)))
|
|
|
1960
|
|
|
1961 (defun emerge-select-A (&optional force)
|
|
|
1962 "Select the A variant of this difference.
|
|
|
1963 Refuses to function if this difference has been edited, i.e., if it
|
|
|
1964 is neither the A nor the B variant.
|
|
|
1965 A prefix argument forces the variant to be selected
|
|
|
1966 even if the difference has been edited."
|
|
|
1967 (interactive "P")
|
|
|
1968 (let ((operate
|
|
|
1969 (function (lambda ()
|
|
|
1970 (emerge-select-A-edit merge-begin merge-end A-begin A-end)
|
|
|
1971 (if emerge-auto-advance
|
|
|
1972 (emerge-next-difference)))))
|
|
|
1973 (operate-no-change
|
|
|
1974 (function (lambda ()
|
|
|
1975 (if emerge-auto-advance
|
|
|
1976 (emerge-next-difference))))))
|
|
|
1977 (emerge-select-version force operate-no-change operate operate)))
|
|
|
1978
|
|
|
1979 ;; Actually select the A variant
|
|
|
1980 (defun emerge-select-A-edit (merge-begin merge-end A-begin A-end)
|
|
|
1981 (emerge-eval-in-buffer
|
|
|
1982 emerge-merge-buffer
|
|
|
1983 (delete-region merge-begin merge-end)
|
|
|
1984 (goto-char merge-begin)
|
|
|
1985 (insert-buffer-substring emerge-A-buffer A-begin A-end)
|
|
|
1986 (goto-char merge-begin)
|
|
|
1987 (aset diff-vector 6 'A)
|
|
|
1988 (emerge-refresh-mode-line)))
|
|
|
1989
|
|
|
1990 (defun emerge-select-B (&optional force)
|
|
|
1991 "Select the B variant of this difference.
|
|
|
1992 Refuses to function if this difference has been edited, i.e., if it
|
|
|
1993 is neither the A nor the B variant.
|
|
|
1994 A prefix argument forces the variant to be selected
|
|
|
1995 even if the difference has been edited."
|
|
|
1996 (interactive "P")
|
|
|
1997 (let ((operate
|
|
|
1998 (function (lambda ()
|
|
|
1999 (emerge-select-B-edit merge-begin merge-end B-begin B-end)
|
|
|
2000 (if emerge-auto-advance
|
|
|
2001 (emerge-next-difference)))))
|
|
|
2002 (operate-no-change
|
|
|
2003 (function (lambda ()
|
|
|
2004 (if emerge-auto-advance
|
|
|
2005 (emerge-next-difference))))))
|
|
|
2006 (emerge-select-version force operate operate-no-change operate)))
|
|
|
2007
|
|
|
2008 ;; Actually select the B variant
|
|
|
2009 (defun emerge-select-B-edit (merge-begin merge-end B-begin B-end)
|
|
|
2010 (emerge-eval-in-buffer
|
|
|
2011 emerge-merge-buffer
|
|
|
2012 (delete-region merge-begin merge-end)
|
|
|
2013 (goto-char merge-begin)
|
|
|
2014 (insert-buffer-substring emerge-B-buffer B-begin B-end)
|
|
|
2015 (goto-char merge-begin)
|
|
|
2016 (aset diff-vector 6 'B)
|
|
|
2017 (emerge-refresh-mode-line)))
|
|
|
2018
|
|
|
2019 (defun emerge-default-A (force)
|
|
|
2020 "Make the A variant the default from here down.
|
|
|
2021 This selects the A variant for all differences from here down in the buffer
|
|
|
2022 which are still defaulted, i.e., which the user has not selected and for
|
|
|
2023 which there is no preference.
|
|
|
2024 A prefix argument forces all differences from here down that have
|
|
|
2025 selected the B version to become default-A as well."
|
|
|
2026 (interactive "P")
|
|
|
2027 (let ((buffer-read-only nil))
|
|
|
2028 (let ((selected-difference emerge-current-difference)
|
|
|
2029 (n (max emerge-current-difference 0)))
|
|
|
2030 (while (< n emerge-number-of-differences)
|
|
|
2031 (let ((diff-vector (aref emerge-difference-list n)))
|
|
|
2032 (if (or (eq (aref diff-vector 6) 'default-B)
|
|
|
2033 (and force
|
|
|
2034 (eq (aref diff-vector 6) 'B)))
|
|
|
2035 (progn
|
|
|
2036 (emerge-unselect-and-select-difference n t)
|
|
|
2037 (emerge-select-A force)
|
|
|
2038 (aset diff-vector 6 'default-A))))
|
|
|
2039 (setq n (1+ n))
|
|
|
2040 (if (zerop (% n 10))
|
|
|
2041 (message "Setting default to A...%d" n)))
|
|
|
2042 (emerge-unselect-and-select-difference selected-difference)))
|
|
|
2043 (message "Default choice is now A"))
|
|
|
2044
|
|
|
2045 (defun emerge-default-B (force)
|
|
|
2046 "Make the B variant the default from here down.
|
|
|
2047 This selects the B variant for all differences from here down in the buffer
|
|
|
2048 which are still defaulted, i.e., which the user has not selected and for
|
|
|
2049 which there is no preference.
|
|
|
2050 A prefix argument forces all differences from here down that have
|
|
|
2051 selected the A version to become default-B as well."
|
|
|
2052 (interactive "P")
|
|
|
2053 (let ((buffer-read-only nil))
|
|
|
2054 (let ((selected-difference emerge-current-difference)
|
|
|
2055 (n (max emerge-current-difference 0)))
|
|
|
2056 (while (< n emerge-number-of-differences)
|
|
|
2057 (let ((diff-vector (aref emerge-difference-list n)))
|
|
|
2058 (if (or (eq (aref diff-vector 6) 'default-A)
|
|
|
2059 (and force
|
|
|
2060 (eq (aref diff-vector 6) 'A)))
|
|
|
2061 (progn
|
|
|
2062 (emerge-unselect-and-select-difference n t)
|
|
|
2063 (emerge-select-B force)
|
|
|
2064 (aset diff-vector 6 'default-B))))
|
|
|
2065 (setq n (1+ n))
|
|
|
2066 (if (zerop (% n 10))
|
|
|
2067 (message "Setting default to B...%d" n)))
|
|
|
2068 (emerge-unselect-and-select-difference selected-difference)))
|
|
|
2069 (message "Default choice is now B"))
|
|
|
2070
|
|
|
2071 (defun emerge-fast-mode ()
|
|
|
2072 "Set fast mode, for Emerge.
|
|
|
2073 In this mode ordinary Emacs commands are disabled, and Emerge commands
|
|
|
2074 need not be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]."
|
|
|
2075 (interactive)
|
|
|
2076 (setq buffer-read-only t)
|
|
|
2077 (use-local-map emerge-fast-keymap)
|
|
|
2078 (setq emerge-mode t)
|
|
|
2079 (setq emerge-fast-mode t)
|
|
|
2080 (setq emerge-edit-mode nil)
|
|
|
2081 (message "Fast mode set")
|
|
|
2082 (force-mode-line-update))
|
|
|
2083
|
|
|
2084 (defun emerge-edit-mode ()
|
|
|
2085 "Set edit mode, for Emerge.
|
|
|
2086 In this mode ordinary Emacs commands are available, and Emerge commands
|
|
|
2087 must be prefixed with \\<emerge-fast-keymap>\\[emerge-basic-keymap]."
|
|
|
2088 (interactive)
|
|
|
2089 (setq buffer-read-only nil)
|
|
|
2090 (use-local-map emerge-edit-keymap)
|
|
|
2091 (setq emerge-mode t)
|
|
|
2092 (setq emerge-fast-mode nil)
|
|
|
2093 (setq emerge-edit-mode t)
|
|
|
2094 (message "Edit mode set")
|
|
|
2095 (force-mode-line-update))
|
|
|
2096
|
|
|
2097 (defun emerge-auto-advance (arg)
|
|
|
2098 "Toggle Auto-Advance mode, for Emerge.
|
|
|
2099 This mode causes `emerge-select-A' and `emerge-select-B' to automatically
|
|
|
2100 advance to the next difference.
|
|
|
2101 With a positive argument, turn on Auto-Advance mode.
|
|
|
2102 With a negative argument, turn off Auto-Advance mode."
|
|
|
2103 (interactive "P")
|
|
|
2104 (setq emerge-auto-advance (if (null arg)
|
|
|
2105 (not emerge-auto-advance)
|
|
|
2106 (> (prefix-numeric-value arg) 0)))
|
|
|
2107 (message (if emerge-auto-advance
|
|
|
2108 "Auto-advance set"
|
|
|
2109 "Auto-advance cleared"))
|
|
|
2110 (force-mode-line-update))
|
|
|
2111
|
|
|
2112 (defun emerge-skip-prefers (arg)
|
|
|
2113 "Toggle Skip-Prefers mode, for Emerge.
|
|
|
2114 This mode causes `emerge-next-difference' and `emerge-previous-difference'
|
|
|
2115 to automatically skip over differences for which there is a preference.
|
|
|
2116 With a positive argument, turn on Skip-Prefers mode.
|
|
|
2117 With a negative argument, turn off Skip-Prefers mode."
|
|
|
2118 (interactive "P")
|
|
|
2119 (setq emerge-skip-prefers (if (null arg)
|
|
|
2120 (not emerge-skip-prefers)
|
|
|
2121 (> (prefix-numeric-value arg) 0)))
|
|
|
2122 (message (if emerge-skip-prefers
|
|
|
2123 "Skip-prefers set"
|
|
|
2124 "Skip-prefers cleared"))
|
|
|
2125 (force-mode-line-update))
|
|
|
2126
|
|
|
2127 (defun emerge-copy-as-kill-A ()
|
|
|
2128 "Put the A variant of this difference in the kill ring."
|
|
|
2129 (interactive)
|
|
|
2130 (emerge-validate-difference)
|
|
|
2131 (let* ((diff-vector
|
|
|
2132 (aref emerge-difference-list emerge-current-difference))
|
|
|
2133 (A-begin (1+ (aref diff-vector 0)))
|
|
|
2134 (A-end (1- (aref diff-vector 1)))
|
|
|
2135 ;; so further kills don't append
|
|
|
2136 this-command)
|
|
|
2137 (save-excursion
|
|
|
2138 (set-buffer emerge-A-buffer)
|
|
|
2139 (copy-region-as-kill A-begin A-end))))
|
|
|
2140
|
|
|
2141 (defun emerge-copy-as-kill-B ()
|
|
|
2142 "Put the B variant of this difference in the kill ring."
|
|
|
2143 (interactive)
|
|
|
2144 (emerge-validate-difference)
|
|
|
2145 (let* ((diff-vector
|
|
|
2146 (aref emerge-difference-list emerge-current-difference))
|
|
|
2147 (B-begin (1+ (aref diff-vector 2)))
|
|
|
2148 (B-end (1- (aref diff-vector 3)))
|
|
|
2149 ;; so further kills don't append
|
|
|
2150 this-command)
|
|
|
2151 (save-excursion
|
|
|
2152 (set-buffer emerge-B-buffer)
|
|
|
2153 (copy-region-as-kill B-begin B-end))))
|
|
|
2154
|
|
|
2155 (defun emerge-insert-A (arg)
|
|
|
2156 "Insert the A variant of this difference at the point.
|
|
|
2157 Leaves point after text, mark before.
|
|
|
2158 With prefix argument, puts point before, mark after."
|
|
|
2159 (interactive "P")
|
|
|
2160 (emerge-validate-difference)
|
|
|
2161 (let* ((diff-vector
|
|
|
2162 (aref emerge-difference-list emerge-current-difference))
|
|
|
2163 (A-begin (1+ (aref diff-vector 0)))
|
|
|
2164 (A-end (1- (aref diff-vector 1)))
|
|
|
2165 (opoint (point))
|
|
|
2166 (buffer-read-only nil))
|
|
|
2167 (insert-buffer-substring emerge-A-buffer A-begin A-end)
|
|
|
2168 (if (not arg)
|
|
|
2169 (set-mark opoint)
|
|
|
2170 (set-mark (point))
|
|
|
2171 (goto-char opoint))))
|
|
|
2172
|
|
|
2173 (defun emerge-insert-B (arg)
|
|
|
2174 "Insert the B variant of this difference at the point.
|
|
|
2175 Leaves point after text, mark before.
|
|
|
2176 With prefix argument, puts point before, mark after."
|
|
|
2177 (interactive "P")
|
|
|
2178 (emerge-validate-difference)
|
|
|
2179 (let* ((diff-vector
|
|
|
2180 (aref emerge-difference-list emerge-current-difference))
|
|
|
2181 (B-begin (1+ (aref diff-vector 2)))
|
|
|
2182 (B-end (1- (aref diff-vector 3)))
|
|
|
2183 (opoint (point))
|
|
|
2184 (buffer-read-only nil))
|
|
|
2185 (insert-buffer-substring emerge-B-buffer B-begin B-end)
|
|
|
2186 (if (not arg)
|
|
|
2187 (set-mark opoint)
|
|
|
2188 (set-mark (point))
|
|
|
2189 (goto-char opoint))))
|
|
|
2190
|
|
|
2191 (defun emerge-mark-difference (arg)
|
|
|
2192 "Leaves the point before this difference and the mark after it.
|
|
|
2193 With prefix argument, puts mark before, point after."
|
|
|
2194 (interactive "P")
|
|
|
2195 (emerge-validate-difference)
|
|
|
2196 (let* ((diff-vector
|
|
|
2197 (aref emerge-difference-list emerge-current-difference))
|
|
|
2198 (merge-begin (1+ (aref diff-vector 4)))
|
|
|
2199 (merge-end (1- (aref diff-vector 5))))
|
|
|
2200 (if (not arg)
|
|
|
2201 (progn
|
|
|
2202 (goto-char merge-begin)
|
|
|
2203 (set-mark merge-end))
|
|
|
2204 (goto-char merge-end)
|
|
|
2205 (set-mark merge-begin))))
|
|
|
2206
|
|
|
2207 (defun emerge-file-names ()
|
|
|
2208 "Show the names of the buffers or files being operated on by Emerge.
|
|
|
2209 Use C-u l to reset the windows afterward."
|
|
|
2210 (interactive)
|
|
|
2211 (delete-other-windows)
|
|
|
2212 (let ((temp-buffer-show-function
|
|
|
2213 (function
|
|
|
2214 (lambda (buf)
|
|
|
2215 ;; in v18, split-window and split-window-vertically were the same,
|
|
|
2216 ;; but in v19, split-window-vertically might select the other
|
|
|
2217 ;; window.
|
|
|
2218 ;; (split-window-vertically)
|
|
|
2219 (switch-to-buffer buf)
|
|
|
2220 (other-window 1)))))
|
|
|
2221 (with-output-to-temp-buffer "*Help*"
|
|
|
2222 (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2223 (if buffer-file-name
|
|
|
2224 (progn
|
|
|
2225 (princ "File A is: ")
|
|
|
2226 (princ buffer-file-name))
|
|
|
2227 (progn
|
|
|
2228 (princ "Buffer A is: ")
|
|
|
2229 (princ (buffer-name))))
|
|
|
2230 (princ "\n"))
|
|
|
2231 (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2232 (if buffer-file-name
|
|
|
2233 (progn
|
|
|
2234 (princ "File B is: ")
|
|
|
2235 (princ buffer-file-name))
|
|
|
2236 (progn
|
|
|
2237 (princ "Buffer B is: ")
|
|
|
2238 (princ (buffer-name))))
|
|
|
2239 (princ "\n"))
|
|
|
2240 (if emerge-ancestor-buffer
|
|
|
2241 (emerge-eval-in-buffer emerge-ancestor-buffer
|
|
|
2242 (if buffer-file-name
|
|
|
2243 (progn
|
|
|
2244 (princ "Ancestor file is: ")
|
|
|
2245 (princ buffer-file-name))
|
|
|
2246 (progn
|
|
|
2247 (princ "Ancestor buffer is: ")
|
|
|
2248 (princ (buffer-name))))
|
|
|
2249 (princ "\n")))
|
|
|
2250 (princ emerge-output-description)
|
|
|
2251 (save-excursion
|
|
|
2252 (set-buffer standard-output)
|
|
|
2253 (help-mode)))))
|
|
|
2254
|
|
|
2255 (defun emerge-join-differences (arg)
|
|
|
2256 "Join the selected difference with the following one.
|
|
|
2257 With a prefix argument, join with the preceding one."
|
|
|
2258 (interactive "P")
|
|
|
2259 (let ((n emerge-current-difference))
|
|
|
2260 ;; adjust n to be first difference to join
|
|
|
2261 (if arg
|
|
|
2262 (setq n (1- n)))
|
|
|
2263 ;; n and n+1 are the differences to join
|
|
|
2264 ;; check that they are both differences
|
|
|
2265 (if (or (< n 0) (>= n (1- emerge-number-of-differences)))
|
|
|
2266 (error "Incorrect differences to join"))
|
|
|
2267 ;; remove the flags
|
|
|
2268 (emerge-unselect-difference emerge-current-difference)
|
|
|
2269 ;; decrement total number of differences
|
|
|
2270 (setq emerge-number-of-differences (1- emerge-number-of-differences))
|
|
|
2271 ;; build new differences vector
|
|
|
2272 (let ((i 0)
|
|
|
2273 (new-differences (make-vector emerge-number-of-differences nil)))
|
|
|
2274 (while (< i emerge-number-of-differences)
|
|
|
2275 (aset new-differences i
|
|
|
2276 (cond
|
|
|
2277 ((< i n) (aref emerge-difference-list i))
|
|
|
2278 ((> i n) (aref emerge-difference-list (1+ i)))
|
|
|
2279 (t (let ((prev (aref emerge-difference-list i))
|
|
|
2280 (next (aref emerge-difference-list (1+ i))))
|
|
|
2281 (vector (aref prev 0)
|
|
|
2282 (aref next 1)
|
|
|
2283 (aref prev 2)
|
|
|
2284 (aref next 3)
|
|
|
2285 (aref prev 4)
|
|
|
2286 (aref next 5)
|
|
|
2287 (let ((ps (aref prev 6))
|
|
|
2288 (ns (aref next 6)))
|
|
|
2289 (cond
|
|
|
2290 ((eq ps ns)
|
|
|
2291 ps)
|
|
|
2292 ((and (or (eq ps 'B) (eq ps 'prefer-B))
|
|
|
2293 (or (eq ns 'B) (eq ns 'prefer-B)))
|
|
|
2294 'B)
|
|
|
2295 (t 'A))))))))
|
|
|
2296 (setq i (1+ i)))
|
|
|
2297 (setq emerge-difference-list new-differences))
|
|
|
2298 ;; set the current difference correctly
|
|
|
2299 (setq emerge-current-difference n)
|
|
|
2300 ;; fix the mode line
|
|
|
2301 (emerge-refresh-mode-line)
|
|
|
2302 ;; reinsert the flags
|
|
|
2303 (emerge-select-difference emerge-current-difference)
|
|
|
2304 (emerge-recenter)))
|
|
|
2305
|
|
|
2306 (defun emerge-split-difference ()
|
|
|
2307 "Split the current difference where the points are in the three windows."
|
|
|
2308 (interactive)
|
|
|
2309 (let ((n emerge-current-difference))
|
|
|
2310 ;; check that this is a valid difference
|
|
|
2311 (emerge-validate-difference)
|
|
|
2312 ;; get the point values and old difference
|
|
|
2313 (let ((A-point (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2314 (point-marker)))
|
|
|
2315 (B-point (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2316 (point-marker)))
|
|
|
2317 (merge-point (point-marker))
|
|
|
2318 (old-diff (aref emerge-difference-list n)))
|
|
|
2319 ;; check location of the points, give error if they aren't in the
|
|
|
2320 ;; differences
|
|
|
2321 (if (or (< A-point (aref old-diff 0))
|
|
|
2322 (> A-point (aref old-diff 1)))
|
|
|
2323 (error "Point outside of difference in A buffer"))
|
|
|
2324 (if (or (< B-point (aref old-diff 2))
|
|
|
2325 (> B-point (aref old-diff 3)))
|
|
|
2326 (error "Point outside of difference in B buffer"))
|
|
|
2327 (if (or (< merge-point (aref old-diff 4))
|
|
|
2328 (> merge-point (aref old-diff 5)))
|
|
|
2329 (error "Point outside of difference in merge buffer"))
|
|
|
2330 ;; remove the flags
|
|
|
2331 (emerge-unselect-difference emerge-current-difference)
|
|
|
2332 ;; increment total number of differences
|
|
|
2333 (setq emerge-number-of-differences (1+ emerge-number-of-differences))
|
|
|
2334 ;; build new differences vector
|
|
|
2335 (let ((i 0)
|
|
|
2336 (new-differences (make-vector emerge-number-of-differences nil)))
|
|
|
2337 (while (< i emerge-number-of-differences)
|
|
|
2338 (aset new-differences i
|
|
|
2339 (cond
|
|
|
2340 ((< i n)
|
|
|
2341 (aref emerge-difference-list i))
|
|
|
2342 ((> i (1+ n))
|
|
|
2343 (aref emerge-difference-list (1- i)))
|
|
|
2344 ((= i n)
|
|
|
2345 (vector (aref old-diff 0)
|
|
|
2346 A-point
|
|
|
2347 (aref old-diff 2)
|
|
|
2348 B-point
|
|
|
2349 (aref old-diff 4)
|
|
|
2350 merge-point
|
|
|
2351 (aref old-diff 6)))
|
|
|
2352 (t
|
|
|
2353 (vector (copy-marker A-point)
|
|
|
2354 (aref old-diff 1)
|
|
|
2355 (copy-marker B-point)
|
|
|
2356 (aref old-diff 3)
|
|
|
2357 (copy-marker merge-point)
|
|
|
2358 (aref old-diff 5)
|
|
|
2359 (aref old-diff 6)))))
|
|
|
2360 (setq i (1+ i)))
|
|
|
2361 (setq emerge-difference-list new-differences))
|
|
|
2362 ;; set the current difference correctly
|
|
|
2363 (setq emerge-current-difference n)
|
|
|
2364 ;; fix the mode line
|
|
|
2365 (emerge-refresh-mode-line)
|
|
|
2366 ;; reinsert the flags
|
|
|
2367 (emerge-select-difference emerge-current-difference)
|
|
|
2368 (emerge-recenter))))
|
|
|
2369
|
|
|
2370 (defun emerge-trim-difference ()
|
|
|
2371 "Trim lines off top and bottom of difference that are the same.
|
|
|
2372 If lines are the same in both the A and the B versions, strip them off.
|
|
|
2373 \(This can happen when the A and B versions have common lines that the
|
|
|
2374 ancestor version does not share.)"
|
|
|
2375 (interactive)
|
|
|
2376 ;; make sure we are in a real difference
|
|
|
2377 (emerge-validate-difference)
|
|
|
2378 ;; remove the flags
|
|
|
2379 (emerge-unselect-difference emerge-current-difference)
|
|
|
2380 (let* ((diff (aref emerge-difference-list emerge-current-difference))
|
|
|
2381 (top-a (marker-position (aref diff 0)))
|
|
|
2382 (bottom-a (marker-position (aref diff 1)))
|
|
|
2383 (top-b (marker-position (aref diff 2)))
|
|
|
2384 (bottom-b (marker-position (aref diff 3)))
|
|
|
2385 (top-m (marker-position (aref diff 4)))
|
|
|
2386 (bottom-m (marker-position (aref diff 5)))
|
|
|
2387 size success sa sb sm)
|
|
|
2388 ;; move down the tops of the difference regions as much as possible
|
|
|
2389 ;; Try advancing comparing 1000 chars at a time.
|
|
|
2390 ;; When that fails, go 500 chars at a time, and so on.
|
|
|
2391 (setq size 1000)
|
|
|
2392 (while (> size 0)
|
|
|
2393 (setq success t)
|
|
|
2394 (while success
|
|
|
2395 (setq size (min size (- bottom-a top-a) (- bottom-b top-b)
|
|
|
2396 (- bottom-m top-m)))
|
|
|
2397 (setq sa (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2398 (buffer-substring top-a
|
|
|
2399 (+ size top-a))))
|
|
|
2400 (setq sb (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2401 (buffer-substring top-b
|
|
|
2402 (+ size top-b))))
|
|
|
2403 (setq sm (buffer-substring top-m (+ size top-m)))
|
|
|
2404 (setq success (and (> size 0) (equal sa sb) (equal sb sm)))
|
|
|
2405 (if success
|
|
|
2406 (setq top-a (+ top-a size)
|
|
|
2407 top-b (+ top-b size)
|
|
|
2408 top-m (+ top-m size))))
|
|
|
2409 (setq size (/ size 2)))
|
|
|
2410 ;; move up the bottoms of the difference regions as much as possible
|
|
|
2411 ;; Try advancing comparing 1000 chars at a time.
|
|
|
2412 ;; When that fails, go 500 chars at a time, and so on.
|
|
|
2413 (setq size 1000)
|
|
|
2414 (while (> size 0)
|
|
|
2415 (setq success t)
|
|
|
2416 (while success
|
|
|
2417 (setq size (min size (- bottom-a top-a) (- bottom-b top-b)
|
|
|
2418 (- bottom-m top-m)))
|
|
|
2419 (setq sa (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2420 (buffer-substring (- bottom-a size)
|
|
|
2421 bottom-a)))
|
|
|
2422 (setq sb (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2423 (buffer-substring (- bottom-b size)
|
|
|
2424 bottom-b)))
|
|
|
2425 (setq sm (buffer-substring (- bottom-m size) bottom-m))
|
|
|
2426 (setq success (and (> size 0) (equal sa sb) (equal sb sm)))
|
|
|
2427 (if success
|
|
|
2428 (setq bottom-a (- bottom-a size)
|
|
|
2429 bottom-b (- bottom-b size)
|
|
|
2430 bottom-m (- bottom-m size))))
|
|
|
2431 (setq size (/ size 2)))
|
|
|
2432 ;; {top,bottom}-{a,b,m} are now set at the new beginnings and ends
|
|
|
2433 ;; of the difference regions. Move them to the beginning of lines, as
|
|
|
2434 ;; appropriate.
|
|
|
2435 (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2436 (goto-char top-a)
|
|
|
2437 (beginning-of-line)
|
|
|
2438 (aset diff 0 (point-marker))
|
|
|
2439 (goto-char bottom-a)
|
|
|
2440 (beginning-of-line 2)
|
|
|
2441 (aset diff 1 (point-marker)))
|
|
|
2442 (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2443 (goto-char top-b)
|
|
|
2444 (beginning-of-line)
|
|
|
2445 (aset diff 2 (point-marker))
|
|
|
2446 (goto-char bottom-b)
|
|
|
2447 (beginning-of-line 2)
|
|
|
2448 (aset diff 3 (point-marker)))
|
|
|
2449 (goto-char top-m)
|
|
|
2450 (beginning-of-line)
|
|
|
2451 (aset diff 4 (point-marker))
|
|
|
2452 (goto-char bottom-m)
|
|
|
2453 (beginning-of-line 2)
|
|
|
2454 (aset diff 5 (point-marker))
|
|
|
2455 ;; put the flags back in, recenter the display
|
|
|
2456 (emerge-select-difference emerge-current-difference)
|
|
|
2457 (emerge-recenter)))
|
|
|
2458
|
|
|
2459 (defun emerge-find-difference (arg)
|
|
|
2460 "Find the difference containing the current position of the point.
|
|
|
2461 If there is no containing difference and the prefix argument is positive,
|
|
|
2462 it finds the nearest following difference. A negative prefix argument finds
|
|
|
2463 the nearest previous difference."
|
|
|
2464 (interactive "P")
|
|
|
2465 ;; search for the point in the merge buffer, using the markers
|
|
|
2466 ;; for the beginning and end of the differences in the merge buffer
|
|
|
2467 (cond ((eq (current-buffer) emerge-A-buffer)
|
|
|
2468 (emerge-find-difference-A arg))
|
|
|
2469 ((eq (current-buffer) emerge-B-buffer)
|
|
|
2470 (emerge-find-difference-B arg))
|
|
|
2471 (t (emerge-find-difference-merge arg))))
|
|
|
2472
|
|
|
2473 (defun emerge-find-difference-merge (arg)
|
|
|
2474 "Find the difference containing point, in the merge buffer.
|
|
|
2475 If there is no containing difference and the prefix argument is positive,
|
|
|
2476 it finds the nearest following difference. A negative prefix argument finds
|
|
|
2477 the nearest previous difference."
|
|
|
2478 (interactive "P")
|
|
|
2479 ;; search for the point in the merge buffer, using the markers
|
|
|
2480 ;; for the beginning and end of the differences in the merge buffer
|
|
|
2481 (emerge-find-difference1 arg (point) 4 5))
|
|
|
2482
|
|
|
2483 (defun emerge-find-difference-A (arg)
|
|
|
2484 "Find the difference containing point, in the A buffer.
|
|
|
2485 This command must be executed in the merge buffer.
|
|
|
2486 If there is no containing difference and the prefix argument is positive,
|
|
|
2487 it finds the nearest following difference. A negative prefix argument finds
|
|
|
2488 the nearest previous difference."
|
|
|
2489 (interactive "P")
|
|
|
2490 ;; search for the point in the A buffer, using the markers
|
|
|
2491 ;; for the beginning and end of the differences in the A buffer
|
|
|
2492 (emerge-find-difference1 arg
|
|
|
2493 (emerge-eval-in-buffer emerge-A-buffer (point))
|
|
|
2494 0 1))
|
|
|
2495
|
|
|
2496 (defun emerge-find-difference-B (arg)
|
|
|
2497 "Find the difference containing point, in the B buffer.
|
|
|
2498 This command must be executed in the merge buffer.
|
|
|
2499 If there is no containing difference and the prefix argument is positive,
|
|
|
2500 it finds the nearest following difference. A negative prefix argument finds
|
|
|
2501 the nearest previous difference."
|
|
|
2502 (interactive "P")
|
|
|
2503 ;; search for the point in the B buffer, using the markers
|
|
|
2504 ;; for the beginning and end of the differences in the B buffer
|
|
|
2505 (emerge-find-difference1 arg
|
|
|
2506 (emerge-eval-in-buffer emerge-B-buffer (point))
|
|
|
2507 2 3))
|
|
|
2508
|
|
|
2509 (defun emerge-find-difference1 (arg location begin end)
|
|
|
2510 (let* ((index
|
|
|
2511 ;; find first difference containing or after the current position
|
|
|
2512 (catch 'search
|
|
|
2513 (let ((n 0))
|
|
|
2514 (while (< n emerge-number-of-differences)
|
|
|
2515 (let ((diff-vector (aref emerge-difference-list n)))
|
|
|
2516 (if (<= location (marker-position (aref diff-vector end)))
|
|
|
2517 (throw 'search n)))
|
|
|
2518 (setq n (1+ n))))
|
|
|
2519 emerge-number-of-differences))
|
|
|
2520 (contains
|
|
|
2521 ;; whether the found difference contains the current position
|
|
|
2522 (and (< index emerge-number-of-differences)
|
|
|
2523 (<= (marker-position (aref (aref emerge-difference-list index)
|
|
|
2524 begin))
|
|
|
2525 location)))
|
|
|
2526 (arg-value
|
|
|
2527 ;; numeric value of prefix argument
|
|
|
2528 (prefix-numeric-value arg)))
|
|
|
2529 (emerge-unselect-and-select-difference
|
|
|
2530 (cond
|
|
|
2531 ;; if the point is in a difference, select it
|
|
|
2532 (contains index)
|
|
|
2533 ;; if the arg is nil and the point is not in a difference, error
|
|
|
2534 ((null arg) (error "No difference contains point"))
|
|
|
2535 ;; if the arg is positive, select the following difference
|
|
|
2536 ((> arg-value 0)
|
|
|
2537 (if (< index emerge-number-of-differences)
|
|
|
2538 index
|
|
|
2539 (error "No difference contains or follows point")))
|
|
|
2540 ;; if the arg is negative, select the preceding difference
|
|
|
2541 (t
|
|
|
2542 (if (> index 0)
|
|
|
2543 (1- index)
|
|
|
2544 (error "No difference contains or precedes point")))))))
|
|
|
2545
|
|
|
2546 (defun emerge-line-numbers ()
|
|
|
2547 "Display the current line numbers.
|
|
|
2548 This function displays the line numbers of the points in the A, B, and
|
|
|
2549 merge buffers."
|
|
|
2550 (interactive)
|
|
|
2551 (let* ((valid-diff
|
|
|
2552 (and (>= emerge-current-difference 0)
|
|
|
2553 (< emerge-current-difference emerge-number-of-differences)))
|
|
|
2554 (diff (and valid-diff
|
|
|
2555 (aref emerge-difference-list emerge-current-difference)))
|
|
|
2556 (merge-line (emerge-line-number-in-buf 4 5))
|
|
|
2557 (A-line (emerge-eval-in-buffer emerge-A-buffer
|
|
|
2558 (emerge-line-number-in-buf 0 1)))
|
|
|
2559 (B-line (emerge-eval-in-buffer emerge-B-buffer
|
|
|
2560 (emerge-line-number-in-buf 2 3))))
|
|
|
2561 (message "At lines: merge = %d, A = %d, B = %d"
|
|
|
2562 merge-line A-line B-line)))
|
|
|
2563
|
|
|
2564 (defun emerge-line-number-in-buf (begin-marker end-marker)
|
|
|
2565 (let (temp)
|
|
|
2566 (setq temp (save-excursion
|
|
|
2567 (beginning-of-line)
|
|
|
2568 (1+ (count-lines 1 (point)))))
|
|
|
2569 (if valid-diff
|
|
|
2570 (progn
|
|
|
2571 (if (> (point) (aref diff begin-marker))
|
|
|
2572 (setq temp (- temp emerge-before-flag-lines)))
|
|
|
2573 (if (> (point) (aref diff end-marker))
|
|
|
2574 (setq temp (- temp emerge-after-flag-lines)))))
|
|
|
2575 temp))
|
|
|
2576
|
|
|
2577 (defun emerge-set-combine-template (string &optional localize)
|
|
|
2578 "Set `emerge-combine-versions-template' to STRING.
|
|
|
2579 This value controls how `emerge-combine-versions' combines the two versions.
|
|
|
2580 With prefix argument, `emerge-combine-versions-template' is made local to this
|
|
|
2581 merge buffer. Localization is permanent for any particular merge buffer."
|
|
|
2582 (interactive "s\nP")
|
|
|
2583 (if localize
|
|
|
2584 (make-local-variable 'emerge-combine-versions-template))
|
|
|
2585 (setq emerge-combine-versions-template string)
|
|
|
2586 (message
|
|
|
2587 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
|
|
|
2588 "emerge-set-combine-versions-template set locally"
|
|
|
2589 "emerge-set-combine-versions-template set")))
|
|
|
2590
|
|
|
2591 (defun emerge-set-combine-versions-template (start end &optional localize)
|
|
|
2592 "Copy region into `emerge-combine-versions-template'.
|
|
|
2593 This controls how `emerge-combine-versions' will combine the two versions.
|
|
|
2594 With prefix argument, `emerge-combine-versions-template' is made local to this
|
|
|
2595 merge buffer. Localization is permanent for any particular merge buffer."
|
|
|
2596 (interactive "r\nP")
|
|
|
2597 (if localize
|
|
|
2598 (make-local-variable 'emerge-combine-versions-template))
|
|
|
2599 (setq emerge-combine-versions-template (buffer-substring start end))
|
|
|
2600 (message
|
|
|
2601 (if (assq 'emerge-combine-versions-template (buffer-local-variables))
|
|
|
2602 "emerge-set-combine-versions-template set locally."
|
|
|
2603 "emerge-set-combine-versions-template set.")))
|
|
|
2604
|
|
|
2605 (defun emerge-combine-versions (&optional force)
|
|
|
2606 "Combine versions using the template in `emerge-combine-versions-template'.
|
|
|
2607 Refuses to function if this difference has been edited, i.e., if it is
|
|
|
2608 neither the A nor the B variant.
|
|
|
2609 An argument forces the variant to be selected even if the difference has
|
|
|
2610 been edited."
|
|
|
2611 (interactive "P")
|
|
|
2612 (emerge-combine-versions-internal emerge-combine-versions-template force))
|
|
|
2613
|
|
|
2614 (defun emerge-combine-versions-register (char &optional force)
|
|
|
2615 "Combine the two versions using the template in register REG.
|
|
|
2616 See documentation of the variable `emerge-combine-versions-template'
|
|
|
2617 for how the template is interpreted.
|
|
|
2618 Refuses to function if this difference has been edited, i.e., if it is
|
|
|
2619 neither the A nor the B variant.
|
|
|
2620 An argument forces the variant to be selected even if the difference has
|
|
|
2621 been edited."
|
|
|
2622 (interactive "cRegister containing template: \nP")
|
|
|
2623 (let ((template (get-register char)))
|
|
|
2624 (if (not (stringp template))
|
|
|
2625 (error "Register does not contain text"))
|
|
|
2626 (emerge-combine-versions-internal template force)))
|
|
|
2627
|
|
|
2628 (defun emerge-combine-versions-internal (template force)
|
|
|
2629 (let ((operate
|
|
|
2630 (function (lambda ()
|
|
|
2631 (emerge-combine-versions-edit merge-begin merge-end
|
|
|
2632 A-begin A-end B-begin B-end
|
|
|
2633 template)
|
|
|
2634 (if emerge-auto-advance
|
|
|
2635 (emerge-next-difference))))))
|
|
|
2636 (emerge-select-version force operate operate operate)))
|
|
|
2637
|
|
|
2638 (defun emerge-combine-versions-edit (merge-begin merge-end
|
|
|
2639 A-begin A-end B-begin B-end
|
|
|
2640 template)
|
|
|
2641 (emerge-eval-in-buffer
|
|
|
2642 emerge-merge-buffer
|
|
|
2643 (delete-region merge-begin merge-end)
|
|
|
2644 (goto-char merge-begin)
|
|
|
2645 (let ((i 0))
|
|
|
2646 (while (< i (length template))
|
|
|
2647 (let ((c (aref template i)))
|
|
|
2648 (if (= c ?%)
|
|
|
2649 (progn
|
|
|
2650 (setq i (1+ i))
|
|
|
2651 (setq c
|
|
|
2652 (condition-case nil
|
|
|
2653 (aref template i)
|
|
|
2654 (error ?%)))
|
|
|
2655 (cond ((= c ?a)
|
|
|
2656 (insert-buffer-substring emerge-A-buffer A-begin A-end))
|
|
|
2657 ((= c ?b)
|
|
|
2658 (insert-buffer-substring emerge-B-buffer B-begin B-end))
|
|
|
2659 ((= c ?%)
|
|
|
2660 (insert ?%))
|
|
|
2661 (t
|
|
|
2662 (insert c))))
|
|
|
2663 (insert c)))
|
|
|
2664 (setq i (1+ i))))
|
|
|
2665 (goto-char merge-begin)
|
|
|
2666 (aset diff-vector 6 'combined)
|
|
|
2667 (emerge-refresh-mode-line)))
|
|
|
2668
|
|
|
2669 (defun emerge-set-merge-mode (mode)
|
|
|
2670 "Set the major mode in a merge buffer.
|
|
|
2671 Overrides any change that the mode might make to the mode line or local
|
|
|
2672 keymap. Leaves merge in fast mode."
|
|
|
2673 (interactive
|
|
|
2674 (list (intern (completing-read "New major mode for merge buffer: "
|
|
|
2675 obarray 'commandp t nil))))
|
|
|
2676 (funcall mode)
|
|
|
2677 (emerge-refresh-mode-line)
|
|
|
2678 (if emerge-fast-mode
|
|
|
2679 (emerge-fast-mode)
|
|
|
2680 (emerge-edit-mode)))
|
|
|
2681
|
|
|
2682 (defun emerge-one-line-window ()
|
|
|
2683 (interactive)
|
|
|
2684 (let ((window-min-height 1))
|
|
|
2685 (shrink-window (- (window-height) 2))))
|
|
|
2686
|
|
|
2687 ;;; Support routines
|
|
|
2688
|
|
|
2689 ;; Select a difference by placing the visual flags around the appropriate
|
|
|
2690 ;; group of lines in the A, B, and merge buffers
|
|
|
2691 (defun emerge-select-difference (n)
|
|
|
2692 (let ((emerge-globalized-difference-list emerge-difference-list)
|
|
|
2693 (emerge-globalized-number-of-differences emerge-number-of-differences))
|
|
|
2694 (emerge-place-flags-in-buffer emerge-A-buffer n 0 1)
|
|
|
2695 (emerge-place-flags-in-buffer emerge-B-buffer n 2 3)
|
|
|
2696 (emerge-place-flags-in-buffer nil n 4 5))
|
|
|
2697 (run-hooks 'emerge-select-hook))
|
|
|
2698
|
|
|
2699 (defun emerge-place-flags-in-buffer (buffer difference before-index
|
|
|
2700 after-index)
|
|
|
2701 (if buffer
|
|
|
2702 (emerge-eval-in-buffer
|
|
|
2703 buffer
|
|
|
2704 (emerge-place-flags-in-buffer1 difference before-index after-index))
|
|
|
2705 (emerge-place-flags-in-buffer1 difference before-index after-index)))
|
|
|
2706
|
|
|
2707 (defun emerge-place-flags-in-buffer1 (difference before-index after-index)
|
|
|
2708 (if (and emerge-xemacs-p (not emerge-mark-with-text))
|
|
|
2709 ;; XEmacs highlights the difference
|
|
|
2710 (emerge-place-flags-in-buffer1-xemacs difference before-index after-index)
|
|
|
2711 ;; Else insert character flags
|
|
|
2712 (let ((buffer-read-only nil))
|
|
|
2713 ;; insert the flag before the difference
|
|
|
2714 (let ((before (aref (aref emerge-globalized-difference-list difference)
|
|
|
2715 before-index))
|
|
|
2716 here)
|
|
|
2717 (goto-char before)
|
|
|
2718 ;; insert the flag itself
|
|
|
2719 (insert-before-markers emerge-before-flag)
|
|
|
2720 (setq here (point))
|
|
|
2721 ;; Put the marker(s) referring to this position 1 character before the
|
|
|
2722 ;; end of the flag, so it won't be damaged by the user.
|
|
|
2723 ;; This gets a bit tricky, as there could be a number of markers
|
|
|
2724 ;; that have to be moved.
|
|
|
2725 (set-marker before (1- before))
|
|
|
2726 (let ((n (1- difference)) after-marker before-marker diff-list)
|
|
|
2727 (while (and
|
|
|
2728 (>= n 0)
|
|
|
2729 (progn
|
|
|
2730 (setq diff-list (aref emerge-globalized-difference-list n)
|
|
|
2731 after-marker (aref diff-list after-index))
|
|
|
2732 (= after-marker here)))
|
|
|
2733 (set-marker after-marker (1- after-marker))
|
|
|
2734 (setq before-marker (aref diff-list before-index))
|
|
|
2735 (if (= before-marker here)
|
|
|
2736 (setq before-marker (1- before-marker)))
|
|
|
2737 (setq n (1- n)))))
|
|
|
2738 ;; insert the flag after the difference
|
|
|
2739 (let* ((after (aref (aref emerge-globalized-difference-list difference)
|
|
|
2740 after-index))
|
|
|
2741 (here (marker-position after)))
|
|
|
2742 (goto-char here)
|
|
|
2743 ;; insert the flag itself
|
|
|
2744 (insert emerge-after-flag)
|
|
|
2745 ;; Put the marker(s) referring to this position 1 character after the
|
|
|
2746 ;; beginning of the flag, so it won't be damaged by the user.
|
|
|
2747 ;; This gets a bit tricky, as there could be a number of markers
|
|
|
2748 ;; that have to be moved.
|
|
|
2749 (set-marker after (1+ after))
|
|
|
2750 (let ((n (1+ difference)) before-marker after-marker diff-list)
|
|
|
2751 (while (and
|
|
|
2752 (< n emerge-globalized-number-of-differences)
|
|
|
2753 (progn
|
|
|
2754 (setq diff-list (aref emerge-globalized-difference-list n)
|
|
|
2755 before-marker (aref diff-list before-index))
|
|
|
2756 (= before-marker here)))
|
|
|
2757 (set-marker before-marker (1+ before-marker))
|
|
|
2758 (setq after-marker (aref diff-list after-index))
|
|
|
2759 (if (= after-marker here)
|
|
|
2760 (setq after-marker (1+ after-marker)))
|
|
|
2761 (setq n (1+ n))))))))
|
|
|
2762
|
|
|
2763 (defun emerge-place-flags-in-buffer1-xemacs (difference before-index
|
|
|
2764 after-index)
|
|
|
2765 (let* ((before (aref (aref emerge-globalized-difference-list difference)
|
|
|
2766 before-index))
|
|
|
2767 (after (aref (aref emerge-globalized-difference-list difference)
|
|
|
2768 after-index))
|
|
|
2769 (extent (make-extent (marker-position before) (marker-position after)
|
|
|
2770 (current-buffer))))
|
|
|
2771 (set-extent-face extent 'emerge-highlight-face)
|
|
|
2772 ;; Assert that this extent is slightly more important than random other
|
|
|
2773 ;; extents that may have been inserted by things like font-lock-mode.
|
|
|
2774 ;; This way, any conflict between the display of a highlighting face
|
|
|
2775 ;; and the emerge face will be resolved in emerge's favor.
|
|
|
2776 (set-extent-priority extent 1)
|
|
|
2777 (set-extent-property extent 'emerge t)))
|
|
|
2778
|
|
|
2779 ;; Unselect a difference by removing the visual flags in the buffers.
|
|
|
2780 (defun emerge-unselect-difference (n)
|
|
|
2781 (let ((diff-vector (aref emerge-difference-list n)))
|
|
|
2782 (emerge-remove-flags-in-buffer emerge-A-buffer
|
|
|
2783 (aref diff-vector 0) (aref diff-vector 1))
|
|
|
2784 (emerge-remove-flags-in-buffer emerge-B-buffer
|
|
|
2785 (aref diff-vector 2) (aref diff-vector 3))
|
|
|
2786 (emerge-remove-flags-in-buffer emerge-merge-buffer
|
|
|
2787 (aref diff-vector 4) (aref diff-vector 5)))
|
|
|
2788 (run-hooks 'emerge-unselect-hook))
|
|
|
2789
|
|
|
2790 (defun emerge-remove-flags-in-buffer (buffer before after)
|
|
|
2791 (if (and emerge-xemacs-p (not emerge-mark-with-text))
|
|
|
2792 ;; XEmacs -- remove highlighting
|
|
|
2793 (emerge-remove-flags-in-buffer-xemacs buffer before after)
|
|
|
2794 ;; Else remove character flags
|
|
|
2795 (emerge-eval-in-buffer
|
|
|
2796 buffer
|
|
|
2797 (let ((buffer-read-only nil))
|
|
|
2798 ;; remove the flags, if they're there
|
|
|
2799 (goto-char (- before (1- emerge-before-flag-length)))
|
|
|
2800 (if (looking-at emerge-before-flag-match)
|
|
|
2801 (delete-char emerge-before-flag-length)
|
|
|
2802 ;; the flag isn't there
|
|
|
2803 (ding)
|
|
|
2804 (message "Trouble removing flag"))
|
|
|
2805 (goto-char (1- after))
|
|
|
2806 (if (looking-at emerge-after-flag-match)
|
|
|
2807 (delete-char emerge-after-flag-length)
|
|
|
2808 ;; the flag isn't there
|
|
|
2809 (ding)
|
|
|
2810 (message "Trouble removing flag"))))))
|
|
|
2811
|
|
|
2812 (defun emerge-remove-flags-in-buffer-xemacs (buffer before after)
|
|
|
2813 (map-extents (function (lambda (x y)
|
|
|
2814 (if (extent-property x 'emerge)
|
|
|
2815 (delete-extent x))))
|
|
|
2816 buffer (marker-position before) (marker-position after) nil))
|
|
|
2817
|
|
|
2818 ;; Select a difference, removing any flags that exist now.
|
|
|
2819 (defun emerge-unselect-and-select-difference (n &optional suppress-display)
|
|
|
2820 (if (and (>= emerge-current-difference 0)
|
|
|
2821 (< emerge-current-difference emerge-number-of-differences))
|
|
|
2822 (emerge-unselect-difference emerge-current-difference))
|
|
|
2823 (if (and (>= n 0) (< n emerge-number-of-differences))
|
|
|
2824 (progn
|
|
|
2825 (emerge-select-difference n)
|
|
|
2826 (let* ((diff-vector (aref emerge-difference-list n))
|
|
|
2827 (selection-type (aref diff-vector 6)))
|
|
|
2828 (if (eq selection-type 'default-A)
|
|
|
2829 (aset diff-vector 6 'A)
|
|
|
2830 (if (eq selection-type 'default-B)
|
|
|
2831 (aset diff-vector 6 'B))))))
|
|
|
2832 (setq emerge-current-difference n)
|
|
|
2833 (if (not suppress-display)
|
|
|
2834 (progn
|
|
|
2835 (emerge-recenter)
|
|
|
2836 (emerge-refresh-mode-line))))
|
|
|
2837
|
|
|
2838 ;; Perform tests to see whether user should be allowed to select a version
|
|
|
2839 ;; of this difference:
|
|
|
2840 ;; a valid difference has been selected; and
|
|
|
2841 ;; the difference text in the merge buffer is:
|
|
|
2842 ;; the A version (execute a-version), or
|
|
|
2843 ;; the B version (execute b-version), or
|
|
|
2844 ;; empty (execute neither-version), or
|
|
|
2845 ;; argument FORCE is true (execute neither-version)
|
|
|
2846 ;; Otherwise, signal an error.
|
|
|
2847 (defun emerge-select-version (force a-version b-version neither-version)
|
|
|
2848 (emerge-validate-difference)
|
|
|
2849 (let ((buffer-read-only nil))
|
|
|
2850 (let* ((diff-vector
|
|
|
2851 (aref emerge-difference-list emerge-current-difference))
|
|
|
2852 (A-begin (1+ (aref diff-vector 0)))
|
|
|
2853 (A-end (1- (aref diff-vector 1)))
|
|
|
2854 (B-begin (1+ (aref diff-vector 2)))
|
|
|
2855 (B-end (1- (aref diff-vector 3)))
|
|
|
2856 (merge-begin (1+ (aref diff-vector 4)))
|
|
|
2857 (merge-end (1- (aref diff-vector 5))))
|
|
|
2858 (if (emerge-compare-buffers emerge-A-buffer A-begin A-end
|
|
|
2859 emerge-merge-buffer merge-begin
|
|
|
2860 merge-end)
|
|
|
2861 (funcall a-version)
|
|
|
2862 (if (emerge-compare-buffers emerge-B-buffer B-begin B-end
|
|
|
2863 emerge-merge-buffer merge-begin
|
|
|
2864 merge-end)
|
|
|
2865 (funcall b-version)
|
|
|
2866 (if (or force (= merge-begin merge-end))
|
|
|
2867 (funcall neither-version)
|
|
|
2868 (error "This difference region has been edited")))))))
|
|
|
2869
|
|
|
2870 ;; Read a file name, handling all of the various defaulting rules.
|
|
|
2871
|
|
|
2872 (defun emerge-read-file-name (prompt alternative-default-dir default-file
|
|
|
2873 A-file must-match)
|
|
|
2874 ;; `prompt' should not have trailing ": ", so that it can be modified
|
|
|
2875 ;; according to context.
|
|
|
2876 ;; If alternative-default-dir is non-nil, it should be used as the default
|
|
|
2877 ;; directory instead if default-directory, if emerge-default-last-directories
|
|
|
2878 ;; is set.
|
|
|
2879 ;; If default-file is set, it should be used as the default value.
|
|
|
2880 ;; If A-file is set, and its directory is different from
|
|
|
2881 ;; alternative-default-dir, and if emerge-default-last-directories is set,
|
|
|
2882 ;; the default file should be the last part of A-file in the default
|
|
|
2883 ;; directory. (Overriding default-file.)
|
|
|
2884 ;; 'must-match' controlls whether non-existent file names are allowed;
|
|
|
2885 ;; see the fourth argument of read-file-name for interpretations of values.
|
|
|
2886 (cond
|
|
|
2887 ;; If this is not the A-file argument (shown by non-nil A-file), and
|
|
|
2888 ;; if emerge-default-last-directories is set, and
|
|
|
2889 ;; the default directory exists but is not the same as the directory of the
|
|
|
2890 ;; A-file,
|
|
|
2891 ;; then make the default file have the same name as the A-file, but in
|
|
|
2892 ;; the default directory.
|
|
|
2893 ((and emerge-default-last-directories
|
|
|
2894 A-file
|
|
|
2895 alternative-default-dir
|
|
|
2896 (not (string-equal alternative-default-dir
|
|
|
2897 (file-name-directory A-file))))
|
|
|
2898 (read-file-name (format "%s (default %s): "
|
|
|
2899 prompt (file-name-nondirectory A-file))
|
|
|
2900 alternative-default-dir
|
|
|
2901 (concat alternative-default-dir
|
|
|
2902 (file-name-nondirectory A-file))
|
|
|
2903 (and must-match 'confirm)))
|
|
|
2904 ;; If there is a default file, use it.
|
|
|
2905 (default-file
|
|
|
2906 (read-file-name (format "%s (default %s): " prompt default-file)
|
|
|
2907 ;; If emerge-default-last-directories is set, use the
|
|
|
2908 ;; directory from the same argument of the last call of
|
|
|
2909 ;; Emerge as the default for this argument.
|
|
|
2910 (and emerge-default-last-directories
|
|
|
2911 alternative-default-dir)
|
|
|
2912 default-file (and must-match 'confirm)))
|
|
|
2913 (t
|
|
|
2914 (read-file-name (concat prompt ": ")
|
|
|
2915 ;; If emerge-default-last-directories is set, use the
|
|
|
2916 ;; directory from the same argument of the last call of
|
|
|
2917 ;; Emerge as the default for this argument.
|
|
|
2918 (and emerge-default-last-directories
|
|
|
2919 alternative-default-dir)
|
|
|
2920 nil (and must-match 'confirm)))))
|
|
|
2921
|
|
|
2922 ;; Revise the mode line to display which difference we have selected
|
|
|
2923
|
|
|
2924 (defun emerge-refresh-mode-line ()
|
|
|
2925 (setq mode-line-buffer-identification
|
|
|
2926 (list (format "Emerge: %%b diff %d of %d%s"
|
|
|
2927 (1+ emerge-current-difference)
|
|
|
2928 emerge-number-of-differences
|
|
|
2929 (if (and (>= emerge-current-difference 0)
|
|
|
2930 (< emerge-current-difference
|
|
|
2931 emerge-number-of-differences))
|
|
|
2932 (cdr (assq (aref (aref emerge-difference-list
|
|
|
2933 emerge-current-difference)
|
|
|
2934 6)
|
|
|
2935 '((A . " - A")
|
|
|
2936 (B . " - B")
|
|
|
2937 (prefer-A . " - A*")
|
|
|
2938 (prefer-B . " - B*")
|
|
|
2939 (combined . " - comb"))))
|
|
|
2940 ""))))
|
|
|
2941 (force-mode-line-update))
|
|
|
2942
|
|
|
2943 ;; compare two regions in two buffers for containing the same text
|
|
|
2944 (defun emerge-compare-buffers (buffer-x x-begin x-end buffer-y y-begin y-end)
|
|
|
2945 ;; first check that the two regions are the same length
|
|
|
2946 (if (not (and (= (- x-end x-begin) (- y-end y-begin))))
|
|
|
2947 nil
|
|
|
2948 (catch 'exit
|
|
|
2949 (while (< x-begin x-end)
|
|
|
2950 ;; bite off and compare no more than 1000 characters at a time
|
|
|
2951 (let* ((compare-length (min (- x-end x-begin) 1000))
|
|
|
2952 (x-string (emerge-eval-in-buffer
|
|
|
2953 buffer-x
|
|
|
2954 (buffer-substring x-begin
|
|
|
2955 (+ x-begin compare-length))))
|
|
|
2956 (y-string (emerge-eval-in-buffer
|
|
|
2957 buffer-y
|
|
|
2958 (buffer-substring y-begin
|
|
|
2959 (+ y-begin compare-length)))))
|
|
|
2960 (if (not (string-equal x-string y-string))
|
|
|
2961 (throw 'exit nil)
|
|
|
2962 (setq x-begin (+ x-begin compare-length))
|
|
|
2963 (setq y-begin (+ y-begin compare-length)))))
|
|
|
2964 t)))
|
|
|
2965
|
|
|
2966 ;; Construct a unique buffer name.
|
|
|
2967 ;; The first one tried is prefixsuffix, then prefix<2>suffix,
|
|
|
2968 ;; prefix<3>suffix, etc.
|
|
|
2969 (defun emerge-unique-buffer-name (prefix suffix)
|
|
|
2970 (if (null (get-buffer (concat prefix suffix)))
|
|
|
2971 (concat prefix suffix)
|
|
|
2972 (let ((n 2))
|
|
|
2973 (while (get-buffer (format "%s<%d>%s" prefix n suffix))
|
|
|
2974 (setq n (1+ n)))
|
|
|
2975 (format "%s<%d>%s" prefix n suffix))))
|
|
|
2976
|
|
|
2977 ;; Verify that we have a difference selected.
|
|
|
2978 (defun emerge-validate-difference ()
|
|
|
2979 (if (not (and (>= emerge-current-difference 0)
|
|
|
2980 (< emerge-current-difference emerge-number-of-differences)))
|
|
|
2981 (error "No difference selected")))
|
|
|
2982
|
|
|
2983 ;;; Functions for saving and restoring a batch of variables
|
|
|
2984
|
|
|
2985 ;; These functions save (get the values of) and restore (set the values of)
|
|
|
2986 ;; a list of variables. The argument is a list of symbols (the names of
|
|
|
2987 ;; the variables). A list element can also be a list of two functions,
|
|
|
2988 ;; the first of which (when called with no arguments) gets the value, and
|
|
108
|
2989 ;; the second (when called with a value as an argument) sets the value.
|
|
0
|
2990 ;; A "function" is anything that funcall can handle as an argument.
|
|
|
2991
|
|
|
2992 (defun emerge-save-variables (vars)
|
|
|
2993 (mapcar (function (lambda (v) (if (symbolp v)
|
|
|
2994 (symbol-value v)
|
|
|
2995 (funcall (car v)))))
|
|
|
2996 vars))
|
|
|
2997
|
|
|
2998 (defun emerge-restore-variables (vars values)
|
|
|
2999 (while vars
|
|
|
3000 (let ((var (car vars))
|
|
|
3001 (value (car values)))
|
|
|
3002 (if (symbolp var)
|
|
|
3003 (set var value)
|
|
|
3004 (funcall (car (cdr var)) value)))
|
|
|
3005 (setq vars (cdr vars))
|
|
|
3006 (setq values (cdr values))))
|
|
|
3007
|
|
|
3008 ;; Make a temporary file that only we have access to.
|
|
|
3009 ;; PREFIX is appended to emerge-temp-file-prefix to make the filename prefix.
|
|
|
3010 (defun emerge-make-temp-file (prefix)
|
|
|
3011 (let ((f (make-temp-name (concat emerge-temp-file-prefix prefix))))
|
|
|
3012 ;; create the file
|
|
|
3013 (write-region (point-min) (point-min) f nil 'no-message)
|
|
|
3014 (set-file-modes f emerge-temp-file-mode)
|
|
|
3015 f))
|
|
|
3016
|
|
|
3017 ;;; Functions that query the user before he can write out the current buffer.
|
|
|
3018
|
|
|
3019 (defun emerge-query-write-file ()
|
|
|
3020 "Ask the user whether to write out an incomplete merge.
|
|
|
3021 If answer is yes, call `write-file' to do so. See `emerge-query-and-call'
|
|
|
3022 for details of the querying process."
|
|
|
3023 (interactive)
|
|
|
3024 (emerge-query-and-call 'write-file))
|
|
|
3025
|
|
|
3026 (defun emerge-query-save-buffer ()
|
|
|
3027 "Ask the user whether to save an incomplete merge.
|
|
|
3028 If answer is yes, call `save-buffer' to do so. See `emerge-query-and-call'
|
|
|
3029 for details of the querying process."
|
|
|
3030 (interactive)
|
|
|
3031 (emerge-query-and-call 'save-buffer))
|
|
|
3032
|
|
|
3033 (defun emerge-query-and-call (command)
|
|
|
3034 "Ask the user whether to save or write out the incomplete merge.
|
|
|
3035 If answer is yes, call COMMAND interactively. During the call, the flags
|
|
|
3036 around the current difference are removed."
|
|
|
3037 (if (yes-or-no-p "Do you really write to write out this unfinished merge? ")
|
|
|
3038 ;; He really wants to do it -- unselect the difference for the duration
|
|
|
3039 (progn
|
|
|
3040 (if (and (>= emerge-current-difference 0)
|
|
|
3041 (< emerge-current-difference emerge-number-of-differences))
|
|
|
3042 (emerge-unselect-difference emerge-current-difference))
|
|
|
3043 ;; call-interactively takes the value of current-prefix-arg as the
|
|
|
3044 ;; prefix argument value to be passed to the command. Thus, we have
|
|
|
3045 ;; to do nothing special to make sure the prefix argument is
|
|
|
3046 ;; transmitted to the command.
|
|
|
3047 (call-interactively command)
|
|
|
3048 (if (and (>= emerge-current-difference 0)
|
|
|
3049 (< emerge-current-difference emerge-number-of-differences))
|
|
|
3050 (progn
|
|
|
3051 (emerge-select-difference emerge-current-difference)
|
|
|
3052 (emerge-recenter))))
|
|
|
3053 ;; He's being smart and not doing it
|
|
|
3054 (message "Not written")))
|
|
|
3055
|
|
|
3056 ;; Make sure the current buffer (for a file) has the same contents as the
|
|
|
3057 ;; file on disk, and attempt to remedy the situation if not.
|
|
|
3058 ;; Signal an error if we can't make them the same, or the user doesn't want
|
|
|
3059 ;; to do what is necessary to make them the same.
|
|
|
3060 (defun emerge-verify-file-buffer ()
|
|
|
3061 ;; First check if the file has been modified since the buffer visited it.
|
|
|
3062 (if (verify-visited-file-modtime (current-buffer))
|
|
|
3063 (if (buffer-modified-p)
|
|
|
3064 ;; If buffer is not obsolete and is modified, offer to save
|
|
|
3065 (if (yes-or-no-p (format "Save file %s? " buffer-file-name))
|
|
|
3066 (save-buffer)
|
|
|
3067 (error "Buffer out of sync for file %s" buffer-file-name))
|
|
|
3068 ;; If buffer is not obsolete and is not modified, do nothing
|
|
|
3069 nil)
|
|
|
3070 (if (buffer-modified-p)
|
|
|
3071 ;; If buffer is obsolete and is modified, give error
|
|
|
3072 (error "Buffer out of sync for file %s" buffer-file-name)
|
|
|
3073 ;; If buffer is obsolete and is not modified, offer to revert
|
|
|
3074 (if (yes-or-no-p (format "Revert file %s? " buffer-file-name))
|
|
|
3075 (revert-buffer t t)
|
|
|
3076 (error "Buffer out of sync for file %s" buffer-file-name)))))
|
|
|
3077
|
|
|
3078 ;; Returns true if the file visited in the current buffer is not accessible
|
|
|
3079 ;; through its filename, or for some other reason should be stored in a
|
|
|
3080 ;; temporary file for input to diff.
|
|
|
3081 ;; As written, checks whether this is an ange-ftp file. It may be modified
|
|
|
3082 ;; for customization.
|
|
|
3083 (defun emerge-remote-file-p ()
|
|
|
3084 (and (boundp 'ange-ftp-path-format)
|
|
|
3085 ange-ftp-path-format
|
|
|
3086 (string-match (car ange-ftp-path-format) buffer-file-name)))
|
|
|
3087
|
|
|
3088 ;; Utilities that might have value outside of Emerge.
|
|
|
3089
|
|
|
3090 ;; Set up the mode in the current buffer to duplicate the mode in another
|
|
|
3091 ;; buffer.
|
|
|
3092 (defun emerge-copy-modes (buffer)
|
|
|
3093 ;; Set the major mode
|
|
|
3094 (funcall (emerge-eval-in-buffer buffer major-mode)))
|
|
|
3095
|
|
|
3096 ;; Define a key, even if a prefix of it is defined
|
|
|
3097 (defun emerge-force-define-key (keymap key definition)
|
|
|
3098 "Like `define-key', but forcibly creates prefix characters as needed.
|
|
|
3099 If some prefix of KEY has a non-prefix definition, it is redefined."
|
|
|
3100 ;; Find out if a prefix of key is defined
|
|
|
3101 (let ((v (lookup-key keymap key)))
|
|
|
3102 ;; If so, undefine it
|
|
|
3103 (if (integerp v)
|
|
|
3104 (define-key keymap (substring key 0 v) nil)))
|
|
|
3105 ;; Now define the key
|
|
|
3106 (define-key keymap key definition))
|
|
|
3107
|
|
|
3108 ;; XEmacs -- nuked a bunch of junk here that provides a newer version
|
|
|
3109 ;; of `describe-mode' that describes minor modes as well as the major
|
|
|
3110 ;; mode. We have this code standardly.
|
|
|
3111
|
|
|
3112 ;; Show the name of the file in the buffer.
|
|
|
3113 (defun emerge-show-file-name ()
|
|
|
3114 "Displays the name of the file loaded into the current buffer.
|
|
|
3115 If the name won't fit on one line, the minibuffer is expanded to hold it,
|
|
|
3116 and the command waits for a keystroke from the user. If the keystroke is
|
|
|
3117 SPC, it is ignored\; if it is anything else, it is processed as a command."
|
|
|
3118 (interactive)
|
|
|
3119 (let ((name (buffer-file-name)))
|
|
|
3120 (or name
|
|
|
3121 (setq name "Buffer has no file name."))
|
|
|
3122 (save-window-excursion
|
|
|
3123 (select-window (minibuffer-window))
|
|
|
3124 (erase-buffer)
|
|
|
3125 (insert name)
|
|
|
3126 (if (not (pos-visible-in-window-p))
|
|
|
3127 (let ((echo-keystrokes 0))
|
|
|
3128 (while (and (not (pos-visible-in-window-p))
|
|
|
3129 (> (1- (screen-height)) (window-height)))
|
|
|
3130 (enlarge-window 1))
|
|
|
3131 (if emerge-xemacs-p
|
|
|
3132 (let ((e (next-command-event)))
|
|
|
3133 (if (not (eq 32 (event-to-character e)))
|
|
|
3134 (setq unread-command-event e)))
|
|
|
3135 (let ((c (read-event)))
|
|
|
3136 (if (not (eq c 32))
|
|
|
3137 (setq unread-command-events (list c))))))))))
|
|
|
3138
|
|
|
3139 ;; Improved auto-save file names.
|
|
|
3140 ;; This function fixes many problems with the standard auto-save file names:
|
|
|
3141 ;; Auto-save files for non-file buffers get put in the default directory
|
|
|
3142 ;; for the buffer, whether that makes sense or not.
|
|
|
3143 ;; Auto-save files for file buffers get put in the directory of the file,
|
|
|
3144 ;; regardless of whether we can write into it or not.
|
|
|
3145 ;; Auto-save files for non-file buffers don't use the process id, so if a
|
|
|
3146 ;; user runs more than on Emacs, they can make auto-save files that overwrite
|
|
|
3147 ;; each other.
|
|
|
3148 ;; To use this function, do:
|
|
|
3149 ;; (fset 'make-auto-save-file-name
|
|
|
3150 ;; (symbol-function 'emerge-make-auto-save-file-name))
|
|
|
3151 (defun emerge-make-auto-save-file-name ()
|
|
|
3152 "Return file name to use for auto-saves of current buffer.
|
|
|
3153 Does not consider `auto-save-visited-file-name';
|
|
|
3154 that is checked before calling this function.
|
|
|
3155 You can redefine this for customization.
|
|
|
3156 See also `auto-save-file-name-p'."
|
|
|
3157 (if buffer-file-name
|
|
|
3158 ;; if buffer has a file, try the format <file directory>/#<file name>#
|
|
|
3159 (let ((f (concat (file-name-directory buffer-file-name)
|
|
|
3160 "#"
|
|
|
3161 (file-name-nondirectory buffer-file-name)
|
|
|
3162 "#")))
|
|
|
3163 (if (file-writable-p f)
|
|
|
3164 ;; the file is writable, so use it
|
|
|
3165 f
|
|
|
3166 ;; the file isn't writable, so use the format
|
|
|
3167 ;; ~/#&<file name>&<hash of directory>#
|
|
|
3168 (concat (getenv "HOME")
|
|
|
3169 "/#&"
|
|
|
3170 (file-name-nondirectory buffer-file-name)
|
|
|
3171 "&"
|
|
|
3172 (emerge-hash-string-into-string
|
|
|
3173 (file-name-directory buffer-file-name))
|
|
|
3174 "#")))
|
|
|
3175 ;; if buffer has no file, use the format ~/#%<buffer name>%<process id>#
|
|
|
3176 (expand-file-name (concat (getenv "HOME")
|
|
|
3177 "/#%"
|
|
|
3178 ;; quote / into \! and \ into \\
|
|
|
3179 (emerge-unslashify-name (buffer-name))
|
|
|
3180 "%"
|
|
|
3181 (make-temp-name "")
|
|
|
3182 "#"))))
|
|
|
3183
|
|
|
3184 ;; Hash a string into five characters more-or-less suitable for use in a file
|
|
|
3185 ;; name. (Allowed characters are ! through ~, except /.)
|
|
|
3186 (defun emerge-hash-string-into-string (s)
|
|
|
3187 (let ((bins (vector 0 0 0 0 0))
|
|
|
3188 (i 0))
|
|
|
3189 (while (< i (length s))
|
|
|
3190 (aset bins (% i 5) (% (+ (* (aref bins (% i 5)) 35)
|
|
|
3191 (aref s i))
|
|
|
3192 65536))
|
|
|
3193 (setq i (1+ i)))
|
|
|
3194 (mapconcat (function (lambda (b)
|
|
|
3195 (setq b (+ (% b 93) ?!))
|
|
|
3196 (if (>= b ?/)
|
|
|
3197 (setq b (1+ b)))
|
|
|
3198 (char-to-string b)))
|
|
|
3199 bins "")))
|
|
|
3200
|
|
|
3201 ;; Quote any /s in a string by replacing them with \!.
|
|
|
3202 ;; Also, replace any \s by \\, to make it one-to-one.
|
|
|
3203 (defun emerge-unslashify-name (s)
|
|
|
3204 (let ((limit 0))
|
|
|
3205 (while (string-match "[/\\]" s limit)
|
|
|
3206 (setq s (concat (substring s 0 (match-beginning 0))
|
|
|
3207 (if (string= (substring s (match-beginning 0)
|
|
|
3208 (match-end 0))
|
|
|
3209 "/")
|
|
|
3210 "\\!"
|
|
|
3211 "\\\\")
|
|
|
3212 (substring s (match-end 0))))
|
|
|
3213 (setq limit (1+ (match-end 0)))))
|
|
|
3214 s)
|
|
|
3215
|
|
|
3216 ;; Metacharacters that have to be protected from the shell when executing
|
|
|
3217 ;; a diff/diff3 command.
|
|
|
3218 (defvar emerge-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]"
|
|
|
3219 "Characters that must be quoted with \\ when used in a shell command line.
|
|
|
3220 More precisely, a [...] regexp to match any one such character.")
|
|
|
3221
|
|
|
3222 ;; Quote metacharacters (using \) when executing a diff/diff3 command.
|
|
|
3223 (defun emerge-protect-metachars (s)
|
|
|
3224 (let ((limit 0))
|
|
|
3225 (while (string-match emerge-metachars s limit)
|
|
|
3226 (setq s (concat (substring s 0 (match-beginning 0))
|
|
|
3227 "\\"
|
|
|
3228 (substring s (match-beginning 0))))
|
|
|
3229 (setq limit (1+ (match-end 0)))))
|
|
|
3230 s)
|
|
|
3231
|
|
|
3232 (provide 'emerge)
|
|
|
3233
|
|
|
3234 ;;; emerge.el ends here
|
