2 #include "run-command.h"
3 #include "xdiff-interface.h"
6 #include "merge-file.h"
8 static int fill_mmfile_blob(mmfile_t
*f
, struct blob
*obj
)
12 enum object_type type
;
14 buf
= read_sha1_file(obj
->object
.sha1
, &type
, &size
);
24 static void free_mmfile(mmfile_t
*f
)
29 static void *three_way_filemerge(const char *path
, mmfile_t
*base
, mmfile_t
*our
, mmfile_t
*their
, unsigned long *size
)
35 * This function is only used by cmd_merge_tree, which
36 * does not respect the merge.conflictstyle option.
37 * There is no need to worry about a label for the
40 merge_status
= ll_merge(&res
, path
, base
, NULL
,
41 our
, ".our", their
, ".their", NULL
);
49 static int common_outf(void *priv_
, mmbuffer_t
*mb
, int nbuf
)
52 mmfile_t
*dst
= priv_
;
54 for (i
= 0; i
< nbuf
; i
++) {
55 memcpy(dst
->ptr
+ dst
->size
, mb
[i
].ptr
, mb
[i
].size
);
56 dst
->size
+= mb
[i
].size
;
61 static int generate_common_file(mmfile_t
*res
, mmfile_t
*f1
, mmfile_t
*f2
)
63 unsigned long size
= f1
->size
< f2
->size
? f1
->size
: f2
->size
;
64 void *ptr
= xmalloc(size
);
69 memset(&xpp
, 0, sizeof(xpp
));
71 memset(&xecfg
, 0, sizeof(xecfg
));
73 xecfg
.flags
= XDL_EMIT_COMMON
;
74 ecb
.outf
= common_outf
;
80 return xdi_diff(f1
, f2
, &xpp
, &xecfg
, &ecb
);
83 void *merge_file(const char *path
, struct blob
*base
, struct blob
*our
, struct blob
*their
, unsigned long *size
)
86 mmfile_t f1
, f2
, common
;
89 * Removed in either branch?
91 * NOTE! This depends on the caller having done the
92 * proper warning about removing a file that got
93 * modified in the other branch!
96 enum object_type type
;
101 return read_sha1_file(our
->object
.sha1
, &type
, size
);
104 if (fill_mmfile_blob(&f1
, our
) < 0)
106 if (fill_mmfile_blob(&f2
, their
) < 0)
110 if (fill_mmfile_blob(&common
, base
) < 0)
113 if (generate_common_file(&common
, &f1
, &f2
) < 0)
116 res
= three_way_filemerge(path
, &common
, &f1
, &f2
, size
);
117 free_mmfile(&common
);