builtin/apply.c: fix a memleak
[git/git.git] / merge-blobs.c
CommitLineData
0c799383
LT
1#include "cache.h"
2#include "run-command.h"
3#include "xdiff-interface.h"
15b4f7a6 4#include "ll-merge.h"
0c799383 5#include "blob.h"
fa2364ec 6#include "merge-blobs.h"
0c799383 7
0c799383
LT
8static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
9{
10 void *buf;
11 unsigned long size;
21666f1a 12 enum object_type type;
0c799383 13
21666f1a 14 buf = read_sha1_file(obj->object.sha1, &type, &size);
0c799383
LT
15 if (!buf)
16 return -1;
21666f1a 17 if (type != OBJ_BLOB)
0c799383
LT
18 return -1;
19 f->ptr = buf;
20 f->size = size;
21 return 0;
22}
23
24static void free_mmfile(mmfile_t *f)
25{
26 free(f->ptr);
27}
28
15b4f7a6 29static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size)
0c799383 30{
e2b70087 31 int merge_status;
15b4f7a6 32 mmbuffer_t res;
0c799383 33
e44b3851
JN
34 /*
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
38 * common ancestor.
39 */
f01de62e 40 merge_status = ll_merge(&res, path, base, NULL,
712516bc 41 our, ".our", their, ".their", NULL);
e2b70087
JS
42 if (merge_status < 0)
43 return NULL;
44
45 *size = res.size;
46 return res.ptr;
0c799383
LT
47}
48
49static int common_outf(void *priv_, mmbuffer_t *mb, int nbuf)
50{
51 int i;
52 mmfile_t *dst = priv_;
53
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;
57 }
58 return 0;
59}
60
61static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
62{
63 unsigned long size = f1->size < f2->size ? f1->size : f2->size;
64 void *ptr = xmalloc(size);
65 xpparam_t xpp;
66 xdemitconf_t xecfg;
67 xdemitcb_t ecb;
68
9ccd0a88 69 memset(&xpp, 0, sizeof(xpp));
582aa00b 70 xpp.flags = 0;
30b25010 71 memset(&xecfg, 0, sizeof(xecfg));
0c799383
LT
72 xecfg.ctxlen = 3;
73 xecfg.flags = XDL_EMIT_COMMON;
74 ecb.outf = common_outf;
75
76 res->ptr = ptr;
77 res->size = 0;
78
79 ecb.priv = res;
c279d7e9 80 return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
0c799383
LT
81}
82
fa2364ec 83void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct blob *their, unsigned long *size)
0c799383
LT
84{
85 void *res = NULL;
86 mmfile_t f1, f2, common;
87
88 /*
89 * Removed in either branch?
90 *
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!
94 */
95 if (!our || !their) {
21666f1a 96 enum object_type type;
0c799383
LT
97 if (base)
98 return NULL;
99 if (!our)
100 our = their;
21666f1a 101 return read_sha1_file(our->object.sha1, &type, size);
0c799383
LT
102 }
103
104 if (fill_mmfile_blob(&f1, our) < 0)
105 goto out_no_mmfile;
106 if (fill_mmfile_blob(&f2, their) < 0)
107 goto out_free_f1;
108
109 if (base) {
110 if (fill_mmfile_blob(&common, base) < 0)
111 goto out_free_f2_f1;
112 } else {
113 if (generate_common_file(&common, &f1, &f2) < 0)
114 goto out_free_f2_f1;
115 }
15b4f7a6 116 res = three_way_filemerge(path, &common, &f1, &f2, size);
0c799383
LT
117 free_mmfile(&common);
118out_free_f2_f1:
119 free_mmfile(&f2);
120out_free_f1:
121 free_mmfile(&f1);
122out_no_mmfile:
123 return res;
124}