🌐 AI搜索 & 代理 主页
Google Git
Sign in
chromium / external / github.com / git / git / refs/tags/v2.4.0 / . / merge-blobs.c
blob: 7abb894c684d1ff7bc26b30ffa41597451750f20 [file] [log] [blame]
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]1#include "cache.h"
2#include "run-command.h"
3#include "xdiff-interface.h"
Junio C Hamano15b4f7a2010-01-17 05:45:40[diff] [blame]4#include "ll-merge.h"
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]5#include "blob.h"
Junio C Hamanofa2364e2012-12-06 23:08:01[diff] [blame]6#include "merge-blobs.h"
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]7
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]8static int fill_mmfile_blob(mmfile_t *f, struct blob *obj)
9{
10 void *buf;
11 unsigned long size;
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]12 enum object_type type;
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]13
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]14 buf = read_sha1_file(obj->object.sha1, &type, &size);
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]15 if (!buf)
16 return -1;
Stefan Bellerd6878392015-03-21 00:28:03[diff] [blame]17 if (type != OBJ_BLOB) {
18 free(buf);
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]19 return -1;
Stefan Bellerd6878392015-03-21 00:28:03[diff] [blame]20 }
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]21 f->ptr = buf;
22 f->size = size;
23 return 0;
24}
25
26static void free_mmfile(mmfile_t *f)
27{
28 free(f->ptr);
29}
30
Junio C Hamano15b4f7a2010-01-17 05:45:40[diff] [blame]31static void *three_way_filemerge(const char *path, mmfile_t *base, mmfile_t *our, mmfile_t *their, unsigned long *size)
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]32{
Johannes Schindeline2b70082006-12-12 23:01:41[diff] [blame]33 int merge_status;
Junio C Hamano15b4f7a2010-01-17 05:45:40[diff] [blame]34 mmbuffer_t res;
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]35
Jonathan Niedere44b3852010-03-21 00:40:53[diff] [blame]36 /*
37 * This function is only used by cmd_merge_tree, which
38 * does not respect the merge.conflictstyle option.
39 * There is no need to worry about a label for the
40 * common ancestor.
41 */
Jonathan Niederf01de622010-03-21 00:38:58[diff] [blame]42 merge_status = ll_merge(&res, path, base, NULL,
Jonathan Nieder712516b2010-08-26 05:49:53[diff] [blame]43 our, ".our", their, ".their", NULL);
Johannes Schindeline2b70082006-12-12 23:01:41[diff] [blame]44 if (merge_status < 0)
45 return NULL;
46
47 *size = res.size;
48 return res.ptr;
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]49}
50
51static int common_outf(void *priv_, mmbuffer_t *mb, int nbuf)
52{
53 int i;
54 mmfile_t *dst = priv_;
55
56 for (i = 0; i < nbuf; i++) {
57 memcpy(dst->ptr + dst->size, mb[i].ptr, mb[i].size);
58 dst->size += mb[i].size;
59 }
60 return 0;
61}
62
63static int generate_common_file(mmfile_t *res, mmfile_t *f1, mmfile_t *f2)
64{
65 unsigned long size = f1->size < f2->size ? f1->size : f2->size;
66 void *ptr = xmalloc(size);
67 xpparam_t xpp;
68 xdemitconf_t xecfg;
69 xdemitcb_t ecb;
70
Brian Downing9ccd0a82008-10-25 13:30:37[diff] [blame]71 memset(&xpp, 0, sizeof(xpp));
René Scharfe582aa002010-05-02 13:04:41[diff] [blame]72 xpp.flags = 0;
Johannes Schindelin30b25012007-07-04 18:05:46[diff] [blame]73 memset(&xecfg, 0, sizeof(xecfg));
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]74 xecfg.ctxlen = 3;
75 xecfg.flags = XDL_EMIT_COMMON;
76 ecb.outf = common_outf;
77
78 res->ptr = ptr;
79 res->size = 0;
80
81 ecb.priv = res;
Junio C Hamanoc279d7e2007-12-13 21:25:07[diff] [blame]82 return xdi_diff(f1, f2, &xpp, &xecfg, &ecb);
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]83}
84
Junio C Hamanofa2364e2012-12-06 23:08:01[diff] [blame]85void *merge_blobs(const char *path, struct blob *base, struct blob *our, struct blob *their, unsigned long *size)
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]86{
87 void *res = NULL;
88 mmfile_t f1, f2, common;
89
90 /*
91 * Removed in either branch?
92 *
93 * NOTE! This depends on the caller having done the
94 * proper warning about removing a file that got
95 * modified in the other branch!
96 */
97 if (!our || !their) {
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]98 enum object_type type;
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]99 if (base)
100 return NULL;
101 if (!our)
102 our = their;
Nicolas Pitre21666f12007-02-26 19:55:59[diff] [blame]103 return read_sha1_file(our->object.sha1, &type, size);
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]104 }
105
106 if (fill_mmfile_blob(&f1, our) < 0)
107 goto out_no_mmfile;
108 if (fill_mmfile_blob(&f2, their) < 0)
109 goto out_free_f1;
110
111 if (base) {
112 if (fill_mmfile_blob(&common, base) < 0)
113 goto out_free_f2_f1;
114 } else {
115 if (generate_common_file(&common, &f1, &f2) < 0)
116 goto out_free_f2_f1;
117 }
Junio C Hamano15b4f7a2010-01-17 05:45:40[diff] [blame]118 res = three_way_filemerge(path, &common, &f1, &f2, size);
Linus Torvalds0c799382006-06-29 05:06:36[diff] [blame]119 free_mmfile(&common);
120out_free_f2_f1:
121 free_mmfile(&f2);
122out_free_f1:
123 free_mmfile(&f1);
124out_no_mmfile:
125 return res;
126}