]>
Commit | Line | Data |
---|---|---|
6d297f81 JS |
1 | /* |
2 | * Recursive Merge algorithm stolen from git-merge-recursive.py by | |
3 | * Fredrik Kuivinen. | |
4 | * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 | |
5 | */ | |
6d297f81 JS |
6 | #include "cache.h" |
7 | #include "cache-tree.h" | |
8 | #include "commit.h" | |
9 | #include "blob.h" | |
e1b3a2ca | 10 | #include "builtin.h" |
6d297f81 JS |
11 | #include "tree-walk.h" |
12 | #include "diff.h" | |
13 | #include "diffcore.h" | |
6d297f81 | 14 | #include "tag.h" |
7a85b848 | 15 | #include "unpack-trees.h" |
6d297f81 | 16 | #include "path-list.h" |
c2b4faea | 17 | #include "xdiff-interface.h" |
525ab639 | 18 | #include "ll-merge.h" |
f3ef6b6b | 19 | #include "interpolate.h" |
a129d96f | 20 | #include "attr.h" |
e1b3a2ca | 21 | #include "merge-recursive.h" |
6d297f81 | 22 | |
68faf689 JH |
23 | static int subtree_merge; |
24 | ||
25 | static struct tree *shift_tree_object(struct tree *one, struct tree *two) | |
26 | { | |
27 | unsigned char shifted[20]; | |
28 | ||
29 | /* | |
30 | * NEEDSWORK: this limits the recursion depth to hardcoded | |
31 | * value '2' to avoid excessive overhead. | |
32 | */ | |
33 | shift_tree(one->object.sha1, two->object.sha1, shifted, 2); | |
34 | if (!hashcmp(two->object.sha1, shifted)) | |
35 | return two; | |
36 | return lookup_tree(shifted); | |
37 | } | |
38 | ||
6d297f81 JS |
39 | /* |
40 | * A virtual commit has | |
41 | * - (const char *)commit->util set to the name, and | |
42 | * - *(int *)commit->object.sha1 set to the virtual id. | |
43 | */ | |
6d297f81 JS |
44 | |
45 | static unsigned commit_list_count(const struct commit_list *l) | |
46 | { | |
47 | unsigned c = 0; | |
48 | for (; l; l = l->next ) | |
49 | c++; | |
50 | return c; | |
51 | } | |
52 | ||
53 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) | |
54 | { | |
55 | struct commit *commit = xcalloc(1, sizeof(struct commit)); | |
56 | static unsigned virtual_id = 1; | |
57 | commit->tree = tree; | |
58 | commit->util = (void*)comment; | |
59 | *(int*)commit->object.sha1 = virtual_id++; | |
c1f3089e JS |
60 | /* avoid warnings */ |
61 | commit->object.parsed = 1; | |
6d297f81 JS |
62 | return commit; |
63 | } | |
64 | ||
65 | /* | |
3058e933 JS |
66 | * Since we use get_tree_entry(), which does not put the read object into |
67 | * the object pool, we cannot rely on a == b. | |
6d297f81 JS |
68 | */ |
69 | static int sha_eq(const unsigned char *a, const unsigned char *b) | |
70 | { | |
3af244ca | 71 | if (!a && !b) |
6d297f81 | 72 | return 2; |
87cb004e | 73 | return a && b && hashcmp(a, b) == 0; |
6d297f81 JS |
74 | } |
75 | ||
6d297f81 | 76 | /* |
3058e933 JS |
77 | * Since we want to write the index eventually, we cannot reuse the index |
78 | * for these (temporary) data. | |
6d297f81 JS |
79 | */ |
80 | struct stage_data | |
81 | { | |
82 | struct | |
83 | { | |
84 | unsigned mode; | |
85 | unsigned char sha[20]; | |
86 | } stages[4]; | |
87 | unsigned processed:1; | |
88 | }; | |
89 | ||
5a753613 JS |
90 | static struct path_list current_file_set = {NULL, 0, 0, 1}; |
91 | static struct path_list current_directory_set = {NULL, 0, 0, 1}; | |
6d297f81 | 92 | |
63889639 | 93 | static int call_depth = 0; |
8c3275ab | 94 | static int verbosity = 2; |
2a2ac926 JK |
95 | static int diff_rename_limit = -1; |
96 | static int merge_rename_limit = -1; | |
66a155bc | 97 | static int buffer_output = 1; |
19247e55 | 98 | static struct strbuf obuf = STRBUF_INIT; |
6d297f81 | 99 | |
19247e55 | 100 | static int show(int v) |
8c3275ab SP |
101 | { |
102 | return (!call_depth && verbosity >= v) || verbosity >= 5; | |
103 | } | |
104 | ||
19247e55 | 105 | static void flush_output(void) |
6d297f81 | 106 | { |
19247e55 PH |
107 | if (obuf.len) { |
108 | fputs(obuf.buf, stdout); | |
109 | strbuf_reset(&obuf); | |
8c3275ab | 110 | } |
6d297f81 JS |
111 | } |
112 | ||
19247e55 | 113 | static void output(int v, const char *fmt, ...) |
66a155bc | 114 | { |
19247e55 PH |
115 | int len; |
116 | va_list ap; | |
117 | ||
118 | if (!show(v)) | |
119 | return; | |
120 | ||
121 | strbuf_grow(&obuf, call_depth * 2 + 2); | |
122 | memset(obuf.buf + obuf.len, ' ', call_depth * 2); | |
123 | strbuf_setlen(&obuf, obuf.len + call_depth * 2); | |
124 | ||
125 | va_start(ap, fmt); | |
126 | len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap); | |
127 | va_end(ap); | |
128 | ||
129 | if (len < 0) | |
130 | len = 0; | |
131 | if (len >= strbuf_avail(&obuf)) { | |
132 | strbuf_grow(&obuf, len + 2); | |
133 | va_start(ap, fmt); | |
134 | len = vsnprintf(obuf.buf + obuf.len, strbuf_avail(&obuf), fmt, ap); | |
135 | va_end(ap); | |
136 | if (len >= strbuf_avail(&obuf)) { | |
137 | die("this should not happen, your snprintf is broken"); | |
138 | } | |
66a155bc | 139 | } |
19247e55 PH |
140 | strbuf_setlen(&obuf, obuf.len + len); |
141 | strbuf_add(&obuf, "\n", 1); | |
142 | if (!buffer_output) | |
143 | flush_output(); | |
66a155bc SP |
144 | } |
145 | ||
3af244ca JS |
146 | static void output_commit_title(struct commit *commit) |
147 | { | |
148 | int i; | |
66a155bc | 149 | flush_output(); |
63889639 | 150 | for (i = call_depth; i--;) |
3af244ca JS |
151 | fputs(" ", stdout); |
152 | if (commit->util) | |
153 | printf("virtual %s\n", (char *)commit->util); | |
154 | else { | |
9926ba98 | 155 | printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); |
3af244ca JS |
156 | if (parse_commit(commit) != 0) |
157 | printf("(bad commit)\n"); | |
158 | else { | |
159 | const char *s; | |
160 | int len; | |
161 | for (s = commit->buffer; *s; s++) | |
162 | if (*s == '\n' && s[1] == '\n') { | |
163 | s += 2; | |
164 | break; | |
165 | } | |
166 | for (len = 0; s[len] && '\n' != s[len]; len++) | |
167 | ; /* do nothing */ | |
168 | printf("%.*s\n", len, s); | |
169 | } | |
170 | } | |
171 | } | |
172 | ||
6d297f81 JS |
173 | static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, |
174 | const char *path, int stage, int refresh, int options) | |
175 | { | |
176 | struct cache_entry *ce; | |
6d297f81 JS |
177 | ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh); |
178 | if (!ce) | |
0424138d | 179 | return error("addinfo_cache failed for path '%s'", path); |
6d297f81 JS |
180 | return add_cache_entry(ce, options); |
181 | } | |
182 | ||
183 | /* | |
184 | * This is a global variable which is used in a number of places but | |
185 | * only written to in the 'merge' function. | |
186 | * | |
187 | * index_only == 1 => Don't leave any non-stage 0 entries in the cache and | |
188 | * don't update the working directory. | |
189 | * 0 => Leave unmerged entries in the cache and update | |
190 | * the working directory. | |
191 | */ | |
192 | static int index_only = 0; | |
193 | ||
933bf40a LT |
194 | static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) |
195 | { | |
196 | parse_tree(tree); | |
197 | init_tree_desc(desc, tree->buffer, tree->size); | |
198 | } | |
199 | ||
7a85b848 | 200 | static int git_merge_trees(int index_only, |
6d297f81 JS |
201 | struct tree *common, |
202 | struct tree *head, | |
203 | struct tree *merge) | |
204 | { | |
3af244ca | 205 | int rc; |
933bf40a | 206 | struct tree_desc t[3]; |
7a85b848 JS |
207 | struct unpack_trees_options opts; |
208 | ||
7a85b848 JS |
209 | memset(&opts, 0, sizeof(opts)); |
210 | if (index_only) | |
211 | opts.index_only = 1; | |
212 | else | |
213 | opts.update = 1; | |
214 | opts.merge = 1; | |
215 | opts.head_idx = 2; | |
216 | opts.fn = threeway_merge; | |
34110cd4 LT |
217 | opts.src_index = &the_index; |
218 | opts.dst_index = &the_index; | |
7a85b848 | 219 | |
933bf40a LT |
220 | init_tree_desc_from_tree(t+0, common); |
221 | init_tree_desc_from_tree(t+1, head); | |
222 | init_tree_desc_from_tree(t+2, merge); | |
7a85b848 | 223 | |
933bf40a | 224 | rc = unpack_trees(3, t, &opts); |
7a85b848 | 225 | cache_tree_free(&active_cache_tree); |
7a85b848 | 226 | return rc; |
6d297f81 JS |
227 | } |
228 | ||
e1b3a2ca | 229 | struct tree *write_tree_from_memory(void) |
6d297f81 | 230 | { |
5b982f84 JS |
231 | struct tree *result = NULL; |
232 | ||
94a5728c | 233 | if (unmerged_cache()) { |
a97e4075 AR |
234 | int i; |
235 | output(0, "There are unmerged index entries:"); | |
236 | for (i = 0; i < active_nr; i++) { | |
237 | struct cache_entry *ce = active_cache[i]; | |
238 | if (ce_stage(ce)) | |
239 | output(0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name); | |
240 | } | |
8b944b56 | 241 | return NULL; |
a97e4075 | 242 | } |
5b982f84 JS |
243 | |
244 | if (!active_cache_tree) | |
245 | active_cache_tree = cache_tree(); | |
246 | ||
247 | if (!cache_tree_fully_valid(active_cache_tree) && | |
8b944b56 JH |
248 | cache_tree_update(active_cache_tree, |
249 | active_cache, active_nr, 0, 0) < 0) | |
5b982f84 JS |
250 | die("error building trees"); |
251 | ||
252 | result = lookup_tree(active_cache_tree->sha1); | |
253 | ||
5b982f84 | 254 | return result; |
6d297f81 JS |
255 | } |
256 | ||
6d297f81 JS |
257 | static int save_files_dirs(const unsigned char *sha1, |
258 | const char *base, int baselen, const char *path, | |
259 | unsigned int mode, int stage) | |
260 | { | |
261 | int len = strlen(path); | |
2d7320d0 | 262 | char *newpath = xmalloc(baselen + len + 1); |
6d297f81 JS |
263 | memcpy(newpath, base, baselen); |
264 | memcpy(newpath + baselen, path, len); | |
265 | newpath[baselen + len] = '\0'; | |
266 | ||
267 | if (S_ISDIR(mode)) | |
5a753613 | 268 | path_list_insert(newpath, ¤t_directory_set); |
6d297f81 | 269 | else |
5a753613 | 270 | path_list_insert(newpath, ¤t_file_set); |
6d297f81 JS |
271 | free(newpath); |
272 | ||
273 | return READ_TREE_RECURSIVE; | |
274 | } | |
275 | ||
3af244ca | 276 | static int get_files_dirs(struct tree *tree) |
6d297f81 JS |
277 | { |
278 | int n; | |
bd669986 | 279 | if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0) |
6d297f81 | 280 | return 0; |
5a753613 | 281 | n = current_file_set.nr + current_directory_set.nr; |
6d297f81 JS |
282 | return n; |
283 | } | |
284 | ||
6d297f81 | 285 | /* |
790296fd | 286 | * Returns an index_entry instance which doesn't have to correspond to |
6d297f81 JS |
287 | * a real cache entry in Git's index. |
288 | */ | |
3af244ca JS |
289 | static struct stage_data *insert_stage_data(const char *path, |
290 | struct tree *o, struct tree *a, struct tree *b, | |
291 | struct path_list *entries) | |
6d297f81 | 292 | { |
3af244ca | 293 | struct path_list_item *item; |
6d297f81 JS |
294 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); |
295 | get_tree_entry(o->object.sha1, path, | |
296 | e->stages[1].sha, &e->stages[1].mode); | |
297 | get_tree_entry(a->object.sha1, path, | |
298 | e->stages[2].sha, &e->stages[2].mode); | |
299 | get_tree_entry(b->object.sha1, path, | |
300 | e->stages[3].sha, &e->stages[3].mode); | |
3af244ca JS |
301 | item = path_list_insert(path, entries); |
302 | item->util = e; | |
6d297f81 JS |
303 | return e; |
304 | } | |
305 | ||
6d297f81 | 306 | /* |
5a753613 | 307 | * Create a dictionary mapping file names to stage_data objects. The |
6d297f81 JS |
308 | * dictionary contains one entry for every path with a non-zero stage entry. |
309 | */ | |
3af244ca | 310 | static struct path_list *get_unmerged(void) |
6d297f81 JS |
311 | { |
312 | struct path_list *unmerged = xcalloc(1, sizeof(struct path_list)); | |
313 | int i; | |
314 | ||
315 | unmerged->strdup_paths = 1; | |
8b944b56 | 316 | |
ad57cbca | 317 | for (i = 0; i < active_nr; i++) { |
3af244ca JS |
318 | struct path_list_item *item; |
319 | struct stage_data *e; | |
6d297f81 JS |
320 | struct cache_entry *ce = active_cache[i]; |
321 | if (!ce_stage(ce)) | |
322 | continue; | |
323 | ||
3af244ca JS |
324 | item = path_list_lookup(ce->name, unmerged); |
325 | if (!item) { | |
326 | item = path_list_insert(ce->name, unmerged); | |
327 | item->util = xcalloc(1, sizeof(struct stage_data)); | |
328 | } | |
329 | e = item->util; | |
7a51ed66 | 330 | e->stages[ce_stage(ce)].mode = ce->ce_mode; |
8da71493 | 331 | hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1); |
6d297f81 JS |
332 | } |
333 | ||
6d297f81 JS |
334 | return unmerged; |
335 | } | |
336 | ||
337 | struct rename | |
338 | { | |
339 | struct diff_filepair *pair; | |
340 | struct stage_data *src_entry; | |
341 | struct stage_data *dst_entry; | |
342 | unsigned processed:1; | |
343 | }; | |
344 | ||
6d297f81 | 345 | /* |
3dff5379 | 346 | * Get information of all renames which occurred between 'o_tree' and |
5a753613 JS |
347 | * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and |
348 | * 'b_tree') to be able to associate the correct cache entries with | |
349 | * the rename information. 'tree' is always equal to either a_tree or b_tree. | |
6d297f81 JS |
350 | */ |
351 | static struct path_list *get_renames(struct tree *tree, | |
5a753613 JS |
352 | struct tree *o_tree, |
353 | struct tree *a_tree, | |
354 | struct tree *b_tree, | |
6d297f81 JS |
355 | struct path_list *entries) |
356 | { | |
3af244ca JS |
357 | int i; |
358 | struct path_list *renames; | |
359 | struct diff_options opts; | |
3af244ca JS |
360 | |
361 | renames = xcalloc(1, sizeof(struct path_list)); | |
6d297f81 | 362 | diff_setup(&opts); |
8f67f8ae | 363 | DIFF_OPT_SET(&opts, RECURSIVE); |
6d297f81 | 364 | opts.detect_rename = DIFF_DETECT_RENAME; |
2a2ac926 JK |
365 | opts.rename_limit = merge_rename_limit >= 0 ? merge_rename_limit : |
366 | diff_rename_limit >= 0 ? diff_rename_limit : | |
50705915 | 367 | 500; |
b8960bbe | 368 | opts.warn_on_too_large_rename = 1; |
6d297f81 JS |
369 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; |
370 | if (diff_setup_done(&opts) < 0) | |
371 | die("diff setup failed"); | |
5a753613 | 372 | diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts); |
6d297f81 JS |
373 | diffcore_std(&opts); |
374 | for (i = 0; i < diff_queued_diff.nr; ++i) { | |
3af244ca | 375 | struct path_list_item *item; |
6d297f81 JS |
376 | struct rename *re; |
377 | struct diff_filepair *pair = diff_queued_diff.queue[i]; | |
378 | if (pair->status != 'R') { | |
379 | diff_free_filepair(pair); | |
380 | continue; | |
381 | } | |
382 | re = xmalloc(sizeof(*re)); | |
383 | re->processed = 0; | |
384 | re->pair = pair; | |
3af244ca JS |
385 | item = path_list_lookup(re->pair->one->path, entries); |
386 | if (!item) | |
387 | re->src_entry = insert_stage_data(re->pair->one->path, | |
5a753613 | 388 | o_tree, a_tree, b_tree, entries); |
3af244ca JS |
389 | else |
390 | re->src_entry = item->util; | |
391 | ||
392 | item = path_list_lookup(re->pair->two->path, entries); | |
393 | if (!item) | |
394 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
5a753613 | 395 | o_tree, a_tree, b_tree, entries); |
3af244ca JS |
396 | else |
397 | re->dst_entry = item->util; | |
398 | item = path_list_insert(pair->one->path, renames); | |
6d297f81 JS |
399 | item->util = re; |
400 | } | |
401 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
402 | diff_queued_diff.nr = 0; | |
403 | diff_flush(&opts); | |
6d297f81 JS |
404 | return renames; |
405 | } | |
406 | ||
9fe0d87d JH |
407 | static int update_stages(const char *path, struct diff_filespec *o, |
408 | struct diff_filespec *a, struct diff_filespec *b, | |
409 | int clear) | |
6d297f81 JS |
410 | { |
411 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE; | |
3af244ca JS |
412 | if (clear) |
413 | if (remove_file_from_cache(path)) | |
6d297f81 | 414 | return -1; |
3af244ca JS |
415 | if (o) |
416 | if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options)) | |
6d297f81 | 417 | return -1; |
3af244ca JS |
418 | if (a) |
419 | if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options)) | |
6d297f81 | 420 | return -1; |
3af244ca JS |
421 | if (b) |
422 | if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options)) | |
6d297f81 JS |
423 | return -1; |
424 | return 0; | |
425 | } | |
426 | ||
6d297f81 JS |
427 | static int remove_path(const char *name) |
428 | { | |
182af834 | 429 | int ret; |
3af244ca | 430 | char *slash, *dirs; |
6d297f81 JS |
431 | |
432 | ret = unlink(name); | |
3af244ca | 433 | if (ret) |
6d297f81 | 434 | return ret; |
182af834 | 435 | dirs = xstrdup(name); |
3af244ca | 436 | while ((slash = strrchr(name, '/'))) { |
6d297f81 | 437 | *slash = '\0'; |
3af244ca | 438 | if (rmdir(name) != 0) |
6d297f81 JS |
439 | break; |
440 | } | |
441 | free(dirs); | |
442 | return ret; | |
443 | } | |
444 | ||
65ac6e9c | 445 | static int remove_file(int clean, const char *path, int no_wd) |
6d297f81 | 446 | { |
5a753613 | 447 | int update_cache = index_only || clean; |
65ac6e9c | 448 | int update_working_directory = !index_only && !no_wd; |
6d297f81 | 449 | |
5a753613 | 450 | if (update_cache) { |
6d297f81 JS |
451 | if (remove_file_from_cache(path)) |
452 | return -1; | |
453 | } | |
65ac6e9c | 454 | if (update_working_directory) { |
6d297f81 | 455 | unlink(path); |
3af244ca | 456 | if (errno != ENOENT || errno != EISDIR) |
6d297f81 JS |
457 | return -1; |
458 | remove_path(path); | |
459 | } | |
460 | return 0; | |
461 | } | |
462 | ||
463 | static char *unique_path(const char *path, const char *branch) | |
464 | { | |
465 | char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1); | |
3af244ca JS |
466 | int suffix = 0; |
467 | struct stat st; | |
f59aac47 | 468 | char *p = newpath + strlen(path); |
6d297f81 | 469 | strcpy(newpath, path); |
f59aac47 | 470 | *(p++) = '~'; |
6d297f81 | 471 | strcpy(p, branch); |
3af244ca JS |
472 | for (; *p; ++p) |
473 | if ('/' == *p) | |
6d297f81 | 474 | *p = '_'; |
5a753613 JS |
475 | while (path_list_has_path(¤t_file_set, newpath) || |
476 | path_list_has_path(¤t_directory_set, newpath) || | |
3af244ca | 477 | lstat(newpath, &st) == 0) |
6d297f81 | 478 | sprintf(p, "_%d", suffix++); |
3af244ca | 479 | |
5a753613 | 480 | path_list_insert(newpath, ¤t_file_set); |
6d297f81 JS |
481 | return newpath; |
482 | } | |
483 | ||
6d297f81 JS |
484 | static void flush_buffer(int fd, const char *buf, unsigned long size) |
485 | { | |
486 | while (size > 0) { | |
93822c22 | 487 | long ret = write_in_full(fd, buf, size); |
6d297f81 JS |
488 | if (ret < 0) { |
489 | /* Ignore epipe */ | |
490 | if (errno == EPIPE) | |
491 | break; | |
492 | die("merge-recursive: %s", strerror(errno)); | |
493 | } else if (!ret) { | |
494 | die("merge-recursive: disk full?"); | |
495 | } | |
496 | size -= ret; | |
497 | buf += ret; | |
498 | } | |
499 | } | |
500 | ||
851c603e LT |
501 | static int make_room_for_path(const char *path) |
502 | { | |
503 | int status; | |
504 | const char *msg = "failed to create path '%s'%s"; | |
505 | ||
8e21d63b | 506 | status = safe_create_leading_directories_const(path); |
851c603e LT |
507 | if (status) { |
508 | if (status == -3) { | |
509 | /* something else exists */ | |
510 | error(msg, path, ": perhaps a D/F conflict?"); | |
511 | return -1; | |
512 | } | |
513 | die(msg, path, ""); | |
514 | } | |
515 | ||
516 | /* Successful unlink is good.. */ | |
517 | if (!unlink(path)) | |
518 | return 0; | |
519 | /* .. and so is no existing file */ | |
520 | if (errno == ENOENT) | |
521 | return 0; | |
522 | /* .. but not some other error (who really cares what?) */ | |
523 | return error(msg, path, ": perhaps a D/F conflict?"); | |
524 | } | |
525 | ||
9fe0d87d JH |
526 | static void update_file_flags(const unsigned char *sha, |
527 | unsigned mode, | |
528 | const char *path, | |
529 | int update_cache, | |
530 | int update_wd) | |
6d297f81 | 531 | { |
3af244ca JS |
532 | if (index_only) |
533 | update_wd = 0; | |
6d297f81 | 534 | |
3af244ca | 535 | if (update_wd) { |
21666f1a | 536 | enum object_type type; |
6d297f81 JS |
537 | void *buf; |
538 | unsigned long size; | |
539 | ||
20b178de FAG |
540 | if (S_ISGITLINK(mode)) |
541 | die("cannot read object %s '%s': It is a submodule!", | |
542 | sha1_to_hex(sha), path); | |
543 | ||
21666f1a | 544 | buf = read_sha1_file(sha, &type, &size); |
6d297f81 JS |
545 | if (!buf) |
546 | die("cannot read object %s '%s'", sha1_to_hex(sha), path); | |
21666f1a | 547 | if (type != OBJ_BLOB) |
6d297f81 | 548 | die("blob expected for %s '%s'", sha1_to_hex(sha), path); |
249c61a6 JS |
549 | if (S_ISREG(mode)) { |
550 | struct strbuf strbuf; | |
551 | strbuf_init(&strbuf, 0); | |
552 | if (convert_to_working_tree(path, buf, size, &strbuf)) { | |
553 | free(buf); | |
554 | size = strbuf.len; | |
555 | buf = strbuf_detach(&strbuf, NULL); | |
556 | } | |
557 | } | |
6d297f81 | 558 | |
851c603e LT |
559 | if (make_room_for_path(path) < 0) { |
560 | update_wd = 0; | |
249c61a6 | 561 | free(buf); |
851c603e LT |
562 | goto update_index; |
563 | } | |
723024d6 | 564 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { |
3af244ca | 565 | int fd; |
3af244ca | 566 | if (mode & 0100) |
6d297f81 JS |
567 | mode = 0777; |
568 | else | |
569 | mode = 0666; | |
3af244ca JS |
570 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); |
571 | if (fd < 0) | |
6d297f81 JS |
572 | die("failed to open %s: %s", path, strerror(errno)); |
573 | flush_buffer(fd, buf, size); | |
574 | close(fd); | |
3af244ca | 575 | } else if (S_ISLNK(mode)) { |
182af834 | 576 | char *lnk = xmemdupz(buf, size); |
8e21d63b | 577 | safe_create_leading_directories_const(path); |
17cd29b2 | 578 | unlink(path); |
3af244ca | 579 | symlink(lnk, path); |
723024d6 | 580 | free(lnk); |
6d297f81 JS |
581 | } else |
582 | die("do not know what to do with %06o %s '%s'", | |
583 | mode, sha1_to_hex(sha), path); | |
249c61a6 | 584 | free(buf); |
6d297f81 | 585 | } |
4d50895a | 586 | update_index: |
3af244ca JS |
587 | if (update_cache) |
588 | add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); | |
6d297f81 JS |
589 | } |
590 | ||
9fe0d87d JH |
591 | static void update_file(int clean, |
592 | const unsigned char *sha, | |
593 | unsigned mode, | |
594 | const char *path) | |
6d297f81 JS |
595 | { |
596 | update_file_flags(sha, mode, path, index_only || clean, !index_only); | |
597 | } | |
598 | ||
599 | /* Low level file merging, update and removal */ | |
600 | ||
601 | struct merge_file_info | |
602 | { | |
603 | unsigned char sha[20]; | |
604 | unsigned mode; | |
605 | unsigned clean:1, | |
606 | merge:1; | |
607 | }; | |
608 | ||
c2b4faea | 609 | static void fill_mm(const unsigned char *sha1, mmfile_t *mm) |
6d297f81 | 610 | { |
6d297f81 | 611 | unsigned long size; |
21666f1a | 612 | enum object_type type; |
6d297f81 | 613 | |
f953831e JS |
614 | if (!hashcmp(sha1, null_sha1)) { |
615 | mm->ptr = xstrdup(""); | |
616 | mm->size = 0; | |
617 | return; | |
618 | } | |
6d297f81 | 619 | |
21666f1a NP |
620 | mm->ptr = read_sha1_file(sha1, &type, &size); |
621 | if (!mm->ptr || type != OBJ_BLOB) | |
6d297f81 | 622 | die("unable to read blob object %s", sha1_to_hex(sha1)); |
c2b4faea | 623 | mm->size = size; |
6d297f81 JS |
624 | } |
625 | ||
525ab639 JH |
626 | static int merge_3way(mmbuffer_t *result_buf, |
627 | struct diff_filespec *o, | |
628 | struct diff_filespec *a, | |
629 | struct diff_filespec *b, | |
630 | const char *branch1, | |
631 | const char *branch2) | |
3e5261a2 JH |
632 | { |
633 | mmfile_t orig, src1, src2; | |
3e5261a2 JH |
634 | char *name1, *name2; |
635 | int merge_status; | |
636 | ||
637 | name1 = xstrdup(mkpath("%s:%s", branch1, a->path)); | |
638 | name2 = xstrdup(mkpath("%s:%s", branch2, b->path)); | |
639 | ||
640 | fill_mm(o->sha1, &orig); | |
641 | fill_mm(a->sha1, &src1); | |
642 | fill_mm(b->sha1, &src2); | |
643 | ||
525ab639 JH |
644 | merge_status = ll_merge(result_buf, a->path, &orig, |
645 | &src1, name1, &src2, name2, | |
646 | index_only); | |
a129d96f | 647 | |
3e5261a2 JH |
648 | free(name1); |
649 | free(name2); | |
650 | free(orig.ptr); | |
651 | free(src1.ptr); | |
652 | free(src2.ptr); | |
653 | return merge_status; | |
654 | } | |
655 | ||
3af244ca JS |
656 | static struct merge_file_info merge_file(struct diff_filespec *o, |
657 | struct diff_filespec *a, struct diff_filespec *b, | |
c1d20846 | 658 | const char *branch1, const char *branch2) |
6d297f81 JS |
659 | { |
660 | struct merge_file_info result; | |
661 | result.merge = 0; | |
662 | result.clean = 1; | |
663 | ||
3af244ca | 664 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { |
6d297f81 | 665 | result.clean = 0; |
3af244ca JS |
666 | if (S_ISREG(a->mode)) { |
667 | result.mode = a->mode; | |
8da71493 | 668 | hashcpy(result.sha, a->sha1); |
6d297f81 | 669 | } else { |
3af244ca | 670 | result.mode = b->mode; |
8da71493 | 671 | hashcpy(result.sha, b->sha1); |
6d297f81 JS |
672 | } |
673 | } else { | |
3af244ca | 674 | if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1)) |
6d297f81 JS |
675 | result.merge = 1; |
676 | ||
1affea4f CB |
677 | /* |
678 | * Merge modes | |
679 | */ | |
680 | if (a->mode == b->mode || a->mode == o->mode) | |
681 | result.mode = b->mode; | |
682 | else { | |
683 | result.mode = a->mode; | |
684 | if (b->mode != o->mode) { | |
685 | result.clean = 0; | |
686 | result.merge = 1; | |
687 | } | |
688 | } | |
6d297f81 | 689 | |
1affea4f | 690 | if (sha_eq(a->sha1, b->sha1) || sha_eq(a->sha1, o->sha1)) |
8da71493 | 691 | hashcpy(result.sha, b->sha1); |
3af244ca | 692 | else if (sha_eq(b->sha1, o->sha1)) |
8da71493 | 693 | hashcpy(result.sha, a->sha1); |
3af244ca | 694 | else if (S_ISREG(a->mode)) { |
c2b4faea | 695 | mmbuffer_t result_buf; |
c2b4faea JH |
696 | int merge_status; |
697 | ||
525ab639 JH |
698 | merge_status = merge_3way(&result_buf, o, a, b, |
699 | branch1, branch2); | |
c2b4faea JH |
700 | |
701 | if ((merge_status < 0) || !result_buf.ptr) | |
702 | die("Failed to execute internal merge"); | |
703 | ||
704 | if (write_sha1_file(result_buf.ptr, result_buf.size, | |
705 | blob_type, result.sha)) | |
706 | die("Unable to add %s to database", | |
707 | a->path); | |
708 | ||
709 | free(result_buf.ptr); | |
710 | result.clean = (merge_status == 0); | |
ff72af00 JH |
711 | } else if (S_ISGITLINK(a->mode)) { |
712 | result.clean = 0; | |
713 | hashcpy(result.sha, a->sha1); | |
714 | } else if (S_ISLNK(a->mode)) { | |
8da71493 | 715 | hashcpy(result.sha, a->sha1); |
6d297f81 | 716 | |
3af244ca | 717 | if (!sha_eq(a->sha1, b->sha1)) |
6d297f81 | 718 | result.clean = 0; |
ff72af00 JH |
719 | } else { |
720 | die("unsupported object type in the tree"); | |
6d297f81 JS |
721 | } |
722 | } | |
723 | ||
724 | return result; | |
725 | } | |
726 | ||
727 | static void conflict_rename_rename(struct rename *ren1, | |
728 | const char *branch1, | |
729 | struct rename *ren2, | |
730 | const char *branch2) | |
731 | { | |
732 | char *del[2]; | |
733 | int delp = 0; | |
734 | const char *ren1_dst = ren1->pair->two->path; | |
735 | const char *ren2_dst = ren2->pair->two->path; | |
5a753613 JS |
736 | const char *dst_name1 = ren1_dst; |
737 | const char *dst_name2 = ren2_dst; | |
738 | if (path_list_has_path(¤t_directory_set, ren1_dst)) { | |
739 | dst_name1 = del[delp++] = unique_path(ren1_dst, branch1); | |
89f40be2 | 740 | output(1, "%s is a directory in %s added as %s instead", |
5a753613 | 741 | ren1_dst, branch2, dst_name1); |
65ac6e9c | 742 | remove_file(0, ren1_dst, 0); |
6d297f81 | 743 | } |
5a753613 JS |
744 | if (path_list_has_path(¤t_directory_set, ren2_dst)) { |
745 | dst_name2 = del[delp++] = unique_path(ren2_dst, branch2); | |
89f40be2 | 746 | output(1, "%s is a directory in %s added as %s instead", |
5a753613 | 747 | ren2_dst, branch1, dst_name2); |
65ac6e9c | 748 | remove_file(0, ren2_dst, 0); |
6d297f81 | 749 | } |
a97e4075 AR |
750 | if (index_only) { |
751 | remove_file_from_cache(dst_name1); | |
752 | remove_file_from_cache(dst_name2); | |
753 | /* | |
754 | * Uncomment to leave the conflicting names in the resulting tree | |
755 | * | |
756 | * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1); | |
757 | * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2); | |
758 | */ | |
759 | } else { | |
760 | update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1); | |
761 | update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1); | |
762 | } | |
3af244ca | 763 | while (delp--) |
6d297f81 JS |
764 | free(del[delp]); |
765 | } | |
766 | ||
767 | static void conflict_rename_dir(struct rename *ren1, | |
768 | const char *branch1) | |
769 | { | |
5a753613 | 770 | char *new_path = unique_path(ren1->pair->two->path, branch1); |
89f40be2 | 771 | output(1, "Renamed %s to %s instead", ren1->pair->one->path, new_path); |
65ac6e9c | 772 | remove_file(0, ren1->pair->two->path, 0); |
5a753613 JS |
773 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path); |
774 | free(new_path); | |
6d297f81 JS |
775 | } |
776 | ||
777 | static void conflict_rename_rename_2(struct rename *ren1, | |
778 | const char *branch1, | |
779 | struct rename *ren2, | |
780 | const char *branch2) | |
781 | { | |
5a753613 JS |
782 | char *new_path1 = unique_path(ren1->pair->two->path, branch1); |
783 | char *new_path2 = unique_path(ren2->pair->two->path, branch2); | |
89f40be2 | 784 | output(1, "Renamed %s to %s and %s to %s instead", |
5a753613 JS |
785 | ren1->pair->one->path, new_path1, |
786 | ren2->pair->one->path, new_path2); | |
65ac6e9c | 787 | remove_file(0, ren1->pair->two->path, 0); |
5a753613 JS |
788 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1); |
789 | update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2); | |
790 | free(new_path2); | |
791 | free(new_path1); | |
6d297f81 JS |
792 | } |
793 | ||
5a753613 JS |
794 | static int process_renames(struct path_list *a_renames, |
795 | struct path_list *b_renames, | |
796 | const char *a_branch, | |
797 | const char *b_branch) | |
6d297f81 | 798 | { |
5a753613 JS |
799 | int clean_merge = 1, i, j; |
800 | struct path_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0}; | |
6d297f81 JS |
801 | const struct rename *sre; |
802 | ||
5a753613 JS |
803 | for (i = 0; i < a_renames->nr; i++) { |
804 | sre = a_renames->items[i].util; | |
805 | path_list_insert(sre->pair->two->path, &a_by_dst)->util | |
6d297f81 JS |
806 | = sre->dst_entry; |
807 | } | |
5a753613 JS |
808 | for (i = 0; i < b_renames->nr; i++) { |
809 | sre = b_renames->items[i].util; | |
810 | path_list_insert(sre->pair->two->path, &b_by_dst)->util | |
6d297f81 JS |
811 | = sre->dst_entry; |
812 | } | |
813 | ||
5a753613 | 814 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { |
3af244ca JS |
815 | int compare; |
816 | char *src; | |
6d297f81 | 817 | struct path_list *renames1, *renames2, *renames2Dst; |
3af244ca | 818 | struct rename *ren1 = NULL, *ren2 = NULL; |
5a753613 | 819 | const char *branch1, *branch2; |
3af244ca JS |
820 | const char *ren1_src, *ren1_dst; |
821 | ||
5a753613 | 822 | if (i >= a_renames->nr) { |
3af244ca | 823 | compare = 1; |
5a753613 JS |
824 | ren2 = b_renames->items[j++].util; |
825 | } else if (j >= b_renames->nr) { | |
3af244ca | 826 | compare = -1; |
5a753613 | 827 | ren1 = a_renames->items[i++].util; |
3af244ca | 828 | } else { |
5a753613 JS |
829 | compare = strcmp(a_renames->items[i].path, |
830 | b_renames->items[j].path); | |
3d234d0a JS |
831 | if (compare <= 0) |
832 | ren1 = a_renames->items[i++].util; | |
833 | if (compare >= 0) | |
834 | ren2 = b_renames->items[j++].util; | |
3af244ca JS |
835 | } |
836 | ||
6d297f81 | 837 | /* TODO: refactor, so that 1/2 are not needed */ |
3af244ca | 838 | if (ren1) { |
5a753613 JS |
839 | renames1 = a_renames; |
840 | renames2 = b_renames; | |
841 | renames2Dst = &b_by_dst; | |
842 | branch1 = a_branch; | |
843 | branch2 = b_branch; | |
6d297f81 | 844 | } else { |
3af244ca | 845 | struct rename *tmp; |
5a753613 JS |
846 | renames1 = b_renames; |
847 | renames2 = a_renames; | |
848 | renames2Dst = &a_by_dst; | |
849 | branch1 = b_branch; | |
850 | branch2 = a_branch; | |
3af244ca | 851 | tmp = ren2; |
6d297f81 JS |
852 | ren2 = ren1; |
853 | ren1 = tmp; | |
854 | } | |
3af244ca | 855 | src = ren1->pair->one->path; |
6d297f81 JS |
856 | |
857 | ren1->dst_entry->processed = 1; | |
858 | ren1->src_entry->processed = 1; | |
859 | ||
3af244ca | 860 | if (ren1->processed) |
6d297f81 JS |
861 | continue; |
862 | ren1->processed = 1; | |
863 | ||
3af244ca JS |
864 | ren1_src = ren1->pair->one->path; |
865 | ren1_dst = ren1->pair->two->path; | |
6d297f81 | 866 | |
3af244ca | 867 | if (ren2) { |
6d297f81 JS |
868 | const char *ren2_src = ren2->pair->one->path; |
869 | const char *ren2_dst = ren2->pair->two->path; | |
870 | /* Renamed in 1 and renamed in 2 */ | |
871 | if (strcmp(ren1_src, ren2_src) != 0) | |
872 | die("ren1.src != ren2.src"); | |
873 | ren2->dst_entry->processed = 1; | |
874 | ren2->processed = 1; | |
875 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
5a753613 | 876 | clean_merge = 0; |
8c3275ab | 877 | output(1, "CONFLICT (rename/rename): " |
a97e4075 AR |
878 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
879 | "rename \"%s\"->\"%s\" in \"%s\"%s", | |
5a753613 | 880 | src, ren1_dst, branch1, |
a97e4075 AR |
881 | src, ren2_dst, branch2, |
882 | index_only ? " (left unresolved)": ""); | |
883 | if (index_only) { | |
884 | remove_file_from_cache(src); | |
885 | update_file(0, ren1->pair->one->sha1, | |
886 | ren1->pair->one->mode, src); | |
887 | } | |
5a753613 | 888 | conflict_rename_rename(ren1, branch1, ren2, branch2); |
6d297f81 | 889 | } else { |
6d297f81 | 890 | struct merge_file_info mfi; |
65ac6e9c | 891 | remove_file(1, ren1_src, 1); |
3af244ca JS |
892 | mfi = merge_file(ren1->pair->one, |
893 | ren1->pair->two, | |
894 | ren2->pair->two, | |
5a753613 JS |
895 | branch1, |
896 | branch2); | |
3af244ca | 897 | if (mfi.merge || !mfi.clean) |
89f40be2 | 898 | output(1, "Renamed %s->%s", src, ren1_dst); |
6d297f81 | 899 | |
3af244ca | 900 | if (mfi.merge) |
89f40be2 | 901 | output(2, "Auto-merged %s", ren1_dst); |
6d297f81 | 902 | |
3af244ca | 903 | if (!mfi.clean) { |
8c3275ab | 904 | output(1, "CONFLICT (content): merge conflict in %s", |
6d297f81 | 905 | ren1_dst); |
5a753613 | 906 | clean_merge = 0; |
6d297f81 | 907 | |
3af244ca | 908 | if (!index_only) |
6d297f81 | 909 | update_stages(ren1_dst, |
3af244ca JS |
910 | ren1->pair->one, |
911 | ren1->pair->two, | |
912 | ren2->pair->two, | |
6d297f81 JS |
913 | 1 /* clear */); |
914 | } | |
915 | update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst); | |
916 | } | |
917 | } else { | |
918 | /* Renamed in 1, maybe changed in 2 */ | |
3af244ca JS |
919 | struct path_list_item *item; |
920 | /* we only use sha1 and mode of these */ | |
921 | struct diff_filespec src_other, dst_other; | |
5a753613 | 922 | int try_merge, stage = a_renames == renames1 ? 3: 2; |
6d297f81 | 923 | |
183d7972 | 924 | remove_file(1, ren1_src, index_only || stage == 3); |
6d297f81 | 925 | |
87cb004e | 926 | hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha); |
3af244ca | 927 | src_other.mode = ren1->src_entry->stages[stage].mode; |
87cb004e | 928 | hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha); |
3af244ca | 929 | dst_other.mode = ren1->dst_entry->stages[stage].mode; |
6d297f81 | 930 | |
5a753613 | 931 | try_merge = 0; |
6d297f81 | 932 | |
5a753613 JS |
933 | if (path_list_has_path(¤t_directory_set, ren1_dst)) { |
934 | clean_merge = 0; | |
89f40be2 | 935 | output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s " |
6d297f81 | 936 | " directory %s added in %s", |
5a753613 JS |
937 | ren1_src, ren1_dst, branch1, |
938 | ren1_dst, branch2); | |
939 | conflict_rename_dir(ren1, branch1); | |
3af244ca | 940 | } else if (sha_eq(src_other.sha1, null_sha1)) { |
5a753613 | 941 | clean_merge = 0; |
89f40be2 | 942 | output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s " |
6d297f81 | 943 | "and deleted in %s", |
5a753613 JS |
944 | ren1_src, ren1_dst, branch1, |
945 | branch2); | |
6d297f81 | 946 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst); |
3af244ca | 947 | } else if (!sha_eq(dst_other.sha1, null_sha1)) { |
5a753613 JS |
948 | const char *new_path; |
949 | clean_merge = 0; | |
950 | try_merge = 1; | |
89f40be2 | 951 | output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. " |
6d297f81 | 952 | "%s added in %s", |
5a753613 JS |
953 | ren1_src, ren1_dst, branch1, |
954 | ren1_dst, branch2); | |
955 | new_path = unique_path(ren1_dst, branch2); | |
89f40be2 | 956 | output(1, "Added as %s instead", new_path); |
5a753613 | 957 | update_file(0, dst_other.sha1, dst_other.mode, new_path); |
3af244ca JS |
958 | } else if ((item = path_list_lookup(ren1_dst, renames2Dst))) { |
959 | ren2 = item->util; | |
5a753613 | 960 | clean_merge = 0; |
6d297f81 | 961 | ren2->processed = 1; |
89f40be2 SP |
962 | output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. " |
963 | "Renamed %s->%s in %s", | |
5a753613 JS |
964 | ren1_src, ren1_dst, branch1, |
965 | ren2->pair->one->path, ren2->pair->two->path, branch2); | |
966 | conflict_rename_rename_2(ren1, branch1, ren2, branch2); | |
6d297f81 | 967 | } else |
5a753613 | 968 | try_merge = 1; |
6d297f81 | 969 | |
5a753613 | 970 | if (try_merge) { |
3af244ca | 971 | struct diff_filespec *o, *a, *b; |
6d297f81 | 972 | struct merge_file_info mfi; |
3af244ca JS |
973 | src_other.path = (char *)ren1_src; |
974 | ||
975 | o = ren1->pair->one; | |
5a753613 | 976 | if (a_renames == renames1) { |
3af244ca JS |
977 | a = ren1->pair->two; |
978 | b = &src_other; | |
979 | } else { | |
980 | b = ren1->pair->two; | |
981 | a = &src_other; | |
982 | } | |
983 | mfi = merge_file(o, a, b, | |
5a753613 | 984 | a_branch, b_branch); |
6d297f81 | 985 | |
0d5e6c97 | 986 | if (mfi.clean && |
c135ee88 AR |
987 | sha_eq(mfi.sha, ren1->pair->two->sha1) && |
988 | mfi.mode == ren1->pair->two->mode) | |
8a359819 AR |
989 | /* |
990 | * This messaged is part of | |
991 | * t6022 test. If you change | |
992 | * it update the test too. | |
993 | */ | |
c135ee88 AR |
994 | output(3, "Skipped %s (merged same as existing)", ren1_dst); |
995 | else { | |
996 | if (mfi.merge || !mfi.clean) | |
997 | output(1, "Renamed %s => %s", ren1_src, ren1_dst); | |
998 | if (mfi.merge) | |
999 | output(2, "Auto-merged %s", ren1_dst); | |
1000 | if (!mfi.clean) { | |
1001 | output(1, "CONFLICT (rename/modify): Merge conflict in %s", | |
1002 | ren1_dst); | |
1003 | clean_merge = 0; | |
1004 | ||
1005 | if (!index_only) | |
1006 | update_stages(ren1_dst, | |
1007 | o, a, b, 1); | |
1008 | } | |
1009 | update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst); | |
6d297f81 | 1010 | } |
6d297f81 JS |
1011 | } |
1012 | } | |
1013 | } | |
5a753613 JS |
1014 | path_list_clear(&a_by_dst, 0); |
1015 | path_list_clear(&b_by_dst, 0); | |
6d297f81 | 1016 | |
5a753613 | 1017 | return clean_merge; |
6d297f81 JS |
1018 | } |
1019 | ||
ac7f0f43 | 1020 | static unsigned char *stage_sha(const unsigned char *sha, unsigned mode) |
6d297f81 | 1021 | { |
ac7f0f43 | 1022 | return (is_null_sha1(sha) || mode == 0) ? NULL: (unsigned char *)sha; |
6d297f81 JS |
1023 | } |
1024 | ||
1025 | /* Per entry merge function */ | |
1026 | static int process_entry(const char *path, struct stage_data *entry, | |
c1d20846 JS |
1027 | const char *branch1, |
1028 | const char *branch2) | |
6d297f81 JS |
1029 | { |
1030 | /* | |
1031 | printf("processing entry, clean cache: %s\n", index_only ? "yes": "no"); | |
1032 | print_index_entry("\tpath: ", entry); | |
1033 | */ | |
5a753613 | 1034 | int clean_merge = 1; |
5a753613 JS |
1035 | unsigned o_mode = entry->stages[1].mode; |
1036 | unsigned a_mode = entry->stages[2].mode; | |
1037 | unsigned b_mode = entry->stages[3].mode; | |
ac7f0f43 JH |
1038 | unsigned char *o_sha = stage_sha(entry->stages[1].sha, o_mode); |
1039 | unsigned char *a_sha = stage_sha(entry->stages[2].sha, a_mode); | |
1040 | unsigned char *b_sha = stage_sha(entry->stages[3].sha, b_mode); | |
5a753613 JS |
1041 | |
1042 | if (o_sha && (!a_sha || !b_sha)) { | |
6d297f81 | 1043 | /* Case A: Deleted in one */ |
5a753613 JS |
1044 | if ((!a_sha && !b_sha) || |
1045 | (sha_eq(a_sha, o_sha) && !b_sha) || | |
1046 | (!a_sha && sha_eq(b_sha, o_sha))) { | |
6d297f81 JS |
1047 | /* Deleted in both or deleted in one and |
1048 | * unchanged in the other */ | |
5a753613 | 1049 | if (a_sha) |
89f40be2 | 1050 | output(2, "Removed %s", path); |
65ac6e9c JH |
1051 | /* do not touch working file if it did not exist */ |
1052 | remove_file(1, path, !a_sha); | |
6d297f81 JS |
1053 | } else { |
1054 | /* Deleted in one and changed in the other */ | |
5a753613 JS |
1055 | clean_merge = 0; |
1056 | if (!a_sha) { | |
8c3275ab | 1057 | output(1, "CONFLICT (delete/modify): %s deleted in %s " |
6d297f81 | 1058 | "and modified in %s. Version %s of %s left in tree.", |
c1d20846 JS |
1059 | path, branch1, |
1060 | branch2, branch2, path); | |
5a753613 | 1061 | update_file(0, b_sha, b_mode, path); |
6d297f81 | 1062 | } else { |
8c3275ab | 1063 | output(1, "CONFLICT (delete/modify): %s deleted in %s " |
6d297f81 | 1064 | "and modified in %s. Version %s of %s left in tree.", |
c1d20846 JS |
1065 | path, branch2, |
1066 | branch1, branch1, path); | |
5a753613 | 1067 | update_file(0, a_sha, a_mode, path); |
6d297f81 JS |
1068 | } |
1069 | } | |
1070 | ||
5a753613 JS |
1071 | } else if ((!o_sha && a_sha && !b_sha) || |
1072 | (!o_sha && !a_sha && b_sha)) { | |
6d297f81 | 1073 | /* Case B: Added in one. */ |
5a753613 JS |
1074 | const char *add_branch; |
1075 | const char *other_branch; | |
6d297f81 JS |
1076 | unsigned mode; |
1077 | const unsigned char *sha; | |
1078 | const char *conf; | |
1079 | ||
5a753613 | 1080 | if (a_sha) { |
c1d20846 JS |
1081 | add_branch = branch1; |
1082 | other_branch = branch2; | |
5a753613 JS |
1083 | mode = a_mode; |
1084 | sha = a_sha; | |
6d297f81 JS |
1085 | conf = "file/directory"; |
1086 | } else { | |
c1d20846 JS |
1087 | add_branch = branch2; |
1088 | other_branch = branch1; | |
5a753613 JS |
1089 | mode = b_mode; |
1090 | sha = b_sha; | |
6d297f81 JS |
1091 | conf = "directory/file"; |
1092 | } | |
5a753613 JS |
1093 | if (path_list_has_path(¤t_directory_set, path)) { |
1094 | const char *new_path = unique_path(path, add_branch); | |
1095 | clean_merge = 0; | |
8c3275ab | 1096 | output(1, "CONFLICT (%s): There is a directory with name %s in %s. " |
89f40be2 | 1097 | "Added %s as %s", |
5a753613 | 1098 | conf, path, other_branch, path, new_path); |
65ac6e9c | 1099 | remove_file(0, path, 0); |
5a753613 | 1100 | update_file(0, sha, mode, new_path); |
6d297f81 | 1101 | } else { |
89f40be2 | 1102 | output(2, "Added %s", path); |
6d297f81 JS |
1103 | update_file(1, sha, mode, path); |
1104 | } | |
f953831e JS |
1105 | } else if (a_sha && b_sha) { |
1106 | /* Case C: Added in both (check for same permissions) and */ | |
6d297f81 | 1107 | /* case D: Modified in both, but differently. */ |
f953831e | 1108 | const char *reason = "content"; |
6d297f81 | 1109 | struct merge_file_info mfi; |
3af244ca JS |
1110 | struct diff_filespec o, a, b; |
1111 | ||
f953831e JS |
1112 | if (!o_sha) { |
1113 | reason = "add/add"; | |
1114 | o_sha = (unsigned char *)null_sha1; | |
1115 | } | |
89f40be2 | 1116 | output(2, "Auto-merged %s", path); |
3af244ca | 1117 | o.path = a.path = b.path = (char *)path; |
8da71493 | 1118 | hashcpy(o.sha1, o_sha); |
5a753613 | 1119 | o.mode = o_mode; |
8da71493 | 1120 | hashcpy(a.sha1, a_sha); |
5a753613 | 1121 | a.mode = a_mode; |
8da71493 | 1122 | hashcpy(b.sha1, b_sha); |
5a753613 | 1123 | b.mode = b_mode; |
3af244ca JS |
1124 | |
1125 | mfi = merge_file(&o, &a, &b, | |
c1d20846 | 1126 | branch1, branch2); |
6d297f81 | 1127 | |
20b178de | 1128 | clean_merge = mfi.clean; |
3af244ca | 1129 | if (mfi.clean) |
6d297f81 | 1130 | update_file(1, mfi.sha, mfi.mode, path); |
20b178de FAG |
1131 | else if (S_ISGITLINK(mfi.mode)) |
1132 | output(1, "CONFLICT (submodule): Merge conflict in %s " | |
1133 | "- needs %s", path, sha1_to_hex(b.sha1)); | |
6d297f81 | 1134 | else { |
8c3275ab | 1135 | output(1, "CONFLICT (%s): Merge conflict in %s", |
f953831e | 1136 | reason, path); |
6d297f81 | 1137 | |
3af244ca | 1138 | if (index_only) |
6d297f81 JS |
1139 | update_file(0, mfi.sha, mfi.mode, path); |
1140 | else | |
1141 | update_file_flags(mfi.sha, mfi.mode, path, | |
5a753613 | 1142 | 0 /* update_cache */, 1 /* update_working_directory */); |
6d297f81 | 1143 | } |
ac7f0f43 JH |
1144 | } else if (!o_sha && !a_sha && !b_sha) { |
1145 | /* | |
1146 | * this entry was deleted altogether. a_mode == 0 means | |
1147 | * we had that path and want to actively remove it. | |
1148 | */ | |
1149 | remove_file(1, path, !a_mode); | |
6d297f81 JS |
1150 | } else |
1151 | die("Fatal merge failure, shouldn't happen."); | |
1152 | ||
5a753613 | 1153 | return clean_merge; |
6d297f81 JS |
1154 | } |
1155 | ||
e1b3a2ca DB |
1156 | int merge_trees(struct tree *head, |
1157 | struct tree *merge, | |
1158 | struct tree *common, | |
1159 | const char *branch1, | |
1160 | const char *branch2, | |
1161 | struct tree **result) | |
6d297f81 | 1162 | { |
3af244ca | 1163 | int code, clean; |
68faf689 JH |
1164 | |
1165 | if (subtree_merge) { | |
1166 | merge = shift_tree_object(head, merge); | |
1167 | common = shift_tree_object(head, common); | |
1168 | } | |
1169 | ||
3af244ca | 1170 | if (sha_eq(common->object.sha1, merge->object.sha1)) { |
8c3275ab | 1171 | output(0, "Already uptodate!"); |
3af244ca JS |
1172 | *result = head; |
1173 | return 1; | |
6d297f81 JS |
1174 | } |
1175 | ||
7a85b848 | 1176 | code = git_merge_trees(index_only, common, head, merge); |
6d297f81 | 1177 | |
3af244ca | 1178 | if (code != 0) |
6d297f81 JS |
1179 | die("merging of trees %s and %s failed", |
1180 | sha1_to_hex(head->object.sha1), | |
1181 | sha1_to_hex(merge->object.sha1)); | |
1182 | ||
94a5728c | 1183 | if (unmerged_cache()) { |
3af244ca JS |
1184 | struct path_list *entries, *re_head, *re_merge; |
1185 | int i; | |
5a753613 JS |
1186 | path_list_clear(¤t_file_set, 1); |
1187 | path_list_clear(¤t_directory_set, 1); | |
3af244ca JS |
1188 | get_files_dirs(head); |
1189 | get_files_dirs(merge); | |
6d297f81 | 1190 | |
3af244ca | 1191 | entries = get_unmerged(); |
6d297f81 JS |
1192 | re_head = get_renames(head, common, head, merge, entries); |
1193 | re_merge = get_renames(merge, common, head, merge, entries); | |
3af244ca | 1194 | clean = process_renames(re_head, re_merge, |
c1d20846 | 1195 | branch1, branch2); |
ad57cbca | 1196 | for (i = 0; i < entries->nr; i++) { |
6d297f81 JS |
1197 | const char *path = entries->items[i].path; |
1198 | struct stage_data *e = entries->items[i].util; | |
3f6ee2d1 SP |
1199 | if (!e->processed |
1200 | && !process_entry(path, e, branch1, branch2)) | |
3af244ca | 1201 | clean = 0; |
6d297f81 JS |
1202 | } |
1203 | ||
3af244ca JS |
1204 | path_list_clear(re_merge, 0); |
1205 | path_list_clear(re_head, 0); | |
1206 | path_list_clear(entries, 1); | |
6d297f81 | 1207 | |
6d297f81 | 1208 | } |
1cf716a2 JH |
1209 | else |
1210 | clean = 1; | |
1211 | ||
8b944b56 | 1212 | if (index_only) |
e1b3a2ca | 1213 | *result = write_tree_from_memory(); |
6d297f81 | 1214 | |
3af244ca | 1215 | return clean; |
6d297f81 JS |
1216 | } |
1217 | ||
8918b0c9 JS |
1218 | static struct commit_list *reverse_commit_list(struct commit_list *list) |
1219 | { | |
1220 | struct commit_list *next = NULL, *current, *backup; | |
1221 | for (current = list; current; current = backup) { | |
1222 | backup = current->next; | |
1223 | current->next = next; | |
1224 | next = current; | |
1225 | } | |
1226 | return next; | |
1227 | } | |
1228 | ||
6d297f81 JS |
1229 | /* |
1230 | * Merge the commits h1 and h2, return the resulting virtual | |
3dff5379 | 1231 | * commit object and a flag indicating the cleanness of the merge. |
6d297f81 | 1232 | */ |
e1b3a2ca DB |
1233 | int merge_recursive(struct commit *h1, |
1234 | struct commit *h2, | |
1235 | const char *branch1, | |
1236 | const char *branch2, | |
1237 | struct commit_list *ca, | |
1238 | struct commit **result) | |
6d297f81 | 1239 | { |
8b944b56 | 1240 | struct commit_list *iter; |
5a753613 | 1241 | struct commit *merged_common_ancestors; |
f120ae2a | 1242 | struct tree *mrtree = mrtree; |
3af244ca | 1243 | int clean; |
6d297f81 | 1244 | |
8c3275ab SP |
1245 | if (show(4)) { |
1246 | output(4, "Merging:"); | |
1247 | output_commit_title(h1); | |
1248 | output_commit_title(h2); | |
1249 | } | |
6d297f81 | 1250 | |
8b944b56 JH |
1251 | if (!ca) { |
1252 | ca = get_merge_bases(h1, h2, 1); | |
1253 | ca = reverse_commit_list(ca); | |
1254 | } | |
6d297f81 | 1255 | |
8c3275ab SP |
1256 | if (show(5)) { |
1257 | output(5, "found %u common ancestor(s):", commit_list_count(ca)); | |
1258 | for (iter = ca; iter; iter = iter->next) | |
1259 | output_commit_title(iter->item); | |
1260 | } | |
6d297f81 | 1261 | |
5a753613 | 1262 | merged_common_ancestors = pop_commit(&ca); |
934d9a24 JS |
1263 | if (merged_common_ancestors == NULL) { |
1264 | /* if there is no common ancestor, make an empty tree */ | |
1265 | struct tree *tree = xcalloc(1, sizeof(struct tree)); | |
934d9a24 JS |
1266 | |
1267 | tree->object.parsed = 1; | |
1268 | tree->object.type = OBJ_TREE; | |
21666f1a | 1269 | pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1); |
934d9a24 JS |
1270 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); |
1271 | } | |
6d297f81 | 1272 | |
6d297f81 | 1273 | for (iter = ca; iter; iter = iter->next) { |
63889639 | 1274 | call_depth++; |
3af244ca JS |
1275 | /* |
1276 | * When the merge fails, the result contains files | |
1277 | * with conflict markers. The cleanness flag is | |
3dff5379 PR |
1278 | * ignored, it was never actually used, as result of |
1279 | * merge_trees has always overwritten it: the committed | |
3af244ca JS |
1280 | * "conflicts" were already resolved. |
1281 | */ | |
8b944b56 | 1282 | discard_cache(); |
e1b3a2ca DB |
1283 | merge_recursive(merged_common_ancestors, iter->item, |
1284 | "Temporary merge branch 1", | |
1285 | "Temporary merge branch 2", | |
1286 | NULL, | |
1287 | &merged_common_ancestors); | |
63889639 | 1288 | call_depth--; |
6d297f81 | 1289 | |
5a753613 | 1290 | if (!merged_common_ancestors) |
6d297f81 JS |
1291 | die("merge returned no commit"); |
1292 | } | |
1293 | ||
8b944b56 | 1294 | discard_cache(); |
63889639 | 1295 | if (!call_depth) { |
8b944b56 | 1296 | read_cache(); |
6d297f81 | 1297 | index_only = 0; |
8b944b56 | 1298 | } else |
6d297f81 | 1299 | index_only = 1; |
6d297f81 | 1300 | |
5a753613 | 1301 | clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree, |
c1d20846 | 1302 | branch1, branch2, &mrtree); |
6d297f81 | 1303 | |
8b944b56 | 1304 | if (index_only) { |
3af244ca JS |
1305 | *result = make_virtual_commit(mrtree, "merged tree"); |
1306 | commit_list_insert(h1, &(*result)->parents); | |
1307 | commit_list_insert(h2, &(*result)->parents->next); | |
8b944b56 | 1308 | } |
66a155bc | 1309 | flush_output(); |
3af244ca | 1310 | return clean; |
6d297f81 JS |
1311 | } |
1312 | ||
7ba3c078 SP |
1313 | static const char *better_branch_name(const char *branch) |
1314 | { | |
1315 | static char githead_env[8 + 40 + 1]; | |
1316 | char *name; | |
1317 | ||
1318 | if (strlen(branch) != 40) | |
1319 | return branch; | |
1320 | sprintf(githead_env, "GITHEAD_%s", branch); | |
1321 | name = getenv(githead_env); | |
1322 | return name ? name : branch; | |
1323 | } | |
1324 | ||
6d297f81 JS |
1325 | static struct commit *get_ref(const char *ref) |
1326 | { | |
1327 | unsigned char sha1[20]; | |
1328 | struct object *object; | |
1329 | ||
1330 | if (get_sha1(ref, sha1)) | |
1331 | die("Could not resolve ref '%s'", ref); | |
1332 | object = deref_tag(parse_object(sha1), ref, strlen(ref)); | |
affeef12 MK |
1333 | if (!object) |
1334 | return NULL; | |
a970e84e SP |
1335 | if (object->type == OBJ_TREE) |
1336 | return make_virtual_commit((struct tree*)object, | |
1337 | better_branch_name(ref)); | |
bf6d324e | 1338 | if (object->type != OBJ_COMMIT) |
6d297f81 JS |
1339 | return NULL; |
1340 | if (parse_commit((struct commit *)object)) | |
1341 | die("Could not parse commit '%s'", sha1_to_hex(object->sha1)); | |
1342 | return (struct commit *)object; | |
1343 | } | |
1344 | ||
ef90d6d4 | 1345 | static int merge_config(const char *var, const char *value, void *cb) |
8c3275ab SP |
1346 | { |
1347 | if (!strcasecmp(var, "merge.verbosity")) { | |
1348 | verbosity = git_config_int(var, value); | |
1349 | return 0; | |
1350 | } | |
df3a02f6 | 1351 | if (!strcasecmp(var, "diff.renamelimit")) { |
2a2ac926 JK |
1352 | diff_rename_limit = git_config_int(var, value); |
1353 | return 0; | |
1354 | } | |
1355 | if (!strcasecmp(var, "merge.renamelimit")) { | |
1356 | merge_rename_limit = git_config_int(var, value); | |
df3a02f6 LH |
1357 | return 0; |
1358 | } | |
ef90d6d4 | 1359 | return git_default_config(var, value, cb); |
8c3275ab SP |
1360 | } |
1361 | ||
e1b3a2ca | 1362 | int cmd_merge_recursive(int argc, const char **argv, const char *prefix) |
6d297f81 | 1363 | { |
8b944b56 | 1364 | static const char *bases[20]; |
6d297f81 | 1365 | static unsigned bases_count = 0; |
3af244ca JS |
1366 | int i, clean; |
1367 | const char *branch1, *branch2; | |
1368 | struct commit *result, *h1, *h2; | |
8b944b56 JH |
1369 | struct commit_list *ca = NULL; |
1370 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); | |
1371 | int index_fd; | |
6d297f81 | 1372 | |
68faf689 JH |
1373 | if (argv[0]) { |
1374 | int namelen = strlen(argv[0]); | |
1375 | if (8 < namelen && | |
1376 | !strcmp(argv[0] + namelen - 8, "-subtree")) | |
1377 | subtree_merge = 1; | |
1378 | } | |
1379 | ||
ef90d6d4 | 1380 | git_config(merge_config, NULL); |
8c3275ab SP |
1381 | if (getenv("GIT_MERGE_VERBOSITY")) |
1382 | verbosity = strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10); | |
6d297f81 JS |
1383 | |
1384 | if (argc < 4) | |
1385 | die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]); | |
1386 | ||
6d297f81 JS |
1387 | for (i = 1; i < argc; ++i) { |
1388 | if (!strcmp(argv[i], "--")) | |
1389 | break; | |
1390 | if (bases_count < sizeof(bases)/sizeof(*bases)) | |
1391 | bases[bases_count++] = argv[i]; | |
1392 | } | |
1393 | if (argc - i != 3) /* "--" "<head>" "<remote>" */ | |
1394 | die("Not handling anything other than two heads merge."); | |
ad57cbca | 1395 | if (verbosity >= 5) |
3f6ee2d1 | 1396 | buffer_output = 0; |
6d297f81 | 1397 | |
6d297f81 JS |
1398 | branch1 = argv[++i]; |
1399 | branch2 = argv[++i]; | |
6d297f81 | 1400 | |
3af244ca JS |
1401 | h1 = get_ref(branch1); |
1402 | h2 = get_ref(branch2); | |
6d297f81 | 1403 | |
e0ec1819 SP |
1404 | branch1 = better_branch_name(branch1); |
1405 | branch2 = better_branch_name(branch2); | |
3f6ee2d1 | 1406 | |
8c3275ab SP |
1407 | if (show(3)) |
1408 | printf("Merging %s with %s\n", branch1, branch2); | |
e0ec1819 | 1409 | |
30ca07a2 | 1410 | index_fd = hold_locked_index(lock, 1); |
6d297f81 | 1411 | |
8b944b56 JH |
1412 | for (i = 0; i < bases_count; i++) { |
1413 | struct commit *ancestor = get_ref(bases[i]); | |
1414 | ca = commit_list_insert(ancestor, &ca); | |
1415 | } | |
e1b3a2ca | 1416 | clean = merge_recursive(h1, h2, branch1, branch2, ca, &result); |
8b944b56 JH |
1417 | |
1418 | if (active_cache_changed && | |
1419 | (write_cache(index_fd, active_cache, active_nr) || | |
4ed7cd3a | 1420 | commit_locked_index(lock))) |
8b944b56 | 1421 | die ("unable to write %s", get_index_file()); |
6d297f81 | 1422 | |
3af244ca | 1423 | return clean ? 0: 1; |
6d297f81 | 1424 | } |