Line | Count | Source (jump to first uncovered line) |
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, see |
17 | | * <http://www.gnu.org/licenses/>. |
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. |
31 | | * 3 = no conflict, take both. |
32 | | */ |
33 | | int mode; |
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 | | */ |
40 | | long i1, i2; |
41 | | long chg1, chg2; |
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; |
48 | | } xdmerge_t; |
49 | | |
50 | | static int xdl_append_merge(xdmerge_t **merge, int mode, |
51 | | long i0, long chg0, |
52 | | long i1, long chg1, |
53 | | long i2, long chg2) |
54 | 0 | { |
55 | 0 | xdmerge_t *m = *merge; |
56 | 0 | if (m && (i1 <= m->i1 + m->chg1 || i2 <= m->i2 + m->chg2)) { |
57 | 0 | if (mode != m->mode) |
58 | 0 | m->mode = 0; |
59 | 0 | m->chg0 = i0 + chg0 - m->i0; |
60 | 0 | m->chg1 = i1 + chg1 - m->i1; |
61 | 0 | m->chg2 = i2 + chg2 - m->i2; |
62 | 0 | } else { |
63 | 0 | m = xdl_malloc(sizeof(xdmerge_t)); |
64 | 0 | if (!m) |
65 | 0 | return -1; |
66 | 0 | m->next = NULL; |
67 | 0 | m->mode = mode; |
68 | 0 | m->i0 = i0; |
69 | 0 | m->chg0 = chg0; |
70 | 0 | m->i1 = i1; |
71 | 0 | m->chg1 = chg1; |
72 | 0 | m->i2 = i2; |
73 | 0 | m->chg2 = chg2; |
74 | 0 | if (*merge) |
75 | 0 | (*merge)->next = m; |
76 | 0 | *merge = m; |
77 | 0 | } |
78 | 0 | return 0; |
79 | 0 | } |
80 | | |
81 | | static int xdl_cleanup_merge(xdmerge_t *c) |
82 | 0 | { |
83 | 0 | int count = 0; |
84 | 0 | xdmerge_t *next_c; |
85 | | |
86 | | /* were there conflicts? */ |
87 | 0 | for (; c; c = next_c) { |
88 | 0 | if (c->mode == 0) |
89 | 0 | count++; |
90 | 0 | next_c = c->next; |
91 | 0 | free(c); |
92 | 0 | } |
93 | 0 | return count; |
94 | 0 | } |
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 | 0 | { |
99 | 0 | int i; |
100 | 0 | xrecord_t **rec1 = xe1->xdf2.recs + i1; |
101 | 0 | xrecord_t **rec2 = xe2->xdf2.recs + i2; |
102 | |
|
103 | 0 | for (i = 0; i < line_count; i++) { |
104 | 0 | int result = xdl_recmatch(rec1[i]->ptr, rec1[i]->size, |
105 | 0 | rec2[i]->ptr, rec2[i]->size, flags); |
106 | 0 | if (!result) |
107 | 0 | return -1; |
108 | 0 | } |
109 | 0 | return 0; |
110 | 0 | } |
111 | | |
112 | | static int xdl_recs_copy_0(int use_orig, xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest) |
113 | 0 | { |
114 | 0 | xrecord_t **recs; |
115 | 0 | int size = 0; |
116 | |
|
117 | 0 | recs = (use_orig ? xe->xdf1.recs : xe->xdf2.recs) + i; |
118 | |
|
119 | 0 | if (count < 1) |
120 | 0 | return 0; |
121 | | |
122 | 0 | for (i = 0; i < count; size += recs[i++]->size) |
123 | 0 | if (dest) |
124 | 0 | memcpy(dest + size, recs[i]->ptr, recs[i]->size); |
125 | 0 | if (add_nl) { |
126 | 0 | i = recs[count - 1]->size; |
127 | 0 | if (i == 0 || recs[count - 1]->ptr[i - 1] != '\n') { |
128 | 0 | if (needs_cr) { |
129 | 0 | if (dest) |
130 | 0 | dest[size] = '\r'; |
131 | 0 | size++; |
132 | 0 | } |
133 | |
|
134 | 0 | if (dest) |
135 | 0 | dest[size] = '\n'; |
136 | 0 | size++; |
137 | 0 | } |
138 | 0 | } |
139 | 0 | return size; |
140 | 0 | } |
141 | | |
142 | | static int xdl_recs_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest) |
143 | 0 | { |
144 | 0 | return xdl_recs_copy_0(0, xe, i, count, needs_cr, add_nl, dest); |
145 | 0 | } |
146 | | |
147 | | static int xdl_orig_copy(xdfenv_t *xe, int i, int count, int needs_cr, int add_nl, char *dest) |
148 | 0 | { |
149 | 0 | return xdl_recs_copy_0(1, xe, i, count, needs_cr, add_nl, dest); |
150 | 0 | } |
151 | | |
152 | | /* |
153 | | * Returns 1 if the i'th line ends in CR/LF (if it is the last line and |
154 | | * has no eol, the preceding line, if any), 0 if it ends in LF-only, and |
155 | | * -1 if the line ending cannot be determined. |
156 | | */ |
157 | | static int is_eol_crlf(xdfile_t *file, int i) |
158 | 0 | { |
159 | 0 | long size; |
160 | |
|
161 | 0 | if (i < file->nrec - 1) |
162 | | /* All lines before the last *must* end in LF */ |
163 | 0 | return (size = file->recs[i]->size) > 1 && |
164 | 0 | file->recs[i]->ptr[size - 2] == '\r'; |
165 | 0 | if (!file->nrec) |
166 | | /* Cannot determine eol style from empty file */ |
167 | 0 | return -1; |
168 | 0 | if ((size = file->recs[i]->size) && |
169 | 0 | file->recs[i]->ptr[size - 1] == '\n') |
170 | | /* Last line; ends in LF; Is it CR/LF? */ |
171 | 0 | return size > 1 && |
172 | 0 | file->recs[i]->ptr[size - 2] == '\r'; |
173 | 0 | if (!i) |
174 | | /* The only line has no eol */ |
175 | 0 | return -1; |
176 | | /* Determine eol from second-to-last line */ |
177 | 0 | return (size = file->recs[i - 1]->size) > 1 && |
178 | 0 | file->recs[i - 1]->ptr[size - 2] == '\r'; |
179 | 0 | } |
180 | | |
181 | | static int is_cr_needed(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m) |
182 | 0 | { |
183 | 0 | int needs_cr; |
184 | | |
185 | | /* Match post-images' preceding, or first, lines' end-of-line style */ |
186 | 0 | needs_cr = is_eol_crlf(&xe1->xdf2, m->i1 ? m->i1 - 1 : 0); |
187 | 0 | if (needs_cr) |
188 | 0 | needs_cr = is_eol_crlf(&xe2->xdf2, m->i2 ? m->i2 - 1 : 0); |
189 | | /* Look at pre-image's first line, unless we already settled on LF */ |
190 | 0 | if (needs_cr) |
191 | 0 | needs_cr = is_eol_crlf(&xe1->xdf1, 0); |
192 | | /* If still undecided, use LF-only */ |
193 | 0 | return needs_cr < 0 ? 0 : needs_cr; |
194 | 0 | } |
195 | | |
196 | | static int fill_conflict_hunk(xdfenv_t *xe1, const char *name1, |
197 | | xdfenv_t *xe2, const char *name2, |
198 | | const char *name3, |
199 | | int size, int i, int style, |
200 | | xdmerge_t *m, char *dest, int marker_size) |
201 | 0 | { |
202 | 0 | int marker1_size = (name1 ? strlen(name1) + 1 : 0); |
203 | 0 | int marker2_size = (name2 ? strlen(name2) + 1 : 0); |
204 | 0 | int marker3_size = (name3 ? strlen(name3) + 1 : 0); |
205 | 0 | int needs_cr = is_cr_needed(xe1, xe2, m); |
206 | |
|
207 | 0 | if (marker_size <= 0) |
208 | 0 | marker_size = DEFAULT_CONFLICT_MARKER_SIZE; |
209 | | |
210 | | /* Before conflicting part */ |
211 | 0 | size += xdl_recs_copy(xe1, i, m->i1 - i, 0, 0, |
212 | 0 | dest ? dest + size : NULL); |
213 | |
|
214 | 0 | if (!dest) { |
215 | 0 | size += marker_size + 1 + needs_cr + marker1_size; |
216 | 0 | } else { |
217 | 0 | memset(dest + size, '<', marker_size); |
218 | 0 | size += marker_size; |
219 | 0 | if (marker1_size) { |
220 | 0 | dest[size] = ' '; |
221 | 0 | memcpy(dest + size + 1, name1, marker1_size - 1); |
222 | 0 | size += marker1_size; |
223 | 0 | } |
224 | 0 | if (needs_cr) |
225 | 0 | dest[size++] = '\r'; |
226 | 0 | dest[size++] = '\n'; |
227 | 0 | } |
228 | | |
229 | | /* Postimage from side #1 */ |
230 | 0 | size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, 1, |
231 | 0 | dest ? dest + size : NULL); |
232 | |
|
233 | 0 | if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) { |
234 | | /* Shared preimage */ |
235 | 0 | if (!dest) { |
236 | 0 | size += marker_size + 1 + needs_cr + marker3_size; |
237 | 0 | } else { |
238 | 0 | memset(dest + size, '|', marker_size); |
239 | 0 | size += marker_size; |
240 | 0 | if (marker3_size) { |
241 | 0 | dest[size] = ' '; |
242 | 0 | memcpy(dest + size + 1, name3, marker3_size - 1); |
243 | 0 | size += marker3_size; |
244 | 0 | } |
245 | 0 | if (needs_cr) |
246 | 0 | dest[size++] = '\r'; |
247 | 0 | dest[size++] = '\n'; |
248 | 0 | } |
249 | 0 | size += xdl_orig_copy(xe1, m->i0, m->chg0, needs_cr, 1, |
250 | 0 | dest ? dest + size : NULL); |
251 | 0 | } |
252 | |
|
253 | 0 | if (!dest) { |
254 | 0 | size += marker_size + 1 + needs_cr; |
255 | 0 | } else { |
256 | 0 | memset(dest + size, '=', marker_size); |
257 | 0 | size += marker_size; |
258 | 0 | if (needs_cr) |
259 | 0 | dest[size++] = '\r'; |
260 | 0 | dest[size++] = '\n'; |
261 | 0 | } |
262 | | |
263 | | /* Postimage from side #2 */ |
264 | 0 | size += xdl_recs_copy(xe2, m->i2, m->chg2, needs_cr, 1, |
265 | 0 | dest ? dest + size : NULL); |
266 | 0 | if (!dest) { |
267 | 0 | size += marker_size + 1 + needs_cr + marker2_size; |
268 | 0 | } else { |
269 | 0 | memset(dest + size, '>', marker_size); |
270 | 0 | size += marker_size; |
271 | 0 | if (marker2_size) { |
272 | 0 | dest[size] = ' '; |
273 | 0 | memcpy(dest + size + 1, name2, marker2_size - 1); |
274 | 0 | size += marker2_size; |
275 | 0 | } |
276 | 0 | if (needs_cr) |
277 | 0 | dest[size++] = '\r'; |
278 | 0 | dest[size++] = '\n'; |
279 | 0 | } |
280 | 0 | return size; |
281 | 0 | } |
282 | | |
283 | | static int xdl_fill_merge_buffer(xdfenv_t *xe1, const char *name1, |
284 | | xdfenv_t *xe2, const char *name2, |
285 | | const char *ancestor_name, |
286 | | int favor, |
287 | | xdmerge_t *m, char *dest, int style, |
288 | | int marker_size) |
289 | 0 | { |
290 | 0 | int size, i; |
291 | |
|
292 | 0 | for (size = i = 0; m; m = m->next) { |
293 | 0 | if (favor && !m->mode) |
294 | 0 | m->mode = favor; |
295 | |
|
296 | 0 | if (m->mode == 0) |
297 | 0 | size = fill_conflict_hunk(xe1, name1, xe2, name2, |
298 | 0 | ancestor_name, |
299 | 0 | size, i, style, m, dest, |
300 | 0 | marker_size); |
301 | 0 | else if (m->mode & 3) { |
302 | | /* Before conflicting part */ |
303 | 0 | size += xdl_recs_copy(xe1, i, m->i1 - i, 0, 0, |
304 | 0 | dest ? dest + size : NULL); |
305 | | /* Postimage from side #1 */ |
306 | 0 | if (m->mode & 1) { |
307 | 0 | int needs_cr = is_cr_needed(xe1, xe2, m); |
308 | |
|
309 | 0 | size += xdl_recs_copy(xe1, m->i1, m->chg1, needs_cr, (m->mode & 2), |
310 | 0 | dest ? dest + size : NULL); |
311 | 0 | } |
312 | | /* Postimage from side #2 */ |
313 | 0 | if (m->mode & 2) |
314 | 0 | size += xdl_recs_copy(xe2, m->i2, m->chg2, 0, 0, |
315 | 0 | dest ? dest + size : NULL); |
316 | 0 | } else |
317 | 0 | continue; |
318 | 0 | i = m->i1 + m->chg1; |
319 | 0 | } |
320 | 0 | size += xdl_recs_copy(xe1, i, xe1->xdf2.nrec - i, 0, 0, |
321 | 0 | dest ? dest + size : NULL); |
322 | 0 | return size; |
323 | 0 | } |
324 | | |
325 | | static int recmatch(xrecord_t *rec1, xrecord_t *rec2, unsigned long flags) |
326 | 0 | { |
327 | 0 | return xdl_recmatch(rec1->ptr, rec1->size, |
328 | 0 | rec2->ptr, rec2->size, flags); |
329 | 0 | } |
330 | | |
331 | | /* |
332 | | * Remove any common lines from the beginning and end of the conflicted region. |
333 | | */ |
334 | | static void xdl_refine_zdiff3_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m, |
335 | | xpparam_t const *xpp) |
336 | 0 | { |
337 | 0 | xrecord_t **rec1 = xe1->xdf2.recs, **rec2 = xe2->xdf2.recs; |
338 | 0 | for (; m; m = m->next) { |
339 | | /* let's handle just the conflicts */ |
340 | 0 | if (m->mode) |
341 | 0 | continue; |
342 | | |
343 | 0 | while(m->chg1 && m->chg2 && |
344 | 0 | recmatch(rec1[m->i1], rec2[m->i2], xpp->flags)) { |
345 | 0 | m->chg1--; |
346 | 0 | m->chg2--; |
347 | 0 | m->i1++; |
348 | 0 | m->i2++; |
349 | 0 | } |
350 | 0 | while (m->chg1 && m->chg2 && |
351 | 0 | recmatch(rec1[m->i1 + m->chg1 - 1], |
352 | 0 | rec2[m->i2 + m->chg2 - 1], xpp->flags)) { |
353 | 0 | m->chg1--; |
354 | 0 | m->chg2--; |
355 | 0 | } |
356 | 0 | } |
357 | 0 | } |
358 | | |
359 | | /* |
360 | | * Sometimes, changes are not quite identical, but differ in only a few |
361 | | * lines. Try hard to show only these few lines as conflicting. |
362 | | */ |
363 | | static int xdl_refine_conflicts(xdfenv_t *xe1, xdfenv_t *xe2, xdmerge_t *m, |
364 | | xpparam_t const *xpp) |
365 | 0 | { |
366 | 0 | for (; m; m = m->next) { |
367 | 0 | mmfile_t t1, t2; |
368 | 0 | xdfenv_t xe; |
369 | 0 | xdchange_t *xscr, *x; |
370 | 0 | int i1 = m->i1, i2 = m->i2; |
371 | | |
372 | | /* let's handle just the conflicts */ |
373 | 0 | if (m->mode) |
374 | 0 | continue; |
375 | | |
376 | | /* no sense refining a conflict when one side is empty */ |
377 | 0 | if (m->chg1 == 0 || m->chg2 == 0) |
378 | 0 | continue; |
379 | | |
380 | | /* |
381 | | * This probably does not work outside git, since |
382 | | * we have a very simple mmfile structure. |
383 | | */ |
384 | 0 | t1.ptr = (char *)xe1->xdf2.recs[m->i1]->ptr; |
385 | 0 | t1.size = xe1->xdf2.recs[m->i1 + m->chg1 - 1]->ptr |
386 | 0 | + xe1->xdf2.recs[m->i1 + m->chg1 - 1]->size - t1.ptr; |
387 | 0 | t2.ptr = (char *)xe2->xdf2.recs[m->i2]->ptr; |
388 | 0 | t2.size = xe2->xdf2.recs[m->i2 + m->chg2 - 1]->ptr |
389 | 0 | + xe2->xdf2.recs[m->i2 + m->chg2 - 1]->size - t2.ptr; |
390 | 0 | if (xdl_do_diff(&t1, &t2, xpp, &xe) < 0) |
391 | 0 | return -1; |
392 | 0 | if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 || |
393 | 0 | xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 || |
394 | 0 | xdl_build_script(&xe, &xscr) < 0) { |
395 | 0 | xdl_free_env(&xe); |
396 | 0 | return -1; |
397 | 0 | } |
398 | 0 | if (!xscr) { |
399 | | /* If this happens, the changes are identical. */ |
400 | 0 | xdl_free_env(&xe); |
401 | 0 | m->mode = 4; |
402 | 0 | continue; |
403 | 0 | } |
404 | 0 | x = xscr; |
405 | 0 | m->i1 = xscr->i1 + i1; |
406 | 0 | m->chg1 = xscr->chg1; |
407 | 0 | m->i2 = xscr->i2 + i2; |
408 | 0 | m->chg2 = xscr->chg2; |
409 | 0 | while (xscr->next) { |
410 | 0 | xdmerge_t *m2 = xdl_malloc(sizeof(xdmerge_t)); |
411 | 0 | if (!m2) { |
412 | 0 | xdl_free_env(&xe); |
413 | 0 | xdl_free_script(x); |
414 | 0 | return -1; |
415 | 0 | } |
416 | 0 | xscr = xscr->next; |
417 | 0 | m2->next = m->next; |
418 | 0 | m->next = m2; |
419 | 0 | m = m2; |
420 | 0 | m->mode = 0; |
421 | 0 | m->i1 = xscr->i1 + i1; |
422 | 0 | m->chg1 = xscr->chg1; |
423 | 0 | m->i2 = xscr->i2 + i2; |
424 | 0 | m->chg2 = xscr->chg2; |
425 | 0 | } |
426 | 0 | xdl_free_env(&xe); |
427 | 0 | xdl_free_script(x); |
428 | 0 | } |
429 | 0 | return 0; |
430 | 0 | } |
431 | | |
432 | | static int line_contains_alnum(const char *ptr, long size) |
433 | 0 | { |
434 | 0 | while (size--) |
435 | 0 | if (isalnum((unsigned char)*(ptr++))) |
436 | 0 | return 1; |
437 | 0 | return 0; |
438 | 0 | } |
439 | | |
440 | | static int lines_contain_alnum(xdfenv_t *xe, int i, int chg) |
441 | 0 | { |
442 | 0 | for (; chg; chg--, i++) |
443 | 0 | if (line_contains_alnum(xe->xdf2.recs[i]->ptr, |
444 | 0 | xe->xdf2.recs[i]->size)) |
445 | 0 | return 1; |
446 | 0 | return 0; |
447 | 0 | } |
448 | | |
449 | | /* |
450 | | * This function merges m and m->next, marking everything between those hunks |
451 | | * as conflicting, too. |
452 | | */ |
453 | | static void xdl_merge_two_conflicts(xdmerge_t *m) |
454 | 0 | { |
455 | 0 | xdmerge_t *next_m = m->next; |
456 | 0 | m->chg1 = next_m->i1 + next_m->chg1 - m->i1; |
457 | 0 | m->chg2 = next_m->i2 + next_m->chg2 - m->i2; |
458 | 0 | m->next = next_m->next; |
459 | 0 | free(next_m); |
460 | 0 | } |
461 | | |
462 | | /* |
463 | | * If there are less than 3 non-conflicting lines between conflicts, |
464 | | * it appears simpler -- because it takes up less (or as many) lines -- |
465 | | * if the lines are moved into the conflicts. |
466 | | */ |
467 | | static int xdl_simplify_non_conflicts(xdfenv_t *xe1, xdmerge_t *m, |
468 | | int simplify_if_no_alnum) |
469 | 0 | { |
470 | 0 | int result = 0; |
471 | |
|
472 | 0 | if (!m) |
473 | 0 | return result; |
474 | 0 | for (;;) { |
475 | 0 | xdmerge_t *next_m = m->next; |
476 | 0 | int begin, end; |
477 | |
|
478 | 0 | if (!next_m) |
479 | 0 | return result; |
480 | | |
481 | 0 | begin = m->i1 + m->chg1; |
482 | 0 | end = next_m->i1; |
483 | |
|
484 | 0 | if (m->mode != 0 || next_m->mode != 0 || |
485 | 0 | (end - begin > 3 && |
486 | 0 | (!simplify_if_no_alnum || |
487 | 0 | lines_contain_alnum(xe1, begin, end - begin)))) { |
488 | 0 | m = next_m; |
489 | 0 | } else { |
490 | 0 | result++; |
491 | 0 | xdl_merge_two_conflicts(m); |
492 | 0 | } |
493 | 0 | } |
494 | 0 | } |
495 | | |
496 | | /* |
497 | | * level == 0: mark all overlapping changes as conflict |
498 | | * level == 1: mark overlapping changes as conflict only if not identical |
499 | | * level == 2: analyze non-identical changes for minimal conflict set |
500 | | * level == 3: analyze non-identical changes for minimal conflict set, but |
501 | | * treat hunks not containing any letter or number as conflicting |
502 | | * |
503 | | * returns < 0 on error, == 0 for no conflicts, else number of conflicts |
504 | | */ |
505 | | static int xdl_do_merge(xdfenv_t *xe1, xdchange_t *xscr1, |
506 | | xdfenv_t *xe2, xdchange_t *xscr2, |
507 | | xmparam_t const *xmp, mmbuffer_t *result) |
508 | 0 | { |
509 | 0 | xdmerge_t *changes, *c; |
510 | 0 | xpparam_t const *xpp = &xmp->xpp; |
511 | 0 | const char *const ancestor_name = xmp->ancestor; |
512 | 0 | const char *const name1 = xmp->file1; |
513 | 0 | const char *const name2 = xmp->file2; |
514 | 0 | int i0, i1, i2, chg0, chg1, chg2; |
515 | 0 | int level = xmp->level; |
516 | 0 | int style = xmp->style; |
517 | 0 | int favor = xmp->favor; |
518 | | |
519 | | /* |
520 | | * XDL_MERGE_DIFF3 does not attempt to refine conflicts by looking |
521 | | * at common areas of sides 1 & 2, because the base (side 0) does |
522 | | * not match and is being shown. Similarly, simplification of |
523 | | * non-conflicts is also skipped due to the skipping of conflict |
524 | | * refinement. |
525 | | * |
526 | | * XDL_MERGE_ZEALOUS_DIFF3, on the other hand, will attempt to |
527 | | * refine conflicts looking for common areas of sides 1 & 2. |
528 | | * However, since the base is being shown and does not match, |
529 | | * it will only look for common areas at the beginning or end |
530 | | * of the conflict block. Since XDL_MERGE_ZEALOUS_DIFF3's |
531 | | * conflict refinement is much more limited in this fashion, the |
532 | | * conflict simplification will be skipped. |
533 | | */ |
534 | 0 | if (style == XDL_MERGE_DIFF3 || style == XDL_MERGE_ZEALOUS_DIFF3) { |
535 | | /* |
536 | | * "diff3 -m" output does not make sense for anything |
537 | | * more aggressive than XDL_MERGE_EAGER. |
538 | | */ |
539 | 0 | if (XDL_MERGE_EAGER < level) |
540 | 0 | level = XDL_MERGE_EAGER; |
541 | 0 | } |
542 | |
|
543 | 0 | c = changes = NULL; |
544 | |
|
545 | 0 | while (xscr1 && xscr2) { |
546 | 0 | if (!changes) |
547 | 0 | changes = c; |
548 | 0 | if (xscr1->i1 + xscr1->chg1 < xscr2->i1) { |
549 | 0 | i0 = xscr1->i1; |
550 | 0 | i1 = xscr1->i2; |
551 | 0 | i2 = xscr2->i2 - xscr2->i1 + xscr1->i1; |
552 | 0 | chg0 = xscr1->chg1; |
553 | 0 | chg1 = xscr1->chg2; |
554 | 0 | chg2 = xscr1->chg1; |
555 | 0 | if (xdl_append_merge(&c, 1, |
556 | 0 | i0, chg0, i1, chg1, i2, chg2)) { |
557 | 0 | xdl_cleanup_merge(changes); |
558 | 0 | return -1; |
559 | 0 | } |
560 | 0 | xscr1 = xscr1->next; |
561 | 0 | continue; |
562 | 0 | } |
563 | 0 | if (xscr2->i1 + xscr2->chg1 < xscr1->i1) { |
564 | 0 | i0 = xscr2->i1; |
565 | 0 | i1 = xscr1->i2 - xscr1->i1 + xscr2->i1; |
566 | 0 | i2 = xscr2->i2; |
567 | 0 | chg0 = xscr2->chg1; |
568 | 0 | chg1 = xscr2->chg1; |
569 | 0 | chg2 = xscr2->chg2; |
570 | 0 | if (xdl_append_merge(&c, 2, |
571 | 0 | i0, chg0, i1, chg1, i2, chg2)) { |
572 | 0 | xdl_cleanup_merge(changes); |
573 | 0 | return -1; |
574 | 0 | } |
575 | 0 | xscr2 = xscr2->next; |
576 | 0 | continue; |
577 | 0 | } |
578 | 0 | if (level == XDL_MERGE_MINIMAL || xscr1->i1 != xscr2->i1 || |
579 | 0 | xscr1->chg1 != xscr2->chg1 || |
580 | 0 | xscr1->chg2 != xscr2->chg2 || |
581 | 0 | xdl_merge_cmp_lines(xe1, xscr1->i2, |
582 | 0 | xe2, xscr2->i2, |
583 | 0 | xscr1->chg2, xpp->flags)) { |
584 | | /* conflict */ |
585 | 0 | int off = xscr1->i1 - xscr2->i1; |
586 | 0 | int ffo = off + xscr1->chg1 - xscr2->chg1; |
587 | |
|
588 | 0 | i0 = xscr1->i1; |
589 | 0 | i1 = xscr1->i2; |
590 | 0 | i2 = xscr2->i2; |
591 | 0 | if (off > 0) { |
592 | 0 | i0 -= off; |
593 | 0 | i1 -= off; |
594 | 0 | } |
595 | 0 | else |
596 | 0 | i2 += off; |
597 | 0 | chg0 = xscr1->i1 + xscr1->chg1 - i0; |
598 | 0 | chg1 = xscr1->i2 + xscr1->chg2 - i1; |
599 | 0 | chg2 = xscr2->i2 + xscr2->chg2 - i2; |
600 | 0 | if (ffo < 0) { |
601 | 0 | chg0 -= ffo; |
602 | 0 | chg1 -= ffo; |
603 | 0 | } else |
604 | 0 | chg2 += ffo; |
605 | 0 | if (xdl_append_merge(&c, 0, |
606 | 0 | i0, chg0, i1, chg1, i2, chg2)) { |
607 | 0 | xdl_cleanup_merge(changes); |
608 | 0 | return -1; |
609 | 0 | } |
610 | 0 | } |
611 | | |
612 | 0 | i1 = xscr1->i1 + xscr1->chg1; |
613 | 0 | i2 = xscr2->i1 + xscr2->chg1; |
614 | |
|
615 | 0 | if (i1 >= i2) |
616 | 0 | xscr2 = xscr2->next; |
617 | 0 | if (i2 >= i1) |
618 | 0 | xscr1 = xscr1->next; |
619 | 0 | } |
620 | 0 | while (xscr1) { |
621 | 0 | if (!changes) |
622 | 0 | changes = c; |
623 | 0 | i0 = xscr1->i1; |
624 | 0 | i1 = xscr1->i2; |
625 | 0 | i2 = xscr1->i1 + xe2->xdf2.nrec - xe2->xdf1.nrec; |
626 | 0 | chg0 = xscr1->chg1; |
627 | 0 | chg1 = xscr1->chg2; |
628 | 0 | chg2 = xscr1->chg1; |
629 | 0 | if (xdl_append_merge(&c, 1, |
630 | 0 | i0, chg0, i1, chg1, i2, chg2)) { |
631 | 0 | xdl_cleanup_merge(changes); |
632 | 0 | return -1; |
633 | 0 | } |
634 | 0 | xscr1 = xscr1->next; |
635 | 0 | } |
636 | 0 | while (xscr2) { |
637 | 0 | if (!changes) |
638 | 0 | changes = c; |
639 | 0 | i0 = xscr2->i1; |
640 | 0 | i1 = xscr2->i1 + xe1->xdf2.nrec - xe1->xdf1.nrec; |
641 | 0 | i2 = xscr2->i2; |
642 | 0 | chg0 = xscr2->chg1; |
643 | 0 | chg1 = xscr2->chg1; |
644 | 0 | chg2 = xscr2->chg2; |
645 | 0 | if (xdl_append_merge(&c, 2, |
646 | 0 | i0, chg0, i1, chg1, i2, chg2)) { |
647 | 0 | xdl_cleanup_merge(changes); |
648 | 0 | return -1; |
649 | 0 | } |
650 | 0 | xscr2 = xscr2->next; |
651 | 0 | } |
652 | 0 | if (!changes) |
653 | 0 | changes = c; |
654 | | /* refine conflicts */ |
655 | 0 | if (style == XDL_MERGE_ZEALOUS_DIFF3) { |
656 | 0 | xdl_refine_zdiff3_conflicts(xe1, xe2, changes, xpp); |
657 | 0 | } else if (XDL_MERGE_ZEALOUS <= level && |
658 | 0 | (xdl_refine_conflicts(xe1, xe2, changes, xpp) < 0 || |
659 | 0 | xdl_simplify_non_conflicts(xe1, changes, |
660 | 0 | XDL_MERGE_ZEALOUS < level) < 0)) { |
661 | 0 | xdl_cleanup_merge(changes); |
662 | 0 | return -1; |
663 | 0 | } |
664 | | /* output */ |
665 | 0 | if (result) { |
666 | 0 | int marker_size = xmp->marker_size; |
667 | 0 | int size = xdl_fill_merge_buffer(xe1, name1, xe2, name2, |
668 | 0 | ancestor_name, |
669 | 0 | favor, changes, NULL, style, |
670 | 0 | marker_size); |
671 | 0 | result->ptr = xdl_malloc(size); |
672 | 0 | if (!result->ptr) { |
673 | 0 | xdl_cleanup_merge(changes); |
674 | 0 | return -1; |
675 | 0 | } |
676 | 0 | result->size = size; |
677 | 0 | xdl_fill_merge_buffer(xe1, name1, xe2, name2, |
678 | 0 | ancestor_name, favor, changes, |
679 | 0 | result->ptr, style, marker_size); |
680 | 0 | } |
681 | 0 | return xdl_cleanup_merge(changes); |
682 | 0 | } |
683 | | |
684 | | int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2, |
685 | | xmparam_t const *xmp, mmbuffer_t *result) |
686 | 0 | { |
687 | 0 | xdchange_t *xscr1 = NULL, *xscr2 = NULL; |
688 | 0 | xdfenv_t xe1, xe2; |
689 | 0 | int status = -1; |
690 | 0 | xpparam_t const *xpp = &xmp->xpp; |
691 | |
|
692 | 0 | result->ptr = NULL; |
693 | 0 | result->size = 0; |
694 | |
|
695 | 0 | if (xdl_do_diff(orig, mf1, xpp, &xe1) < 0) |
696 | 0 | return -1; |
697 | | |
698 | 0 | if (xdl_do_diff(orig, mf2, xpp, &xe2) < 0) |
699 | 0 | goto free_xe1; /* avoid double free of xe2 */ |
700 | | |
701 | 0 | if (xdl_change_compact(&xe1.xdf1, &xe1.xdf2, xpp->flags) < 0 || |
702 | 0 | xdl_change_compact(&xe1.xdf2, &xe1.xdf1, xpp->flags) < 0 || |
703 | 0 | xdl_build_script(&xe1, &xscr1) < 0) |
704 | 0 | goto out; |
705 | | |
706 | 0 | if (xdl_change_compact(&xe2.xdf1, &xe2.xdf2, xpp->flags) < 0 || |
707 | 0 | xdl_change_compact(&xe2.xdf2, &xe2.xdf1, xpp->flags) < 0 || |
708 | 0 | xdl_build_script(&xe2, &xscr2) < 0) |
709 | 0 | goto out; |
710 | | |
711 | 0 | if (!xscr1) { |
712 | 0 | result->ptr = xdl_malloc(mf2->size); |
713 | 0 | if (!result->ptr) |
714 | 0 | goto out; |
715 | 0 | status = 0; |
716 | 0 | memcpy(result->ptr, mf2->ptr, mf2->size); |
717 | 0 | result->size = mf2->size; |
718 | 0 | } else if (!xscr2) { |
719 | 0 | result->ptr = xdl_malloc(mf1->size); |
720 | 0 | if (!result->ptr) |
721 | 0 | goto out; |
722 | 0 | status = 0; |
723 | 0 | memcpy(result->ptr, mf1->ptr, mf1->size); |
724 | 0 | result->size = mf1->size; |
725 | 0 | } else { |
726 | 0 | status = xdl_do_merge(&xe1, xscr1, |
727 | 0 | &xe2, xscr2, |
728 | 0 | xmp, result); |
729 | 0 | } |
730 | 0 | out: |
731 | 0 | xdl_free_script(xscr1); |
732 | 0 | xdl_free_script(xscr2); |
733 | |
|
734 | 0 | xdl_free_env(&xe2); |
735 | 0 | free_xe1: |
736 | 0 | xdl_free_env(&xe1); |
737 | |
|
738 | 0 | return status; |
739 | 0 | } |