2 #include "run-command.h"
3 #include "xdiff-interface.h"
6 static int fill_mmfile_blob(mmfile_t
*f
, struct blob
*obj
)
10 enum object_type type
;
12 buf
= read_sha1_file(obj
->object
.sha1
, &type
, &size
);
22 static void free_mmfile(mmfile_t
*f
)
27 static void *three_way_filemerge(mmfile_t
*base
, mmfile_t
*our
, mmfile_t
*their
, unsigned long *size
)
33 memset(&xpp
, 0, sizeof(xpp
));
34 merge_status
= xdl_merge(base
, our
, ".our", their
, ".their",
35 &xpp
, XDL_MERGE_ZEALOUS
, &res
);
44 static int common_outf(void *priv_
, mmbuffer_t
*mb
, int nbuf
)
47 mmfile_t
*dst
= priv_
;
49 for (i
= 0; i
< nbuf
; i
++) {
50 memcpy(dst
->ptr
+ dst
->size
, mb
[i
].ptr
, mb
[i
].size
);
51 dst
->size
+= mb
[i
].size
;
56 static int generate_common_file(mmfile_t
*res
, mmfile_t
*f1
, mmfile_t
*f2
)
58 unsigned long size
= f1
->size
< f2
->size
? f1
->size
: f2
->size
;
59 void *ptr
= xmalloc(size
);
64 xpp
.flags
= XDF_NEED_MINIMAL
;
65 memset(&xecfg
, 0, sizeof(xecfg
));
67 xecfg
.flags
= XDL_EMIT_COMMON
;
68 ecb
.outf
= common_outf
;
74 return xdi_diff(f1
, f2
, &xpp
, &xecfg
, &ecb
);
77 void *merge_file(struct blob
*base
, struct blob
*our
, struct blob
*their
, unsigned long *size
)
80 mmfile_t f1
, f2
, common
;
83 * Removed in either branch?
85 * NOTE! This depends on the caller having done the
86 * proper warning about removing a file that got
87 * modified in the other branch!
90 enum object_type type
;
95 return read_sha1_file(our
->object
.sha1
, &type
, size
);
98 if (fill_mmfile_blob(&f1
, our
) < 0)
100 if (fill_mmfile_blob(&f2
, their
) < 0)
104 if (fill_mmfile_blob(&common
, base
) < 0)
107 if (generate_common_file(&common
, &f1
, &f2
) < 0)
110 res
= three_way_filemerge(&common
, &f1
, &f2
, size
);
111 free_mmfile(&common
);