]>
Commit | Line | Data |
---|---|---|
857b933e JS |
1 | /* |
2 | * LibXDiff by Davide Libenzi ( File Differential Library ) | |
3 | * Copyright (C) 2003-2006 Davide Libenzi, Johannes E. Schindelin | |
4 | * | |
5 | * This library is free software; you can redistribute it and/or | |
6 | * modify it under the terms of the GNU Lesser General Public | |
7 | * License as published by the Free Software Foundation; either | |
8 | * version 2.1 of the License, or (at your option) any later version. | |
9 | * | |
10 | * This library is distributed in the hope that it will be useful, | |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 | * Lesser General Public License for more details. | |
14 | * | |
15 | * You should have received a copy of the GNU Lesser General Public | |
16 | * License along with this library; if not, write to the Free Software | |
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |
18 | * | |
19 | * Davide Libenzi <davidel@xmailserver.org> | |
20 | * | |
21 | */ | |
22 | ||
23 | #include "xinclude.h" | |
24 | ||
25 | typedef struct s_xdmerge { | |
26 | struct s_xdmerge *next; | |
27 | /* | |
28 | * 0 = conflict, | |
29 | * 1 = no conflict, take first, | |
30 | * 2 = no conflict, take second. | |
cd1d61c4 | 31 | * 3 = no conflict, take both. |
857b933e JS |
32 | */ |
33 | int mode; | |
e0af48e4 JH |
34 | /* |
35 | * These point at the respective postimages. E.g. <i1,chg1> is | |
36 | * how side #1 wants to change the common ancestor; if there is no | |
37 | * overlap, lines before i1 in the postimage of side #1 appear | |
38 | * in the merge result as a region touched by neither side. | |
39 | */ | |
857b933e JS |
40 | long i1, i2; |
41 | long chg1, chg2; | |
e0af48e4 JH |
42 | /* |
43 | * These point at the preimage; of course there is just one | |
44 | * preimage, that is from the shared common ancestor. | |
45 | */ | |
46 | long i0; | |
47 | long chg0; | |
857b933e JS |
48 | } xdmerge_t; |
49 | ||
50 | static int xdl_append_merge(xdmerge_t **merge, int mode, | |
e0af48e4 JH |
51 | long i0, long chg0, |
52 | long i1, long chg1, | |
53 | long i2, long chg2) | |
857b933e JS |
54 | { |
55 | xdmerge_t *m = *merge; | |
98e6da8a JS |
56 | if (m && (i1 <= m->i1 + m->chg1 || i2 <= m->i2 + m->chg2)) { |
57 | if (mode != m->mode) | |
58 | m->mode = 0; | |
e0af48e4 | 59 | m->chg0 = i0 + chg0 - m->i0; |
857b933e JS |
60 | m->chg1 = i1 + chg1 - m->i1; |
61 | m->chg2 = i2 + chg2 - m->i2; | |
62 | } else { | |
63 | m = xdl_malloc(sizeof(xdmerge_t)); | |
64 | if (!m) | |
65 | return -1; | |
66 | m->next = NULL; | |
67 | m->mode = mode; | |
e0af48e4 JH |
68 | m->i0 = i0; |
69 | m->chg0 = chg0; | |
857b933e JS |
70 | m->i1 = i1; |
71 | m->chg1 = chg1; | |
72 | m->i2 = i2; | |
73 | m->chg2 = chg2; | |
74 | if (*merge) | |
75 | (*merge)->next = m; | |
76 | *merge = m; | |
77 | } | |
78 | return 0; | |
79 | } | |
80 | ||
81 | static int xdl_cleanup_merge(xdmerge_t *c) | |
82 | { | |
83 | int count = 0; | |
84 | xdmerge_t *next_c; | |
85 | ||
86 | /* were there conflicts? */ | |
87 | for (; c; c = next_c) { | |
88 | if (c->mode == 0) | |
89 | count++; | |
90 | next_c = c->next; | |
91 | free(c); | |
92 | } | |
93 | return count; | |
94 | } | |
95 | ||
96 | static int xdl_merge_cmp_lines(xdfenv_t *xe1, int i1, xdfenv_t *xe2, int i2, | |
97 | int line_count, long flags) | |
98 | { | |
99 | int i; | |
100 | xrecord_t **rec1 = xe1->xdf2.recs + i1; | |
101 | xrecord_t **rec2 = xe2->xdf2.recs + i2; | |
102 | ||
103 | for (i = 0; i < line_count; i++) { | |
104 | int result = xdl_recmatch(rec1[i]->ptr, rec1[i]->size, | |
105 | rec2[i]->ptr, rec2[i]->size, flags); | |
106 | if (!result) | |
107 | return -1; | |
108 | } | |
109 | return 0; | |
110 | } | |
111 | ||
e0af48e4 | 112 | static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int add_nl, char *dest) |
857b933e | 113 | { |
e0af48e4 | 114 | xrecord_t **recs; |
857b933e JS |
115 | int size = 0; |
116 | ||
e0af48e4 JH |
117 | recs = (use_orig ? xe->xdf1.recs : xe->xdf2.recs) + i; |
118 | ||
857b933e JS |
119 | if (count < 1) |
120 | return 0; | |
121 | ||
122 | for (i = 0; i < count; size += recs[i++]->size) | |
123 | if (dest) | |
124 | memcpy(dest + size, recs[i]->ptr, recs[i]->size); | |
125 | if (add_nl) { | |
126 | i = recs[count - 1]->size; | |
127 | if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') { | |
128 | if (dest) | |
129 | dest[size] = '\n'; | |
130 | size++; | |
131 | } | |
132 | } | |
133 | return size; | |
134 | } | |
135 | ||
e0af48e4 JH |
136 | static int xdl_recs_copy(xdfenv_t *xe, int i, int count, int add_nl, char *dest) |
137 | { | |
138 | return xdl_recs_copy_0(0, xe, i, count, add_nl, dest); | |
139 | } | |
140 | ||
141 | static int xdl_orig_copy(xdfenv_t *xe, int i, int count, int add_nl, char *dest) | |
142 | { | |
143 | return xdl_recs_copy_0(1, xe, i, count, add_nl, dest); | |
144 | } | |
145 | ||
f2b25dd8 JH |
146 | static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1, |
147 | xdfenv_t *xe2, const char *name2, | |
8a161433 | 148 | const char *name3, |
e0af48e4 | 149 | int size, int i, int style, |
9914cf46 | 150 | xdmerge_t *m, char *dest, int marker_size) |
857b933e | 151 | { |
857b933e JS |
152 | int marker1_size = (name1 ? strlen(name1) + 1 : 0); |
153 | int marker2_size = (name2 ? strlen(name2) + 1 : 0); | |
8a161433 | 154 | int marker3_size = (name3 ? strlen(name3) + 1 : 0); |
f2b25dd8 JH |
155 | int j; |
156 | ||
9914cf46 JH |
157 | if (marker_size <= 0) |
158 | marker_size = DEFAULT_CONFLICT_MARKER_SIZE; | |
159 | ||
f2b25dd8 JH |
160 | /* Before conflicting part */ |
161 | size += xdl_recs_copy(xe1, i, m->i1 - i, 0, | |
162 | dest ? dest + size : NULL); | |
163 | ||
164 | if (!dest) { | |
165 | size += marker_size + 1 + marker1_size; | |
166 | } else { | |
167 | for (j = 0; j < marker_size; j++) | |
168 | dest[size++] = '<'; | |
169 | if (marker1_size) { | |
170 | dest[size] = ' '; | |
171 | memcpy(dest + size + 1, name1, marker1_size - 1); | |
172 | size += marker1_size; | |
173 | } | |
174 | dest[size++] = '\n'; | |
175 | } | |
176 | ||
177 | /* Postimage from side #1 */ | |
178 | size += xdl_recs_copy(xe1, m->i1, m->chg1, 1, | |
179 | dest ? dest + size : NULL); | |
e0af48e4 JH |
180 | |
181 | if (style == XDL_MERGE_DIFF3) { | |
182 | /* Shared preimage */ | |
183 | if (!dest) { | |
8a161433 | 184 | size += marker_size + 1 + marker3_size; |
e0af48e4 JH |
185 | } else { |
186 | for (j = 0; j < marker_size; j++) | |
187 | dest[size++] = '|'; | |
8a161433 JN |
188 | if (marker3_size) { |
189 | dest[size] = ' '; | |
190 | memcpy(dest + size + 1, name3, marker3_size - 1); | |
191 | size += marker3_size; | |
192 | } | |
e0af48e4 JH |
193 | dest[size++] = '\n'; |
194 | } | |
195 | size += xdl_orig_copy(xe1, m->i0, m->chg0, 1, | |
196 | dest ? dest + size : NULL); | |
197 | } | |
198 | ||
f2b25dd8 JH |
199 | if (!dest) { |
200 | size += marker_size + 1; | |
201 | } else { | |
202 | for (j = 0; j < marker_size; j++) | |
203 | dest[size++] = '='; | |
204 | dest[size++] = '\n'; | |
205 | } | |
206 | ||
207 | /* Postimage from side #2 */ | |
208 | size += xdl_recs_copy(xe2, m->i2, m->chg2, 1, | |
209 | dest ? dest + size : NULL); | |
210 | if (!dest) { | |
211 | size += marker_size + 1 + marker2_size; | |
212 | } else { | |
213 | for (j = 0; j < marker_size; j++) | |
214 | dest[size++] = '>'; | |
215 | if (marker2_size) { | |
216 | dest[size] = ' '; | |
217 | memcpy(dest + size + 1, name2, marker2_size - 1); | |
218 | size += marker2_size; | |
219 | } | |
220 | dest[size++] = '\n'; | |
221 | } | |
222 | return size; | |
223 | } | |
224 | ||
225 | static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1, | |
e0af48e4 | 226 | xdfenv_t *xe2, const char *name2, |
8a161433 | 227 | const char *ancestor_name, |
73eb40ee | 228 | int favor, |
9914cf46 JH |
229 | xdmerge_t *m, char *dest, int style, |
230 | int marker_size) | |
f2b25dd8 JH |
231 | { |
232 | int size, i; | |
233 | ||
234 | for (size = i = 0; m; m = m->next) { | |
73eb40ee JH |
235 | if (favor && !m->mode) |
236 | m->mode = favor; | |
237 | ||
f2b25dd8 JH |
238 | if (m->mode == 0) |
239 | size = fill_conflict_hunk(xe1, name1, xe2, name2, | |
8a161433 | 240 | ancestor_name, |
9914cf46 JH |
241 | size, i, style, m, dest, |
242 | marker_size); | |
cd1d61c4 BW |
243 | else if (m->mode & 3) { |
244 | /* Before conflicting part */ | |
245 | size += xdl_recs_copy(xe1, i, m->i1 - i, 0, | |
f2b25dd8 | 246 | dest ? dest + size : NULL); |
cd1d61c4 BW |
247 | /* Postimage from side #1 */ |
248 | if (m->mode & 1) | |
249 | size += xdl_recs_copy(xe1, m->i1, m->chg1, 1, | |
250 | dest ? dest + size : NULL); | |
251 | /* Postimage from side #2 */ | |
252 | if (m->mode & 2) | |
253 | size += xdl_recs_copy(xe2, m->i2, m->chg2, 1, | |
254 | dest ? dest + size : NULL); | |
255 | } else | |
22b6abcd | 256 | continue; |
f2b25dd8 | 257 | i = m->i1 + m->chg1; |
857b933e | 258 | } |
f2b25dd8 JH |
259 | size += xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0, |
260 | dest ? dest + size : NULL); | |
857b933e JS |
261 | return size; |
262 | } | |
263 | ||
264 | /* | |
265 | * Sometimes, changes are not quite identical, but differ in only a few | |
266 | * lines. Try hard to show only these few lines as conflicting. | |
267 | */ | |
268 | static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m, | |
269 | xpparam_t const *xpp) | |
270 | { | |
271 | for (; m; m = m->next) { | |
272 | mmfile_t t1, t2; | |
273 | xdfenv_t xe; | |
274 | xdchange_t *xscr, *x; | |
275 | int i1 = m->i1, i2 = m->i2; | |
276 | ||
277 | /* let's handle just the conflicts */ | |
278 | if (m->mode) | |
279 | continue; | |
280 | ||
5d6b151f JS |
281 | /* no sense refining a conflict when one side is empty */ |
282 | if (m->chg1 == 0 || m->chg2 == 0) | |
283 | continue; | |
284 | ||
857b933e JS |
285 | /* |
286 | * This probably does not work outside git, since | |
287 | * we have a very simple mmfile structure. | |
288 | */ | |
289 | t1.ptr = (char *)xe1->xdf2.recs[m->i1]->ptr; | |
875b8ce4 JS |
290 | t1.size = xe1->xdf2.recs[m->i1 + m->chg1 - 1]->ptr |
291 | + xe1->xdf2.recs[m->i1 + m->chg1 - 1]->size - t1.ptr; | |
292 | t2.ptr = (char *)xe2->xdf2.recs[m->i2]->ptr; | |
293 | t2.size = xe2->xdf2.recs[m->i2 + m->chg2 - 1]->ptr | |
294 | + xe2->xdf2.recs[m->i2 + m->chg2 - 1]->size - t2.ptr; | |
857b933e JS |
295 | if (xdl_do_diff(&t1, &t2, xpp, &xe) < 0) |
296 | return -1; | |
297 | if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 || | |
298 | xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 || | |
299 | xdl_build_script(&xe, &xscr) < 0) { | |
300 | xdl_free_env(&xe); | |
301 | return -1; | |
302 | } | |
303 | if (!xscr) { | |
22b6abcd | 304 | /* If this happens, the changes are identical. */ |
857b933e | 305 | xdl_free_env(&xe); |
22b6abcd JS |
306 | m->mode = 4; |
307 | continue; | |
857b933e JS |
308 | } |
309 | x = xscr; | |
310 | m->i1 = xscr->i1 + i1; | |
311 | m->chg1 = xscr->chg1; | |
312 | m->i2 = xscr->i2 + i2; | |
313 | m->chg2 = xscr->chg2; | |
314 | while (xscr->next) { | |
315 | xdmerge_t *m2 = xdl_malloc(sizeof(xdmerge_t)); | |
316 | if (!m2) { | |
317 | xdl_free_env(&xe); | |
318 | xdl_free_script(x); | |
319 | return -1; | |
320 | } | |
321 | xscr = xscr->next; | |
322 | m2->next = m->next; | |
323 | m->next = m2; | |
324 | m = m2; | |
325 | m->mode = 0; | |
326 | m->i1 = xscr->i1 + i1; | |
327 | m->chg1 = xscr->chg1; | |
328 | m->i2 = xscr->i2 + i2; | |
329 | m->chg2 = xscr->chg2; | |
330 | } | |
331 | xdl_free_env(&xe); | |
332 | xdl_free_script(x); | |
333 | } | |
334 | return 0; | |
335 | } | |
336 | ||
ee95ec5d JS |
337 | static int line_contains_alnum(const char *ptr, long size) |
338 | { | |
339 | while (size--) | |
340 | if (isalnum(*(ptr++))) | |
341 | return 1; | |
342 | return 0; | |
343 | } | |
344 | ||
345 | static int lines_contain_alnum(xdfenv_t *xe, int i, int chg) | |
346 | { | |
347 | for (; chg; chg--, i++) | |
348 | if (line_contains_alnum(xe->xdf2.recs[i]->ptr, | |
349 | xe->xdf2.recs[i]->size)) | |
350 | return 1; | |
351 | return 0; | |
352 | } | |
353 | ||
f407f14d JS |
354 | /* |
355 | * This function merges m and m->next, marking everything between those hunks | |
356 | * as conflicting, too. | |
357 | */ | |
358 | static void xdl_merge_two_conflicts(xdmerge_t *m) | |
359 | { | |
360 | xdmerge_t *next_m = m->next; | |
361 | m->chg1 = next_m->i1 + next_m->chg1 - m->i1; | |
362 | m->chg2 = next_m->i2 + next_m->chg2 - m->i2; | |
363 | m->next = next_m->next; | |
364 | free(next_m); | |
365 | } | |
366 | ||
367 | /* | |
368 | * If there are less than 3 non-conflicting lines between conflicts, | |
369 | * it appears simpler -- because it takes up less (or as many) lines -- | |
370 | * if the lines are moved into the conflicts. | |
371 | */ | |
ee95ec5d JS |
372 | static int xdl_simplify_non_conflicts(xdfenv_t *xe1, xdmerge_t *m, |
373 | int simplify_if_no_alnum) | |
f407f14d JS |
374 | { |
375 | int result = 0; | |
376 | ||
377 | if (!m) | |
378 | return result; | |
379 | for (;;) { | |
380 | xdmerge_t *next_m = m->next; | |
381 | int begin, end; | |
382 | ||
383 | if (!next_m) | |
384 | return result; | |
385 | ||
386 | begin = m->i1 + m->chg1; | |
387 | end = next_m->i1; | |
388 | ||
ee95ec5d JS |
389 | if (m->mode != 0 || next_m->mode != 0 || |
390 | (end - begin > 3 && | |
391 | (!simplify_if_no_alnum || | |
392 | lines_contain_alnum(xe1, begin, end - begin)))) { | |
f407f14d | 393 | m = next_m; |
ee95ec5d | 394 | } else { |
f407f14d JS |
395 | result++; |
396 | xdl_merge_two_conflicts(m); | |
397 | } | |
398 | } | |
399 | } | |
400 | ||
857b933e JS |
401 | /* |
402 | * level == 0: mark all overlapping changes as conflict | |
403 | * level == 1: mark overlapping changes as conflict only if not identical | |
404 | * level == 2: analyze non-identical changes for minimal conflict set | |
ee95ec5d JS |
405 | * level == 3: analyze non-identical changes for minimal conflict set, but |
406 | * treat hunks not containing any letter or number as conflicting | |
857b933e JS |
407 | * |
408 | * returns < 0 on error, == 0 for no conflicts, else number of conflicts | |
409 | */ | |
410 | static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, const char *name1, | |
411 | xdfenv_t *xe2, xdchange_t *xscr2, const char *name2, | |
560119b9 | 412 | xmparam_t const *xmp, mmbuffer_t *result) { |
857b933e | 413 | xdmerge_t *changes, *c; |
9914cf46 | 414 | xpparam_t const *xpp = &xmp->xpp; |
8a161433 | 415 | const char *const ancestor_name = xmp->ancestor; |
e0af48e4 | 416 | int i0, i1, i2, chg0, chg1, chg2; |
560119b9 BW |
417 | int level = xmp->level; |
418 | int style = xmp->style; | |
419 | int favor = xmp->favor; | |
857b933e | 420 | |
83133740 JH |
421 | if (style == XDL_MERGE_DIFF3) { |
422 | /* | |
423 | * "diff3 -m" output does not make sense for anything | |
424 | * more aggressive than XDL_MERGE_EAGER. | |
425 | */ | |
426 | if (XDL_MERGE_EAGER < level) | |
427 | level = XDL_MERGE_EAGER; | |
428 | } | |
429 | ||
857b933e JS |
430 | c = changes = NULL; |
431 | ||
432 | while (xscr1 && xscr2) { | |
433 | if (!changes) | |
434 | changes = c; | |
435 | if (xscr1->i1 + xscr1->chg1 < xscr2->i1) { | |
e0af48e4 | 436 | i0 = xscr1->i1; |
857b933e JS |
437 | i1 = xscr1->i2; |
438 | i2 = xscr2->i2 - xscr2->i1 + xscr1->i1; | |
e0af48e4 | 439 | chg0 = xscr1->chg1; |
857b933e JS |
440 | chg1 = xscr1->chg2; |
441 | chg2 = xscr1->chg1; | |
e0af48e4 JH |
442 | if (xdl_append_merge(&c, 1, |
443 | i0, chg0, i1, chg1, i2, chg2)) { | |
857b933e JS |
444 | xdl_cleanup_merge(changes); |
445 | return -1; | |
446 | } | |
447 | xscr1 = xscr1->next; | |
448 | continue; | |
449 | } | |
450 | if (xscr2->i1 + xscr2->chg1 < xscr1->i1) { | |
e0af48e4 | 451 | i0 = xscr2->i1; |
857b933e JS |
452 | i1 = xscr1->i2 - xscr1->i1 + xscr2->i1; |
453 | i2 = xscr2->i2; | |
e0af48e4 | 454 | chg0 = xscr2->chg1; |
857b933e JS |
455 | chg1 = xscr2->chg1; |
456 | chg2 = xscr2->chg2; | |
e0af48e4 JH |
457 | if (xdl_append_merge(&c, 2, |
458 | i0, chg0, i1, chg1, i2, chg2)) { | |
857b933e JS |
459 | xdl_cleanup_merge(changes); |
460 | return -1; | |
461 | } | |
462 | xscr2 = xscr2->next; | |
463 | continue; | |
464 | } | |
838338cd | 465 | if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 || |
857b933e JS |
466 | xscr1->chg1 != xscr2->chg1 || |
467 | xscr1->chg2 != xscr2->chg2 || | |
468 | xdl_merge_cmp_lines(xe1, xscr1->i2, | |
469 | xe2, xscr2->i2, | |
470 | xscr1->chg2, xpp->flags)) { | |
471 | /* conflict */ | |
472 | int off = xscr1->i1 - xscr2->i1; | |
473 | int ffo = off + xscr1->chg1 - xscr2->chg1; | |
474 | ||
e0af48e4 | 475 | i0 = xscr1->i1; |
857b933e JS |
476 | i1 = xscr1->i2; |
477 | i2 = xscr2->i2; | |
e0af48e4 JH |
478 | if (off > 0) { |
479 | i0 -= off; | |
857b933e | 480 | i1 -= off; |
e0af48e4 | 481 | } |
857b933e JS |
482 | else |
483 | i2 += off; | |
e0af48e4 | 484 | chg0 = xscr1->i1 + xscr1->chg1 - i0; |
857b933e JS |
485 | chg1 = xscr1->i2 + xscr1->chg2 - i1; |
486 | chg2 = xscr2->i2 + xscr2->chg2 - i2; | |
838338cd | 487 | if (ffo < 0) { |
e0af48e4 | 488 | chg0 -= ffo; |
857b933e | 489 | chg1 -= ffo; |
838338cd JH |
490 | } else |
491 | chg2 += ffo; | |
e0af48e4 JH |
492 | if (xdl_append_merge(&c, 0, |
493 | i0, chg0, i1, chg1, i2, chg2)) { | |
857b933e JS |
494 | xdl_cleanup_merge(changes); |
495 | return -1; | |
496 | } | |
497 | } | |
498 | ||
499 | i1 = xscr1->i1 + xscr1->chg1; | |
500 | i2 = xscr2->i1 + xscr2->chg1; | |
501 | ||
98e6da8a | 502 | if (i1 >= i2) |
710daa83 | 503 | xscr2 = xscr2->next; |
98e6da8a | 504 | if (i2 >= i1) |
857b933e | 505 | xscr1 = xscr1->next; |
857b933e JS |
506 | } |
507 | while (xscr1) { | |
508 | if (!changes) | |
509 | changes = c; | |
e0af48e4 | 510 | i0 = xscr1->i1; |
857b933e JS |
511 | i1 = xscr1->i2; |
512 | i2 = xscr1->i1 + xe2->xdf2.nrec - xe2->xdf1.nrec; | |
e0af48e4 | 513 | chg0 = xscr1->chg1; |
857b933e JS |
514 | chg1 = xscr1->chg2; |
515 | chg2 = xscr1->chg1; | |
e0af48e4 JH |
516 | if (xdl_append_merge(&c, 1, |
517 | i0, chg0, i1, chg1, i2, chg2)) { | |
857b933e JS |
518 | xdl_cleanup_merge(changes); |
519 | return -1; | |
520 | } | |
521 | xscr1 = xscr1->next; | |
522 | } | |
523 | while (xscr2) { | |
524 | if (!changes) | |
525 | changes = c; | |
e0af48e4 | 526 | i0 = xscr2->i1; |
857b933e JS |
527 | i1 = xscr2->i1 + xe1->xdf2.nrec - xe1->xdf1.nrec; |
528 | i2 = xscr2->i2; | |
e0af48e4 | 529 | chg0 = xscr2->chg1; |
857b933e JS |
530 | chg1 = xscr2->chg1; |
531 | chg2 = xscr2->chg2; | |
e0af48e4 JH |
532 | if (xdl_append_merge(&c, 2, |
533 | i0, chg0, i1, chg1, i2, chg2)) { | |
857b933e JS |
534 | xdl_cleanup_merge(changes); |
535 | return -1; | |
536 | } | |
537 | xscr2 = xscr2->next; | |
538 | } | |
539 | if (!changes) | |
540 | changes = c; | |
541 | /* refine conflicts */ | |
838338cd | 542 | if (XDL_MERGE_ZEALOUS <= level && |
f407f14d | 543 | (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 || |
838338cd JH |
544 | xdl_simplify_non_conflicts(xe1, changes, |
545 | XDL_MERGE_ZEALOUS < level) < 0)) { | |
857b933e JS |
546 | xdl_cleanup_merge(changes); |
547 | return -1; | |
548 | } | |
549 | /* output */ | |
550 | if (result) { | |
9914cf46 | 551 | int marker_size = xmp->marker_size; |
857b933e | 552 | int size = xdl_fill_merge_buffer(xe1, name1, xe2, name2, |
8a161433 | 553 | ancestor_name, |
06dbc1ea | 554 | favor, changes, NULL, style, |
9914cf46 | 555 | marker_size); |
857b933e JS |
556 | result->ptr = xdl_malloc(size); |
557 | if (!result->ptr) { | |
558 | xdl_cleanup_merge(changes); | |
559 | return -1; | |
560 | } | |
561 | result->size = size; | |
8a161433 JN |
562 | xdl_fill_merge_buffer(xe1, name1, xe2, name2, |
563 | ancestor_name, favor, changes, | |
9914cf46 | 564 | result->ptr, style, marker_size); |
857b933e JS |
565 | } |
566 | return xdl_cleanup_merge(changes); | |
567 | } | |
568 | ||
569 | int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1, | |
570 | mmfile_t *mf2, const char *name2, | |
560119b9 | 571 | xmparam_t const *xmp, mmbuffer_t *result) { |
857b933e JS |
572 | xdchange_t *xscr1, *xscr2; |
573 | xdfenv_t xe1, xe2; | |
53a7085a | 574 | int status; |
00f8f97d | 575 | xpparam_t const *xpp = &xmp->xpp; |
857b933e JS |
576 | |
577 | result->ptr = NULL; | |
578 | result->size = 0; | |
579 | ||
580 | if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0 || | |
581 | xdl_do_diff(orig, mf2, xpp, &xe2) < 0) { | |
582 | return -1; | |
583 | } | |
584 | if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 || | |
585 | xdl_change_compact(&xe1.xdf2, &xe1.xdf1, xpp->flags) < 0 || | |
586 | xdl_build_script(&xe1, &xscr1) < 0) { | |
587 | xdl_free_env(&xe1); | |
588 | return -1; | |
589 | } | |
590 | if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 || | |
591 | xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 || | |
592 | xdl_build_script(&xe2, &xscr2) < 0) { | |
593 | xdl_free_env(&xe2); | |
594 | return -1; | |
595 | } | |
53a7085a | 596 | status = 0; |
5719db91 CB |
597 | if (!xscr1) { |
598 | result->ptr = xdl_malloc(mf2->size); | |
599 | memcpy(result->ptr, mf2->ptr, mf2->size); | |
600 | result->size = mf2->size; | |
601 | } else if (!xscr2) { | |
602 | result->ptr = xdl_malloc(mf1->size); | |
603 | memcpy(result->ptr, mf1->ptr, mf1->size); | |
604 | result->size = mf1->size; | |
605 | } else { | |
606 | status = xdl_do_merge(&xe1, xscr1, name1, | |
607 | &xe2, xscr2, name2, | |
560119b9 | 608 | xmp, result); |
857b933e | 609 | } |
5719db91 CB |
610 | xdl_free_script(xscr1); |
611 | xdl_free_script(xscr2); | |
612 | ||
857b933e JS |
613 | xdl_free_env(&xe1); |
614 | xdl_free_env(&xe2); | |
615 | ||
53a7085a | 616 | return status; |
857b933e | 617 | } |