blame: cmp_suspect is not "cmp" anymore.
[git/git.git] / merge-tree.c
CommitLineData
492e0759 1#include "cache.h"
1b0c7174 2#include "tree-walk.h"
0c799383 3#include "xdiff-interface.h"
83788070 4#include "blob.h"
492e0759
LT
5
6static const char merge_tree_usage[] = "git-merge-tree <base-tree> <branch1> <branch2>";
7static int resolve_directories = 1;
8
83788070
LT
9struct merge_list {
10 struct merge_list *next;
11 struct merge_list *link; /* other stages for this object */
12
13 unsigned int stage : 2,
14 flags : 30;
15 unsigned int mode;
16 const char *path;
17 struct blob *blob;
18};
19
20static struct merge_list *merge_result, **merge_result_end = &merge_result;
21
22static void add_merge_entry(struct merge_list *entry)
23{
24 *merge_result_end = entry;
25 merge_result_end = &entry->next;
26}
27
492e0759
LT
28static void merge_trees(struct tree_desc t[3], const char *base);
29
83788070
LT
30static const char *explanation(struct merge_list *entry)
31{
32 switch (entry->stage) {
33 case 0:
34 return "merged";
35 case 3:
36 return "added in remote";
37 case 2:
38 if (entry->link)
39 return "added in both";
40 return "added in local";
41 }
42
43 /* Existed in base */
44 entry = entry->link;
45 if (!entry)
46 return "removed in both";
47
48 if (entry->link)
49 return "changed in both";
50
51 if (entry->stage == 3)
52 return "removed in local";
53 return "removed in remote";
54}
55
0c799383
LT
56extern void *merge_file(struct blob *, struct blob *, struct blob *, unsigned long *);
57
58static void *result(struct merge_list *entry, unsigned long *size)
59{
21666f1a 60 enum object_type type;
0c799383
LT
61 struct blob *base, *our, *their;
62
63 if (!entry->stage)
21666f1a 64 return read_sha1_file(entry->blob->object.sha1, &type, size);
0c799383
LT
65 base = NULL;
66 if (entry->stage == 1) {
67 base = entry->blob;
68 entry = entry->link;
69 }
70 our = NULL;
71 if (entry && entry->stage == 2) {
72 our = entry->blob;
73 entry = entry->link;
74 }
75 their = NULL;
76 if (entry)
77 their = entry->blob;
78 return merge_file(base, our, their, size);
79}
80
81static void *origin(struct merge_list *entry, unsigned long *size)
82{
21666f1a 83 enum object_type type;
0c799383
LT
84 while (entry) {
85 if (entry->stage == 2)
21666f1a 86 return read_sha1_file(entry->blob->object.sha1, &type, size);
0c799383
LT
87 entry = entry->link;
88 }
89 return NULL;
90}
91
92static int show_outf(void *priv_, mmbuffer_t *mb, int nbuf)
93{
94 int i;
95 for (i = 0; i < nbuf; i++)
96 printf("%.*s", (int) mb[i].size, mb[i].ptr);
97 return 0;
98}
99
100static void show_diff(struct merge_list *entry)
101{
102 unsigned long size;
103 mmfile_t src, dst;
104 xpparam_t xpp;
105 xdemitconf_t xecfg;
106 xdemitcb_t ecb;
107
108 xpp.flags = XDF_NEED_MINIMAL;
109 xecfg.ctxlen = 3;
110 xecfg.flags = 0;
111 ecb.outf = show_outf;
112 ecb.priv = NULL;
113
114 src.ptr = origin(entry, &size);
115 if (!src.ptr)
116 size = 0;
117 src.size = size;
118 dst.ptr = result(entry, &size);
119 if (!dst.ptr)
120 size = 0;
121 dst.size = size;
122 xdl_diff(&src, &dst, &xpp, &xecfg, &ecb);
123 free(src.ptr);
124 free(dst.ptr);
125}
126
83788070
LT
127static void show_result_list(struct merge_list *entry)
128{
129 printf("%s\n", explanation(entry));
130 do {
131 struct merge_list *link = entry->link;
132 static const char *desc[4] = { "result", "base", "our", "their" };
133 printf(" %-6s %o %s %s\n", desc[entry->stage], entry->mode, sha1_to_hex(entry->blob->object.sha1), entry->path);
134 entry = link;
135 } while (entry);
136}
137
138static void show_result(void)
139{
140 struct merge_list *walk;
141
142 walk = merge_result;
143 while (walk) {
144 show_result_list(walk);
0c799383 145 show_diff(walk);
83788070
LT
146 walk = walk->next;
147 }
148}
149
492e0759
LT
150/* An empty entry never compares same, not even to another empty entry */
151static int same_entry(struct name_entry *a, struct name_entry *b)
152{
153 return a->sha1 &&
154 b->sha1 &&
a89fccd2 155 !hashcmp(a->sha1, b->sha1) &&
492e0759
LT
156 a->mode == b->mode;
157}
158
83788070 159static struct merge_list *create_entry(unsigned stage, unsigned mode, const unsigned char *sha1, const char *path)
492e0759 160{
83788070
LT
161 struct merge_list *res = xmalloc(sizeof(*res));
162
163 memset(res, 0, sizeof(*res));
164 res->stage = stage;
165 res->path = path;
166 res->mode = mode;
167 res->blob = lookup_blob(sha1);
168 return res;
01df5297
LT
169}
170
171static void resolve(const char *base, struct name_entry *branch1, struct name_entry *result)
172{
83788070
LT
173 struct merge_list *orig, *final;
174 const char *path;
175
01df5297
LT
176 /* If it's already branch1, don't bother showing it */
177 if (!branch1)
178 return;
01df5297 179
9befac47 180 path = xstrdup(mkpath("%s%s", base, result->path));
83788070
LT
181 orig = create_entry(2, branch1->mode, branch1->sha1, path);
182 final = create_entry(0, result->mode, result->sha1, path);
183
184 final->link = orig;
185
186 add_merge_entry(final);
492e0759
LT
187}
188
189static int unresolved_directory(const char *base, struct name_entry n[3])
190{
191 int baselen;
192 char *newbase;
193 struct name_entry *p;
194 struct tree_desc t[3];
195 void *buf0, *buf1, *buf2;
196
197 if (!resolve_directories)
198 return 0;
199 p = n;
200 if (!p->mode) {
201 p++;
202 if (!p->mode)
203 p++;
204 }
205 if (!S_ISDIR(p->mode))
206 return 0;
207 baselen = strlen(base);
208 newbase = xmalloc(baselen + p->pathlen + 2);
209 memcpy(newbase, base, baselen);
210 memcpy(newbase + baselen, p->path, p->pathlen);
211 memcpy(newbase + baselen + p->pathlen, "/", 2);
212
213 buf0 = fill_tree_descriptor(t+0, n[0].sha1);
214 buf1 = fill_tree_descriptor(t+1, n[1].sha1);
215 buf2 = fill_tree_descriptor(t+2, n[2].sha1);
216 merge_trees(t, newbase);
217
218 free(buf0);
219 free(buf1);
220 free(buf2);
221 free(newbase);
222 return 1;
223}
224
83788070
LT
225
226static struct merge_list *link_entry(unsigned stage, const char *base, struct name_entry *n, struct merge_list *entry)
227{
228 const char *path;
229 struct merge_list *link;
230
231 if (!n->mode)
232 return entry;
233 if (entry)
234 path = entry->path;
235 else
9befac47 236 path = xstrdup(mkpath("%s%s", base, n->path));
83788070
LT
237 link = create_entry(stage, n->mode, n->sha1, path);
238 link->link = entry;
239 return link;
240}
241
492e0759
LT
242static void unresolved(const char *base, struct name_entry n[3])
243{
83788070
LT
244 struct merge_list *entry = NULL;
245
492e0759
LT
246 if (unresolved_directory(base, n))
247 return;
83788070
LT
248
249 /*
250 * Do them in reverse order so that the resulting link
251 * list has the stages in order - link_entry adds new
252 * links at the front.
253 */
254 entry = link_entry(3, base, n + 2, entry);
255 entry = link_entry(2, base, n + 1, entry);
256 entry = link_entry(1, base, n + 0, entry);
257
258 add_merge_entry(entry);
492e0759
LT
259}
260
164dcb97
LT
261/*
262 * Merge two trees together (t[1] and t[2]), using a common base (t[0])
263 * as the origin.
264 *
265 * This walks the (sorted) trees in lock-step, checking every possible
266 * name. Note that directories automatically sort differently from other
267 * files (see "base_name_compare"), so you'll never see file/directory
268 * conflicts, because they won't ever compare the same.
269 *
270 * IOW, if a directory changes to a filename, it will automatically be
271 * seen as the directory going away, and the filename being created.
272 *
273 * Think of this as a three-way diff.
274 *
275 * The output will be either:
276 * - successful merge
277 * "0 mode sha1 filename"
278 * NOTE NOTE NOTE! FIXME! We really really need to walk the index
279 * in parallel with this too!
280 *
281 * - conflict:
282 * "1 mode sha1 filename"
283 * "2 mode sha1 filename"
284 * "3 mode sha1 filename"
285 * where not all of the 1/2/3 lines may exist, of course.
286 *
287 * The successful merge rules are the same as for the three-way merge
288 * in git-read-tree.
289 */
290static void threeway_callback(int n, unsigned long mask, struct name_entry *entry, const char *base)
291{
292 /* Same in both? */
293 if (same_entry(entry+1, entry+2)) {
294 if (entry[0].sha1) {
295 resolve(base, NULL, entry+1);
296 return;
492e0759 297 }
164dcb97 298 }
492e0759 299
164dcb97
LT
300 if (same_entry(entry+0, entry+1)) {
301 if (entry[2].sha1 && !S_ISDIR(entry[2].mode)) {
302 resolve(base, entry+1, entry+2);
303 return;
492e0759 304 }
164dcb97 305 }
492e0759 306
164dcb97
LT
307 if (same_entry(entry+0, entry+2)) {
308 if (entry[1].sha1 && !S_ISDIR(entry[1].mode)) {
309 resolve(base, NULL, entry+1);
310 return;
492e0759 311 }
492e0759 312 }
164dcb97
LT
313
314 unresolved(base, entry);
315}
316
317static void merge_trees(struct tree_desc t[3], const char *base)
318{
319 traverse_trees(3, t, base, threeway_callback);
492e0759
LT
320}
321
322static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
323{
324 unsigned char sha1[20];
325 void *buf;
326
31fff305 327 if (get_sha1(rev, sha1))
492e0759
LT
328 die("unknown rev %s", rev);
329 buf = fill_tree_descriptor(desc, sha1);
330 if (!buf)
331 die("%s is not a tree", rev);
332 return buf;
333}
334
335int main(int argc, char **argv)
336{
337 struct tree_desc t[3];
338 void *buf1, *buf2, *buf3;
339
5b6df8e4 340 if (argc != 4)
492e0759
LT
341 usage(merge_tree_usage);
342
8112894d
DL
343 setup_git_directory();
344
492e0759
LT
345 buf1 = get_tree_descriptor(t+0, argv[1]);
346 buf2 = get_tree_descriptor(t+1, argv[2]);
347 buf3 = get_tree_descriptor(t+2, argv[3]);
348 merge_trees(t, "");
349 free(buf1);
350 free(buf2);
351 free(buf3);
83788070
LT
352
353 show_result();
492e0759
LT
354 return 0;
355}