1 ;;; ediff-merg.el --- merging utilities
3 ;; Copyright (C) 1994, 1995 Free Software Foundation, Inc.
5 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
7 ;; This file is part of GNU Emacs.
9 ;; GNU Emacs is free software; you can redistribute it and/or modify
10 ;; it under the terms of the GNU General Public License as published by
11 ;; the Free Software Foundation; either version 2, or (at your option)
14 ;; GNU Emacs is distributed in the hope that it will be useful,
15 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
16 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 ;; GNU General Public License for more details.
19 ;; You should have received a copy of the GNU General Public License
20 ;; along with GNU Emacs; see the file COPYING. If not, write to the
21 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
22 ;; Boston, MA 02111-1307, USA.
28 (defvar ediff-default-variant
'default-A
29 "*The variant to be used as a default for buffer C in merging.
30 Valid values are the symbols `default-A', `default-B', and `combined'.")
32 (defvar ediff-combination-pattern
33 '("#ifdef NEW /* variant A */" "#else /* variant B */" "#endif /* NEW */")
34 "*Pattern to be used for combining difference regions in buffers A and B.
35 The value is (STRING1 STRING2 STRING3). The combined text will look like this:
38 diff region from variant A
40 diff region from variant B
44 (ediff-defvar-local ediff-show-clashes-only nil
45 "*If t, show only those diff regions where both buffers disagree with the ancestor.
46 This means that regions that have status prefer-A or prefer-B will be
47 skiped over. Nil means show all regions.")
50 (defsubst ediff-get-combined-region
(n)
51 (concat (nth 0 ediff-combination-pattern
) "\n"
52 (ediff-get-region-contents n
'A ediff-control-buffer
)
53 (nth 1 ediff-combination-pattern
) "\n"
54 (ediff-get-region-contents n
'B ediff-control-buffer
)
55 (nth 2 ediff-combination-pattern
) "\n"))
57 (defsubst ediff-make-combined-diff
(regA regB
)
58 (concat (nth 0 ediff-combination-pattern
) "\n"
60 (nth 1 ediff-combination-pattern
) "\n"
62 (nth 2 ediff-combination-pattern
) "\n"))
64 (defsubst ediff-set-state-of-all-diffs-in-all-buffers
(ctl-buf)
66 (while (< n ediff-number-of-differences
)
67 (ediff-set-state-of-diff-in-all-buffers n ctl-buf
)
70 (defun ediff-set-state-of-diff-in-all-buffers (n ctl-buf
)
71 (let ((regA (ediff-get-region-contents n
'A ctl-buf
))
72 (regB (ediff-get-region-contents n
'B ctl-buf
))
73 (regC (ediff-get-region-contents n
'C ctl-buf
)))
74 (cond ((and (string= regA regB
) (string= regA regC
))
75 (ediff-set-state-of-diff n
'A
"=diff(B)")
76 (ediff-set-state-of-diff n
'B
"=diff(C)")
77 (ediff-set-state-of-diff n
'C
"=diff(A)"))
79 (ediff-set-state-of-diff n
'A
"=diff(B)")
80 (ediff-set-state-of-diff n
'B
"=diff(A)")
81 (ediff-set-state-of-diff n
'C nil
))
83 (ediff-set-state-of-diff n
'A
"=diff(C)")
84 (ediff-set-state-of-diff n
'C
"=diff(A)")
85 (ediff-set-state-of-diff n
'B nil
))
87 (ediff-set-state-of-diff n
'C
"=diff(B)")
88 (ediff-set-state-of-diff n
'B
"=diff(C)")
89 (ediff-set-state-of-diff n
'A nil
))
90 ((string= regC
(ediff-get-combined-region n
))
91 (ediff-set-state-of-diff n
'A nil
)
92 (ediff-set-state-of-diff n
'B nil
)
93 (ediff-set-state-of-diff n
'C
"=diff(A+B)"))
94 (t (ediff-set-state-of-diff n
'A nil
)
95 (ediff-set-state-of-diff n
'B nil
)
96 (ediff-set-state-of-diff n
'C nil
)))
99 (defun ediff-set-merge-mode ()
100 ;; by Stig@hackvan.com
102 (remove-hook 'local-write-file-hooks
'ediff-set-merge-mode
))
105 ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C
106 ;; according to the state of the difference.
107 ;; Since ediff-copy-diff refuses to copy identical diff regions, there is
108 ;; no need to optimize ediff-do-merge any further.
110 ;; If re-merging, change state of merge in all diffs starting with
111 ;; DIFF-NUM, except those where the state is prefer-* or where it is
112 ;; `default-*' or `combined' but the buf C region appears to be modified
113 ;; since last set by default.
114 (defun ediff-do-merge (diff-num &optional remerging
)
115 (if (< diff-num
0) (setq diff-num
0))
117 (default-state-of-merge (format "%S" ediff-default-variant
))
118 do-not-copy state-of-merge
)
119 (while (< n ediff-number-of-differences
)
121 (message "%s buffers A & B into C ... region %d of %d"
122 (if remerging
"Re-merging" "Merging")
124 ediff-number-of-differences
))
126 (setq state-of-merge
(ediff-get-state-of-merge n
))
129 (let ((reg-A (ediff-get-region-contents n
'A ediff-control-buffer
))
130 (reg-B (ediff-get-region-contents n
'B ediff-control-buffer
))
131 (reg-C (ediff-get-region-contents n
'C ediff-control-buffer
)))
133 ;;; was edited since first set by default
134 (if (or (and (string= state-of-merge
"default-A")
135 (not (string= reg-A reg-C
)))
136 ;; was edited since first set by default
137 (and (string= state-of-merge
"default-B")
138 (not (string= reg-B reg-C
)))
139 ;; was edited since first set by default
140 (and (string= state-of-merge
"combined")
142 (ediff-make-combined-diff reg-A reg-B
) reg-C
)))
143 ;; was preferred--ignore
144 (string-match "prefer" state-of-merge
))
145 (setq do-not-copy t
))
147 ;; change state of merge for this diff, if necessary
148 (if (and (string-match "\\(default\\|combined\\)" state-of-merge
)
150 (ediff-set-state-of-merge
151 n
(format "%S" ediff-default-variant
)))
154 ;; state-of-merge may have changed via ediff-set-state-of-merge, so
155 ;; check it once again
156 (setq state-of-merge
(ediff-get-state-of-merge n
))
159 (if (string= state-of-merge
"combined")
160 ;; use n+1 because ediff-combine-diffs works via user numbering
161 ;; of diffs, which is 1+ to what ediff uses internally
162 (ediff-combine-diffs (1+ n
) 'batch
)
164 n
(if (string-match "-A" state-of-merge
) 'A
'B
) 'C
'batch
)))
166 (message "Merging buffers A & B into C ... Done")
170 (defun ediff-re-merge ()
171 "Remerge unmodified diff regions using a new default. Start with the current region."
173 (let* ((default-variant-alist
174 (list '("default-A") '("default-B") '("combined")))
176 (delete (list (symbol-name ediff-default-variant
))
177 default-variant-alist
)))
178 (setq ediff-default-variant
181 (format "Current merge default is `%S'. New default: "
182 ediff-default-variant
)
183 actual-alist nil
'must-match
)))
184 (ediff-do-merge ediff-current-difference
'remerge
)
188 (defun ediff-shrink-window-C (arg)
189 "Shrink window C to just one line.
190 With a prefix argument, returns window C to its normal size.
191 Used only for merging jobs."
193 (if (not ediff-merge-job
)
194 (error "ediff-shrink-window-C can be used only for merging jobs"))
195 (cond ((eq arg
'-
) (setq arg -
1))
196 ((not (numberp arg
)) (setq arg nil
)))
198 (let ((ediff-merge-window-share
199 (if (< (window-height ediff-window-C
) 3)
200 ediff-merge-window-share
0)))
201 (setq ediff-window-config-saved
"") ; force redisplay
202 (ediff-recenter 'no-rehighlight
)))
203 ((and (< arg
0) (> (window-height ediff-window-C
) 2))
204 (setq ediff-merge-window-share
(* ediff-merge-window-share
0.9))
205 (setq ediff-window-config-saved
"") ; force redisplay
206 (ediff-recenter 'no-rehighlight
))
207 ((and (> arg
0) (> (window-height ediff-window-A
) 2))
208 (setq ediff-merge-window-share
(* ediff-merge-window-share
1.1))
209 (setq ediff-window-config-saved
"") ; force redisplay
210 (ediff-recenter 'no-rehighlight
))))
213 ;; N here is the user's region number. It is 1+ what Ediff uses internally.
214 (defun ediff-combine-diffs (n &optional batch-invocation
)
215 "Combine Nth diff regions of buffers A and B and place the combination in C.
216 Combining is done using the list in variable `ediff-combination-pattern'."
218 (setq n
(if n
(1- n
) ediff-current-difference
))
220 (let (regA regB reg-combined
)
221 (setq regA
(ediff-get-region-contents n
'A ediff-control-buffer
)
222 regB
(ediff-get-region-contents n
'B ediff-control-buffer
))
224 (setq reg-combined
(ediff-make-combined-diff regA regB
))
226 (ediff-copy-diff n nil
'C batch-invocation reg-combined
))
227 (or batch-invocation
(ediff-recenter)))
230 ;; Checks if the region in buff C looks like a combination of the regions
231 ;; in buffers A and B. Returns a list (reg-a-beg reg-a-end reg-b-beg reg-b-end)
232 ;; These refer to where the copies of region A and B start and end in buffer C
233 (defun ediff-looks-like-combined-merge (region-num)
235 (let ((combined (string-match (regexp-quote "(A+B)")
236 (or (ediff-get-state-of-diff region-num
'C
)
238 (reg-beg (ediff-get-diff-posn 'C
'beg region-num
))
239 (reg-end (ediff-get-diff-posn 'C
'end region-num
))
240 (pat1 (nth 0 ediff-combination-pattern
))
241 (pat2 (nth 1 ediff-combination-pattern
))
242 (pat3 (nth 2 ediff-combination-pattern
))
243 reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end
)
246 (ediff-eval-in-buffer ediff-buffer-C
248 (search-forward pat1 reg-end
'noerror
)
249 (setq reg-a-beg
(match-beginning 0))
250 (setq reg-a-end
(match-end 0))
251 (search-forward pat2 reg-end
'noerror
)
252 (setq reg-b-beg
(match-beginning 0))
253 (setq reg-b-end
(match-end 0))
254 (search-forward pat3 reg-end
'noerror
)
255 (setq reg-c-beg
(match-beginning 0))
256 (setq reg-c-end
(match-end 0))))
258 (if (and reg-a-beg reg-a-end reg-b-beg reg-b-end
)
259 (list reg-a-beg reg-a-end reg-b-beg reg-b-end reg-c-beg reg-c-end
))
263 (provide 'ediff-merg
)
265 ;; ediff-merg.el ends here