]>
Commit | Line | Data |
---|---|---|
9047ebbc MV |
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 | */ | |
6 | #include "cache.h" | |
b2141fc1 | 7 | #include "config.h" |
1c4b6604 | 8 | #include "advice.h" |
697cc8ef | 9 | #include "lockfile.h" |
9047ebbc MV |
10 | #include "cache-tree.h" |
11 | #include "commit.h" | |
12 | #include "blob.h" | |
13 | #include "builtin.h" | |
14 | #include "tree-walk.h" | |
15 | #include "diff.h" | |
16 | #include "diffcore.h" | |
17 | #include "tag.h" | |
18 | #include "unpack-trees.h" | |
19 | #include "string-list.h" | |
20 | #include "xdiff-interface.h" | |
21 | #include "ll-merge.h" | |
9047ebbc MV |
22 | #include "attr.h" |
23 | #include "merge-recursive.h" | |
9800c0df | 24 | #include "dir.h" |
68d03e4a | 25 | #include "submodule.h" |
18cfc088 | 26 | #include "revision.h" |
9047ebbc | 27 | |
fc65b00d KW |
28 | struct path_hashmap_entry { |
29 | struct hashmap_entry e; | |
30 | char path[FLEX_ARRAY]; | |
31 | }; | |
32 | ||
33 | static int path_hashmap_cmp(const void *cmp_data, | |
34 | const void *entry, | |
35 | const void *entry_or_key, | |
36 | const void *keydata) | |
37 | { | |
38 | const struct path_hashmap_entry *a = entry; | |
39 | const struct path_hashmap_entry *b = entry_or_key; | |
40 | const char *key = keydata; | |
41 | ||
42 | if (ignore_case) | |
43 | return strcasecmp(a->path, key ? key : b->path); | |
44 | else | |
45 | return strcmp(a->path, key ? key : b->path); | |
46 | } | |
47 | ||
48 | static unsigned int path_hash(const char *path) | |
49 | { | |
50 | return ignore_case ? strihash(path) : strhash(path); | |
51 | } | |
52 | ||
7fe40b88 EN |
53 | static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, |
54 | char *dir) | |
55 | { | |
56 | struct dir_rename_entry key; | |
57 | ||
58 | if (dir == NULL) | |
59 | return NULL; | |
60 | hashmap_entry_init(&key, strhash(dir)); | |
61 | key.dir = dir; | |
62 | return hashmap_get(hashmap, &key, NULL); | |
63 | } | |
64 | ||
65 | static int dir_rename_cmp(const void *unused_cmp_data, | |
66 | const void *entry, | |
67 | const void *entry_or_key, | |
68 | const void *unused_keydata) | |
69 | { | |
70 | const struct dir_rename_entry *e1 = entry; | |
71 | const struct dir_rename_entry *e2 = entry_or_key; | |
72 | ||
73 | return strcmp(e1->dir, e2->dir); | |
74 | } | |
75 | ||
76 | static void dir_rename_init(struct hashmap *map) | |
77 | { | |
78 | hashmap_init(map, dir_rename_cmp, NULL, 0); | |
79 | } | |
80 | ||
81 | static void dir_rename_entry_init(struct dir_rename_entry *entry, | |
82 | char *directory) | |
83 | { | |
84 | hashmap_entry_init(entry, strhash(directory)); | |
85 | entry->dir = directory; | |
86 | entry->non_unique_new_dir = 0; | |
87 | strbuf_init(&entry->new_dir, 0); | |
88 | string_list_init(&entry->possible_new_dirs, 0); | |
89 | } | |
90 | ||
e95ab70a EN |
91 | static struct collision_entry *collision_find_entry(struct hashmap *hashmap, |
92 | char *target_file) | |
93 | { | |
94 | struct collision_entry key; | |
95 | ||
96 | hashmap_entry_init(&key, strhash(target_file)); | |
97 | key.target_file = target_file; | |
98 | return hashmap_get(hashmap, &key, NULL); | |
99 | } | |
100 | ||
101 | static int collision_cmp(void *unused_cmp_data, | |
102 | const struct collision_entry *e1, | |
103 | const struct collision_entry *e2, | |
104 | const void *unused_keydata) | |
105 | { | |
106 | return strcmp(e1->target_file, e2->target_file); | |
107 | } | |
108 | ||
109 | static void collision_init(struct hashmap *map) | |
110 | { | |
111 | hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0); | |
112 | } | |
113 | ||
bc9204d4 JS |
114 | static void flush_output(struct merge_options *o) |
115 | { | |
f1e2426b | 116 | if (o->buffer_output < 2 && o->obuf.len) { |
bc9204d4 JS |
117 | fputs(o->obuf.buf, stdout); |
118 | strbuf_reset(&o->obuf); | |
119 | } | |
120 | } | |
121 | ||
122 | static int err(struct merge_options *o, const char *err, ...) | |
123 | { | |
124 | va_list params; | |
125 | ||
f1e2426b JS |
126 | if (o->buffer_output < 2) |
127 | flush_output(o); | |
128 | else { | |
129 | strbuf_complete(&o->obuf, '\n'); | |
130 | strbuf_addstr(&o->obuf, "error: "); | |
131 | } | |
bc9204d4 JS |
132 | va_start(params, err); |
133 | strbuf_vaddf(&o->obuf, err, params); | |
134 | va_end(params); | |
f1e2426b JS |
135 | if (o->buffer_output > 1) |
136 | strbuf_addch(&o->obuf, '\n'); | |
137 | else { | |
138 | error("%s", o->obuf.buf); | |
139 | strbuf_reset(&o->obuf); | |
140 | } | |
bc9204d4 JS |
141 | |
142 | return -1; | |
143 | } | |
144 | ||
85e51b78 JH |
145 | static struct tree *shift_tree_object(struct tree *one, struct tree *two, |
146 | const char *subtree_shift) | |
9047ebbc | 147 | { |
f2fd0760 | 148 | struct object_id shifted; |
9047ebbc | 149 | |
85e51b78 | 150 | if (!*subtree_shift) { |
82db3d44 | 151 | shift_tree(&one->object.oid, &two->object.oid, &shifted, 0); |
85e51b78 | 152 | } else { |
82db3d44 | 153 | shift_tree_by(&one->object.oid, &two->object.oid, &shifted, |
85e51b78 JH |
154 | subtree_shift); |
155 | } | |
f2fd0760 | 156 | if (!oidcmp(&two->object.oid, &shifted)) |
9047ebbc | 157 | return two; |
740ee055 | 158 | return lookup_tree(&shifted); |
9047ebbc MV |
159 | } |
160 | ||
2af202be | 161 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) |
9047ebbc | 162 | { |
10322a0a | 163 | struct commit *commit = alloc_commit_node(); |
ae8e4c9c | 164 | |
a2571653 | 165 | set_merge_remote_desc(commit, comment, (struct object *)commit); |
891435d5 | 166 | commit->maybe_tree = tree; |
9047ebbc MV |
167 | commit->object.parsed = 1; |
168 | return commit; | |
169 | } | |
170 | ||
171 | /* | |
172 | * Since we use get_tree_entry(), which does not put the read object into | |
173 | * the object pool, we cannot rely on a == b. | |
174 | */ | |
b4da9d62 | 175 | static int oid_eq(const struct object_id *a, const struct object_id *b) |
9047ebbc MV |
176 | { |
177 | if (!a && !b) | |
178 | return 2; | |
b4da9d62 | 179 | return a && b && oidcmp(a, b) == 0; |
9047ebbc MV |
180 | } |
181 | ||
25c39363 EN |
182 | enum rename_type { |
183 | RENAME_NORMAL = 0, | |
9c0743fe | 184 | RENAME_DIR, |
25c39363 | 185 | RENAME_DELETE, |
4f66dade | 186 | RENAME_ONE_FILE_TO_ONE, |
461f5041 EN |
187 | RENAME_ONE_FILE_TO_TWO, |
188 | RENAME_TWO_FILES_TO_ONE | |
25c39363 EN |
189 | }; |
190 | ||
4f66dade | 191 | struct rename_conflict_info { |
25c39363 EN |
192 | enum rename_type rename_type; |
193 | struct diff_filepair *pair1; | |
194 | struct diff_filepair *pair2; | |
195 | const char *branch1; | |
196 | const char *branch2; | |
197 | struct stage_data *dst_entry1; | |
198 | struct stage_data *dst_entry2; | |
232c635f EN |
199 | struct diff_filespec ren1_other; |
200 | struct diff_filespec ren2_other; | |
25c39363 EN |
201 | }; |
202 | ||
9047ebbc MV |
203 | /* |
204 | * Since we want to write the index eventually, we cannot reuse the index | |
205 | * for these (temporary) data. | |
206 | */ | |
9cba13ca JN |
207 | struct stage_data { |
208 | struct { | |
9047ebbc | 209 | unsigned mode; |
fd429e98 | 210 | struct object_id oid; |
9047ebbc | 211 | } stages[4]; |
4f66dade | 212 | struct rename_conflict_info *rename_conflict_info; |
9047ebbc MV |
213 | unsigned processed:1; |
214 | }; | |
215 | ||
4f66dade EN |
216 | static inline void setup_rename_conflict_info(enum rename_type rename_type, |
217 | struct diff_filepair *pair1, | |
218 | struct diff_filepair *pair2, | |
219 | const char *branch1, | |
220 | const char *branch2, | |
221 | struct stage_data *dst_entry1, | |
232c635f EN |
222 | struct stage_data *dst_entry2, |
223 | struct merge_options *o, | |
224 | struct stage_data *src_entry1, | |
225 | struct stage_data *src_entry2) | |
25c39363 | 226 | { |
4f66dade | 227 | struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info)); |
25c39363 EN |
228 | ci->rename_type = rename_type; |
229 | ci->pair1 = pair1; | |
230 | ci->branch1 = branch1; | |
231 | ci->branch2 = branch2; | |
232 | ||
233 | ci->dst_entry1 = dst_entry1; | |
4f66dade | 234 | dst_entry1->rename_conflict_info = ci; |
25c39363 EN |
235 | dst_entry1->processed = 0; |
236 | ||
237 | assert(!pair2 == !dst_entry2); | |
238 | if (dst_entry2) { | |
239 | ci->dst_entry2 = dst_entry2; | |
240 | ci->pair2 = pair2; | |
4f66dade | 241 | dst_entry2->rename_conflict_info = ci; |
25c39363 | 242 | } |
232c635f EN |
243 | |
244 | if (rename_type == RENAME_TWO_FILES_TO_ONE) { | |
245 | /* | |
246 | * For each rename, there could have been | |
247 | * modifications on the side of history where that | |
248 | * file was not renamed. | |
249 | */ | |
250 | int ostage1 = o->branch1 == branch1 ? 3 : 2; | |
251 | int ostage2 = ostage1 ^ 1; | |
252 | ||
253 | ci->ren1_other.path = pair1->one->path; | |
fd429e98 | 254 | oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid); |
232c635f EN |
255 | ci->ren1_other.mode = src_entry1->stages[ostage1].mode; |
256 | ||
257 | ci->ren2_other.path = pair2->one->path; | |
fd429e98 | 258 | oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid); |
232c635f | 259 | ci->ren2_other.mode = src_entry2->stages[ostage2].mode; |
25c39363 EN |
260 | } |
261 | } | |
262 | ||
8a2fce18 | 263 | static int show(struct merge_options *o, int v) |
9047ebbc | 264 | { |
5033639c | 265 | return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5; |
9047ebbc MV |
266 | } |
267 | ||
28bea9e5 | 268 | __attribute__((format (printf, 3, 4))) |
8a2fce18 | 269 | static void output(struct merge_options *o, int v, const char *fmt, ...) |
9047ebbc | 270 | { |
9047ebbc MV |
271 | va_list ap; |
272 | ||
8a2fce18 | 273 | if (!show(o, v)) |
9047ebbc MV |
274 | return; |
275 | ||
415792ed | 276 | strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); |
9047ebbc MV |
277 | |
278 | va_start(ap, fmt); | |
ebeb6090 | 279 | strbuf_vaddf(&o->obuf, fmt, ap); |
9047ebbc MV |
280 | va_end(ap); |
281 | ||
294b2680 | 282 | strbuf_addch(&o->obuf, '\n'); |
8a2fce18 | 283 | if (!o->buffer_output) |
c7d84924 | 284 | flush_output(o); |
9047ebbc MV |
285 | } |
286 | ||
5033639c | 287 | static void output_commit_title(struct merge_options *o, struct commit *commit) |
9047ebbc | 288 | { |
dde75cb0 | 289 | strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); |
9047ebbc | 290 | if (commit->util) |
dde75cb0 JS |
291 | strbuf_addf(&o->obuf, "virtual %s\n", |
292 | merge_remote_util(commit)->name); | |
9047ebbc | 293 | else { |
30e677e0 | 294 | strbuf_add_unique_abbrev(&o->obuf, &commit->object.oid, |
a94bb683 RS |
295 | DEFAULT_ABBREV); |
296 | strbuf_addch(&o->obuf, ' '); | |
9047ebbc | 297 | if (parse_commit(commit) != 0) |
a22ae753 | 298 | strbuf_addstr(&o->obuf, _("(bad commit)\n")); |
9047ebbc | 299 | else { |
49b7120e | 300 | const char *title; |
8597ea3a | 301 | const char *msg = get_commit_buffer(commit, NULL); |
bc6b8fc1 | 302 | int len = find_commit_subject(msg, &title); |
49b7120e | 303 | if (len) |
dde75cb0 | 304 | strbuf_addf(&o->obuf, "%.*s\n", len, title); |
bc6b8fc1 | 305 | unuse_commit_buffer(commit, msg); |
9047ebbc MV |
306 | } |
307 | } | |
dde75cb0 | 308 | flush_output(o); |
9047ebbc MV |
309 | } |
310 | ||
bc9204d4 JS |
311 | static int add_cacheinfo(struct merge_options *o, |
312 | unsigned int mode, const struct object_id *oid, | |
9047ebbc MV |
313 | const char *path, int stage, int refresh, int options) |
314 | { | |
315 | struct cache_entry *ce; | |
1335d76e JH |
316 | int ret; |
317 | ||
21bed620 | 318 | ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0); |
9047ebbc | 319 | if (!ce) |
fd53b7ff | 320 | return err(o, _("add_cacheinfo failed for path '%s'; merge aborting."), path); |
1335d76e JH |
321 | |
322 | ret = add_cache_entry(ce, options); | |
323 | if (refresh) { | |
324 | struct cache_entry *nce; | |
325 | ||
326 | nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); | |
55e9f0e5 | 327 | if (!nce) |
fd53b7ff | 328 | return err(o, _("add_cacheinfo failed to refresh for path '%s'; merge aborting."), path); |
1335d76e JH |
329 | if (nce != ce) |
330 | ret = add_cache_entry(nce, options); | |
331 | } | |
332 | return ret; | |
9047ebbc MV |
333 | } |
334 | ||
9047ebbc MV |
335 | static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) |
336 | { | |
337 | parse_tree(tree); | |
338 | init_tree_desc(desc, tree->buffer, tree->size); | |
339 | } | |
340 | ||
3f1c1c36 EN |
341 | static int unpack_trees_start(struct merge_options *o, |
342 | struct tree *common, | |
343 | struct tree *head, | |
344 | struct tree *merge) | |
9047ebbc MV |
345 | { |
346 | int rc; | |
347 | struct tree_desc t[3]; | |
a35edc84 | 348 | struct index_state tmp_index = { NULL }; |
9047ebbc | 349 | |
64b1abe9 EN |
350 | memset(&o->unpack_opts, 0, sizeof(o->unpack_opts)); |
351 | if (o->call_depth) | |
352 | o->unpack_opts.index_only = 1; | |
9047ebbc | 353 | else |
64b1abe9 EN |
354 | o->unpack_opts.update = 1; |
355 | o->unpack_opts.merge = 1; | |
356 | o->unpack_opts.head_idx = 2; | |
357 | o->unpack_opts.fn = threeway_merge; | |
358 | o->unpack_opts.src_index = &the_index; | |
a35edc84 | 359 | o->unpack_opts.dst_index = &tmp_index; |
6f10a09e | 360 | o->unpack_opts.aggressive = !merge_detect_rename(o); |
64b1abe9 | 361 | setup_unpack_trees_porcelain(&o->unpack_opts, "merge"); |
9047ebbc MV |
362 | |
363 | init_tree_desc_from_tree(t+0, common); | |
364 | init_tree_desc_from_tree(t+1, head); | |
365 | init_tree_desc_from_tree(t+2, merge); | |
366 | ||
64b1abe9 | 367 | rc = unpack_trees(3, t, &o->unpack_opts); |
9047ebbc | 368 | cache_tree_free(&active_cache_tree); |
a35edc84 | 369 | |
64b1abe9 | 370 | /* |
a35edc84 EN |
371 | * Update the_index to match the new results, AFTER saving a copy |
372 | * in o->orig_index. Update src_index to point to the saved copy. | |
373 | * (verify_uptodate() checks src_index, and the original index is | |
374 | * the one that had the necessary modification timestamps.) | |
64b1abe9 | 375 | */ |
a35edc84 EN |
376 | o->orig_index = the_index; |
377 | the_index = tmp_index; | |
378 | o->unpack_opts.src_index = &o->orig_index; | |
379 | ||
9047ebbc MV |
380 | return rc; |
381 | } | |
382 | ||
3f1c1c36 EN |
383 | static void unpack_trees_finish(struct merge_options *o) |
384 | { | |
385 | discard_index(&o->orig_index); | |
1c41d280 | 386 | clear_unpack_trees_porcelain(&o->unpack_opts); |
3f1c1c36 EN |
387 | } |
388 | ||
8a2fce18 | 389 | struct tree *write_tree_from_memory(struct merge_options *o) |
9047ebbc MV |
390 | { |
391 | struct tree *result = NULL; | |
392 | ||
393 | if (unmerged_cache()) { | |
394 | int i; | |
19c6a4f8 | 395 | fprintf(stderr, "BUG: There are unmerged index entries:\n"); |
9047ebbc | 396 | for (i = 0; i < active_nr; i++) { |
9c5e6c80 | 397 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc | 398 | if (ce_stage(ce)) |
c43ba42e | 399 | fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), |
19c6a4f8 | 400 | (int)ce_namelen(ce), ce->name); |
9047ebbc | 401 | } |
033abf97 | 402 | BUG("unmerged index entries in merge-recursive.c"); |
9047ebbc MV |
403 | } |
404 | ||
405 | if (!active_cache_tree) | |
406 | active_cache_tree = cache_tree(); | |
407 | ||
408 | if (!cache_tree_fully_valid(active_cache_tree) && | |
6003303a | 409 | cache_tree_update(&the_index, 0) < 0) { |
bc9204d4 | 410 | err(o, _("error building trees")); |
6003303a JS |
411 | return NULL; |
412 | } | |
9047ebbc | 413 | |
740ee055 | 414 | result = lookup_tree(&active_cache_tree->oid); |
9047ebbc MV |
415 | |
416 | return result; | |
417 | } | |
418 | ||
df46d77e | 419 | static int save_files_dirs(const struct object_id *oid, |
6a0b0b6d | 420 | struct strbuf *base, const char *path, |
9047ebbc MV |
421 | unsigned int mode, int stage, void *context) |
422 | { | |
fc65b00d | 423 | struct path_hashmap_entry *entry; |
6a0b0b6d | 424 | int baselen = base->len; |
696ee23c MV |
425 | struct merge_options *o = context; |
426 | ||
6a0b0b6d | 427 | strbuf_addstr(base, path); |
9047ebbc | 428 | |
fc65b00d KW |
429 | FLEX_ALLOC_MEM(entry, path, base->buf, base->len); |
430 | hashmap_entry_init(entry, path_hash(entry->path)); | |
431 | hashmap_add(&o->current_file_dir_set, entry); | |
9047ebbc | 432 | |
6a0b0b6d | 433 | strbuf_setlen(base, baselen); |
d3bee161 | 434 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
9047ebbc MV |
435 | } |
436 | ||
ef9c4dc3 | 437 | static void get_files_dirs(struct merge_options *o, struct tree *tree) |
9047ebbc | 438 | { |
f0096c06 | 439 | struct pathspec match_all; |
9a087274 | 440 | memset(&match_all, 0, sizeof(match_all)); |
ef9c4dc3 | 441 | read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o); |
9047ebbc MV |
442 | } |
443 | ||
5b047ac0 EN |
444 | static int get_tree_entry_if_blob(const struct object_id *tree, |
445 | const char *path, | |
446 | struct object_id *hashy, | |
447 | unsigned int *mode_o) | |
448 | { | |
449 | int ret; | |
450 | ||
451 | ret = get_tree_entry(tree, path, hashy, mode_o); | |
452 | if (S_ISDIR(*mode_o)) { | |
453 | oidcpy(hashy, &null_oid); | |
454 | *mode_o = 0; | |
455 | } | |
456 | return ret; | |
457 | } | |
458 | ||
9047ebbc MV |
459 | /* |
460 | * Returns an index_entry instance which doesn't have to correspond to | |
461 | * a real cache entry in Git's index. | |
462 | */ | |
463 | static struct stage_data *insert_stage_data(const char *path, | |
464 | struct tree *o, struct tree *a, struct tree *b, | |
465 | struct string_list *entries) | |
466 | { | |
467 | struct string_list_item *item; | |
468 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); | |
5b047ac0 EN |
469 | get_tree_entry_if_blob(&o->object.oid, path, |
470 | &e->stages[1].oid, &e->stages[1].mode); | |
471 | get_tree_entry_if_blob(&a->object.oid, path, | |
472 | &e->stages[2].oid, &e->stages[2].mode); | |
473 | get_tree_entry_if_blob(&b->object.oid, path, | |
474 | &e->stages[3].oid, &e->stages[3].mode); | |
78a395d3 | 475 | item = string_list_insert(entries, path); |
9047ebbc MV |
476 | item->util = e; |
477 | return e; | |
478 | } | |
479 | ||
480 | /* | |
481 | * Create a dictionary mapping file names to stage_data objects. The | |
482 | * dictionary contains one entry for every path with a non-zero stage entry. | |
483 | */ | |
484 | static struct string_list *get_unmerged(void) | |
485 | { | |
486 | struct string_list *unmerged = xcalloc(1, sizeof(struct string_list)); | |
487 | int i; | |
488 | ||
489 | unmerged->strdup_strings = 1; | |
490 | ||
491 | for (i = 0; i < active_nr; i++) { | |
492 | struct string_list_item *item; | |
493 | struct stage_data *e; | |
9c5e6c80 | 494 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc MV |
495 | if (!ce_stage(ce)) |
496 | continue; | |
497 | ||
e8c8b713 | 498 | item = string_list_lookup(unmerged, ce->name); |
9047ebbc | 499 | if (!item) { |
78a395d3 | 500 | item = string_list_insert(unmerged, ce->name); |
9047ebbc MV |
501 | item->util = xcalloc(1, sizeof(struct stage_data)); |
502 | } | |
503 | e = item->util; | |
504 | e->stages[ce_stage(ce)].mode = ce->ce_mode; | |
99d1a986 | 505 | oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid); |
9047ebbc MV |
506 | } |
507 | ||
508 | return unmerged; | |
509 | } | |
510 | ||
fa6ca111 | 511 | static int string_list_df_name_compare(const char *one, const char *two) |
ef02b317 | 512 | { |
fa6ca111 NTND |
513 | int onelen = strlen(one); |
514 | int twolen = strlen(two); | |
f0fd4d05 EN |
515 | /* |
516 | * Here we only care that entries for D/F conflicts are | |
517 | * adjacent, in particular with the file of the D/F conflict | |
518 | * appearing before files below the corresponding directory. | |
519 | * The order of the rest of the list is irrelevant for us. | |
ef02b317 | 520 | * |
f0fd4d05 EN |
521 | * To achieve this, we sort with df_name_compare and provide |
522 | * the mode S_IFDIR so that D/F conflicts will sort correctly. | |
523 | * We use the mode S_IFDIR for everything else for simplicity, | |
524 | * since in other cases any changes in their order due to | |
525 | * sorting cause no problems for us. | |
526 | */ | |
fa6ca111 NTND |
527 | int cmp = df_name_compare(one, onelen, S_IFDIR, |
528 | two, twolen, S_IFDIR); | |
f0fd4d05 EN |
529 | /* |
530 | * Now that 'foo' and 'foo/bar' compare equal, we have to make sure | |
531 | * that 'foo' comes before 'foo/bar'. | |
ef02b317 | 532 | */ |
f0fd4d05 EN |
533 | if (cmp) |
534 | return cmp; | |
535 | return onelen - twolen; | |
536 | } | |
537 | ||
70cc3d36 EN |
538 | static void record_df_conflict_files(struct merge_options *o, |
539 | struct string_list *entries) | |
ef02b317 | 540 | { |
70cc3d36 | 541 | /* If there is a D/F conflict and the file for such a conflict |
f7d650c0 | 542 | * currently exist in the working tree, we want to allow it to be |
edd2faf5 EN |
543 | * removed to make room for the corresponding directory if needed. |
544 | * The files underneath the directories of such D/F conflicts will | |
545 | * be processed before the corresponding file involved in the D/F | |
546 | * conflict. If the D/F directory ends up being removed by the | |
547 | * merge, then we won't have to touch the D/F file. If the D/F | |
548 | * directory needs to be written to the working copy, then the D/F | |
549 | * file will simply be removed (in make_room_for_path()) to make | |
550 | * room for the necessary paths. Note that if both the directory | |
551 | * and the file need to be present, then the D/F file will be | |
552 | * reinstated with a new unique name at the time it is processed. | |
ef02b317 | 553 | */ |
af4941d4 | 554 | struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP; |
ef02b317 | 555 | const char *last_file = NULL; |
c8516500 | 556 | int last_len = 0; |
ef02b317 EN |
557 | int i; |
558 | ||
0b30e812 EN |
559 | /* |
560 | * If we're merging merge-bases, we don't want to bother with | |
561 | * any working directory changes. | |
562 | */ | |
563 | if (o->call_depth) | |
564 | return; | |
565 | ||
f0fd4d05 | 566 | /* Ensure D/F conflicts are adjacent in the entries list. */ |
ef02b317 | 567 | for (i = 0; i < entries->nr; i++) { |
f701aae0 EN |
568 | struct string_list_item *next = &entries->items[i]; |
569 | string_list_append(&df_sorted_entries, next->string)->util = | |
570 | next->util; | |
571 | } | |
fa6ca111 NTND |
572 | df_sorted_entries.cmp = string_list_df_name_compare; |
573 | string_list_sort(&df_sorted_entries); | |
f0fd4d05 | 574 | |
70cc3d36 | 575 | string_list_clear(&o->df_conflict_file_set, 1); |
f701aae0 EN |
576 | for (i = 0; i < df_sorted_entries.nr; i++) { |
577 | const char *path = df_sorted_entries.items[i].string; | |
ef02b317 | 578 | int len = strlen(path); |
f701aae0 | 579 | struct stage_data *e = df_sorted_entries.items[i].util; |
ef02b317 EN |
580 | |
581 | /* | |
582 | * Check if last_file & path correspond to a D/F conflict; | |
583 | * i.e. whether path is last_file+'/'+<something>. | |
70cc3d36 EN |
584 | * If so, record that it's okay to remove last_file to make |
585 | * room for path and friends if needed. | |
ef02b317 EN |
586 | */ |
587 | if (last_file && | |
588 | len > last_len && | |
589 | memcmp(path, last_file, last_len) == 0 && | |
590 | path[last_len] == '/') { | |
70cc3d36 | 591 | string_list_insert(&o->df_conflict_file_set, last_file); |
ef02b317 EN |
592 | } |
593 | ||
594 | /* | |
595 | * Determine whether path could exist as a file in the | |
596 | * working directory as a possible D/F conflict. This | |
597 | * will only occur when it exists in stage 2 as a | |
598 | * file. | |
599 | */ | |
600 | if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) { | |
601 | last_file = path; | |
602 | last_len = len; | |
ef02b317 EN |
603 | } else { |
604 | last_file = NULL; | |
605 | } | |
606 | } | |
f701aae0 | 607 | string_list_clear(&df_sorted_entries, 0); |
ef02b317 EN |
608 | } |
609 | ||
9cba13ca | 610 | struct rename { |
9047ebbc | 611 | struct diff_filepair *pair; |
379fc378 EN |
612 | /* |
613 | * Purpose of src_entry and dst_entry: | |
614 | * | |
615 | * If 'before' is renamed to 'after' then src_entry will contain | |
616 | * the versions of 'before' from the merge_base, HEAD, and MERGE in | |
617 | * stages 1, 2, and 3; dst_entry will contain the respective | |
618 | * versions of 'after' in corresponding locations. Thus, we have a | |
619 | * total of six modes and oids, though some will be null. (Stage 0 | |
620 | * is ignored; we're interested in handling conflicts.) | |
621 | * | |
622 | * Since we don't turn on break-rewrites by default, neither | |
623 | * src_entry nor dst_entry can have all three of their stages have | |
624 | * non-null oids, meaning at most four of the six will be non-null. | |
625 | * Also, since this is a rename, both src_entry and dst_entry will | |
626 | * have at least one non-null oid, meaning at least two will be | |
627 | * non-null. Of the six oids, a typical rename will have three be | |
628 | * non-null. Only two implies a rename/delete, and four implies a | |
629 | * rename/add. | |
630 | */ | |
9047ebbc MV |
631 | struct stage_data *src_entry; |
632 | struct stage_data *dst_entry; | |
9c0743fe | 633 | unsigned add_turned_into_rename:1; |
9047ebbc MV |
634 | unsigned processed:1; |
635 | }; | |
636 | ||
bc9204d4 JS |
637 | static int update_stages(struct merge_options *opt, const char *path, |
638 | const struct diff_filespec *o, | |
650467cf EN |
639 | const struct diff_filespec *a, |
640 | const struct diff_filespec *b) | |
9047ebbc | 641 | { |
f53d3977 EN |
642 | |
643 | /* | |
644 | * NOTE: It is usually a bad idea to call update_stages on a path | |
645 | * before calling update_file on that same path, since it can | |
646 | * sometimes lead to spurious "refusing to lose untracked file..." | |
647 | * messages from update_file (via make_room_for path via | |
648 | * would_lose_untracked). Instead, reverse the order of the calls | |
649 | * (executing update_file first and then update_stages). | |
650 | */ | |
650467cf EN |
651 | int clear = 1; |
652 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK; | |
9047ebbc MV |
653 | if (clear) |
654 | if (remove_file_from_cache(path)) | |
655 | return -1; | |
656 | if (o) | |
bc9204d4 | 657 | if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options)) |
9047ebbc MV |
658 | return -1; |
659 | if (a) | |
bc9204d4 | 660 | if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options)) |
9047ebbc MV |
661 | return -1; |
662 | if (b) | |
bc9204d4 | 663 | if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options)) |
9047ebbc MV |
664 | return -1; |
665 | return 0; | |
666 | } | |
667 | ||
9c0743fe EN |
668 | static int update_stages_for_stage_data(struct merge_options *opt, |
669 | const char *path, | |
670 | const struct stage_data *stage_data) | |
671 | { | |
672 | struct diff_filespec o, a, b; | |
673 | ||
674 | o.mode = stage_data->stages[1].mode; | |
675 | oidcpy(&o.oid, &stage_data->stages[1].oid); | |
676 | ||
677 | a.mode = stage_data->stages[2].mode; | |
678 | oidcpy(&a.oid, &stage_data->stages[2].oid); | |
679 | ||
680 | b.mode = stage_data->stages[3].mode; | |
681 | oidcpy(&b.oid, &stage_data->stages[3].oid); | |
682 | ||
683 | return update_stages(opt, path, | |
684 | is_null_oid(&o.oid) ? NULL : &o, | |
685 | is_null_oid(&a.oid) ? NULL : &a, | |
686 | is_null_oid(&b.oid) ? NULL : &b); | |
687 | } | |
688 | ||
b8ddf164 EN |
689 | static void update_entry(struct stage_data *entry, |
690 | struct diff_filespec *o, | |
691 | struct diff_filespec *a, | |
692 | struct diff_filespec *b) | |
2ff739f9 | 693 | { |
2ff739f9 EN |
694 | entry->processed = 0; |
695 | entry->stages[1].mode = o->mode; | |
696 | entry->stages[2].mode = a->mode; | |
697 | entry->stages[3].mode = b->mode; | |
fd429e98 | 698 | oidcpy(&entry->stages[1].oid, &o->oid); |
699 | oidcpy(&entry->stages[2].oid, &a->oid); | |
700 | oidcpy(&entry->stages[3].oid, &b->oid); | |
2ff739f9 EN |
701 | } |
702 | ||
b7fa51da MV |
703 | static int remove_file(struct merge_options *o, int clean, |
704 | const char *path, int no_wd) | |
9047ebbc | 705 | { |
b7fa51da MV |
706 | int update_cache = o->call_depth || clean; |
707 | int update_working_directory = !o->call_depth && !no_wd; | |
9047ebbc MV |
708 | |
709 | if (update_cache) { | |
710 | if (remove_file_from_cache(path)) | |
711 | return -1; | |
712 | } | |
713 | if (update_working_directory) { | |
ae352c7f DT |
714 | if (ignore_case) { |
715 | struct cache_entry *ce; | |
716 | ce = cache_file_exists(path, strlen(path), ignore_case); | |
4cba2b01 | 717 | if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name)) |
ae352c7f DT |
718 | return 0; |
719 | } | |
25755e84 | 720 | if (remove_path(path)) |
9047ebbc | 721 | return -1; |
9047ebbc MV |
722 | } |
723 | return 0; | |
724 | } | |
725 | ||
45bc131d JK |
726 | /* add a string to a strbuf, but converting "/" to "_" */ |
727 | static void add_flattened_path(struct strbuf *out, const char *s) | |
728 | { | |
729 | size_t i = out->len; | |
730 | strbuf_addstr(out, s); | |
731 | for (; i < out->len; i++) | |
732 | if (out->buf[i] == '/') | |
733 | out->buf[i] = '_'; | |
734 | } | |
735 | ||
696ee23c | 736 | static char *unique_path(struct merge_options *o, const char *path, const char *branch) |
9047ebbc | 737 | { |
fc65b00d | 738 | struct path_hashmap_entry *entry; |
45bc131d | 739 | struct strbuf newpath = STRBUF_INIT; |
9047ebbc | 740 | int suffix = 0; |
45bc131d JK |
741 | size_t base_len; |
742 | ||
743 | strbuf_addf(&newpath, "%s~", path); | |
744 | add_flattened_path(&newpath, branch); | |
745 | ||
746 | base_len = newpath.len; | |
fc65b00d KW |
747 | while (hashmap_get_from_hash(&o->current_file_dir_set, |
748 | path_hash(newpath.buf), newpath.buf) || | |
8e1b62f1 | 749 | (!o->call_depth && file_exists(newpath.buf))) { |
45bc131d JK |
750 | strbuf_setlen(&newpath, base_len); |
751 | strbuf_addf(&newpath, "_%d", suffix++); | |
752 | } | |
753 | ||
fc65b00d KW |
754 | FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len); |
755 | hashmap_entry_init(entry, path_hash(entry->path)); | |
756 | hashmap_add(&o->current_file_dir_set, entry); | |
45bc131d | 757 | return strbuf_detach(&newpath, NULL); |
9047ebbc MV |
758 | } |
759 | ||
5423d2e7 DT |
760 | /** |
761 | * Check whether a directory in the index is in the way of an incoming | |
762 | * file. Return 1 if so. If check_working_copy is non-zero, also | |
763 | * check the working directory. If empty_ok is non-zero, also return | |
764 | * 0 in the case where the working-tree dir exists but is empty. | |
765 | */ | |
766 | static int dir_in_way(const char *path, int check_working_copy, int empty_ok) | |
f2507b4e | 767 | { |
b4600fbe JK |
768 | int pos; |
769 | struct strbuf dirpath = STRBUF_INIT; | |
f2507b4e EN |
770 | struct stat st; |
771 | ||
b4600fbe JK |
772 | strbuf_addstr(&dirpath, path); |
773 | strbuf_addch(&dirpath, '/'); | |
f2507b4e | 774 | |
b4600fbe | 775 | pos = cache_name_pos(dirpath.buf, dirpath.len); |
f2507b4e EN |
776 | |
777 | if (pos < 0) | |
778 | pos = -1 - pos; | |
779 | if (pos < active_nr && | |
b4600fbe JK |
780 | !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) { |
781 | strbuf_release(&dirpath); | |
f2507b4e EN |
782 | return 1; |
783 | } | |
784 | ||
b4600fbe | 785 | strbuf_release(&dirpath); |
5423d2e7 DT |
786 | return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) && |
787 | !(empty_ok && is_empty_dir(path)); | |
f2507b4e EN |
788 | } |
789 | ||
1de70dbd EN |
790 | /* |
791 | * Returns whether path was tracked in the index before the merge started, | |
792 | * and its oid and mode match the specified values | |
793 | */ | |
794 | static int was_tracked_and_matches(struct merge_options *o, const char *path, | |
795 | const struct object_id *oid, unsigned mode) | |
60c91181 | 796 | { |
1de70dbd EN |
797 | int pos = index_name_pos(&o->orig_index, path, strlen(path)); |
798 | struct cache_entry *ce; | |
799 | ||
800 | if (0 > pos) | |
801 | /* we were not tracking this path before the merge */ | |
802 | return 0; | |
803 | ||
804 | /* See if the file we were tracking before matches */ | |
805 | ce = o->orig_index.cache[pos]; | |
806 | return (oid_eq(&ce->oid, oid) && ce->ce_mode == mode); | |
807 | } | |
808 | ||
a35edc84 EN |
809 | /* |
810 | * Returns whether path was tracked in the index before the merge started | |
811 | */ | |
812 | static int was_tracked(struct merge_options *o, const char *path) | |
60c91181 | 813 | { |
a35edc84 | 814 | int pos = index_name_pos(&o->orig_index, path, strlen(path)); |
60c91181 | 815 | |
f8d83fb6 | 816 | if (0 <= pos) |
a35edc84 | 817 | /* we were tracking this path before the merge */ |
f8d83fb6 JS |
818 | return 1; |
819 | ||
aacb82de | 820 | return 0; |
60c91181 JH |
821 | } |
822 | ||
aacb82de | 823 | static int would_lose_untracked(const char *path) |
9047ebbc | 824 | { |
a35edc84 EN |
825 | /* |
826 | * This may look like it can be simplified to: | |
827 | * return !was_tracked(o, path) && file_exists(path) | |
828 | * but it can't. This function needs to know whether path was in | |
829 | * the working tree due to EITHER having been tracked in the index | |
830 | * before the merge OR having been put into the working copy and | |
831 | * index by unpack_trees(). Due to that either-or requirement, we | |
832 | * check the current index instead of the original one. | |
833 | * | |
834 | * Note that we do not need to worry about merge-recursive itself | |
835 | * updating the index after unpack_trees() and before calling this | |
836 | * function, because we strictly require all code paths in | |
837 | * merge-recursive to update the working tree first and the index | |
838 | * second. Doing otherwise would break | |
839 | * update_file()/would_lose_untracked(); see every comment in this | |
840 | * file which mentions "update_stages". | |
841 | */ | |
842 | int pos = cache_name_pos(path, strlen(path)); | |
843 | ||
844 | if (pos < 0) | |
845 | pos = -1 - pos; | |
846 | while (pos < active_nr && | |
847 | !strcmp(path, active_cache[pos]->name)) { | |
848 | /* | |
849 | * If stage #0, it is definitely tracked. | |
850 | * If it has stage #2 then it was tracked | |
851 | * before this merge started. All other | |
852 | * cases the path was not tracked. | |
853 | */ | |
854 | switch (ce_stage(active_cache[pos])) { | |
855 | case 0: | |
856 | case 2: | |
857 | return 0; | |
858 | } | |
859 | pos++; | |
860 | } | |
861 | return file_exists(path); | |
60c91181 JH |
862 | } |
863 | ||
64b1abe9 EN |
864 | static int was_dirty(struct merge_options *o, const char *path) |
865 | { | |
866 | struct cache_entry *ce; | |
867 | int dirty = 1; | |
868 | ||
a35edc84 | 869 | if (o->call_depth || !was_tracked(o, path)) |
64b1abe9 EN |
870 | return !dirty; |
871 | ||
277292d5 EN |
872 | ce = index_file_exists(o->unpack_opts.src_index, |
873 | path, strlen(path), ignore_case); | |
874 | dirty = verify_uptodate(ce, &o->unpack_opts) != 0; | |
64b1abe9 | 875 | return dirty; |
60c91181 JH |
876 | } |
877 | ||
ed0148a5 | 878 | static int make_room_for_path(struct merge_options *o, const char *path) |
9047ebbc | 879 | { |
ed0148a5 | 880 | int status, i; |
55653a68 | 881 | const char *msg = _("failed to create path '%s'%s"); |
9047ebbc | 882 | |
ed0148a5 EN |
883 | /* Unlink any D/F conflict files that are in the way */ |
884 | for (i = 0; i < o->df_conflict_file_set.nr; i++) { | |
885 | const char *df_path = o->df_conflict_file_set.items[i].string; | |
886 | size_t pathlen = strlen(path); | |
887 | size_t df_pathlen = strlen(df_path); | |
888 | if (df_pathlen < pathlen && | |
889 | path[df_pathlen] == '/' && | |
890 | strncmp(path, df_path, df_pathlen) == 0) { | |
891 | output(o, 3, | |
55653a68 | 892 | _("Removing %s to make room for subdirectory\n"), |
ed0148a5 EN |
893 | df_path); |
894 | unlink(df_path); | |
895 | unsorted_string_list_delete_item(&o->df_conflict_file_set, | |
896 | i, 0); | |
897 | break; | |
898 | } | |
899 | } | |
900 | ||
901 | /* Make sure leading directories are created */ | |
9047ebbc MV |
902 | status = safe_create_leading_directories_const(path); |
903 | if (status) { | |
6003303a | 904 | if (status == SCLD_EXISTS) |
9047ebbc | 905 | /* something else exists */ |
bc9204d4 JS |
906 | return err(o, msg, path, _(": perhaps a D/F conflict?")); |
907 | return err(o, msg, path, ""); | |
9047ebbc MV |
908 | } |
909 | ||
60c91181 JH |
910 | /* |
911 | * Do not unlink a file in the work tree if we are not | |
912 | * tracking it. | |
913 | */ | |
914 | if (would_lose_untracked(path)) | |
bc9204d4 | 915 | return err(o, _("refusing to lose untracked file at '%s'"), |
60c91181 JH |
916 | path); |
917 | ||
9047ebbc MV |
918 | /* Successful unlink is good.. */ |
919 | if (!unlink(path)) | |
920 | return 0; | |
921 | /* .. and so is no existing file */ | |
922 | if (errno == ENOENT) | |
923 | return 0; | |
924 | /* .. but not some other error (who really cares what?) */ | |
bc9204d4 | 925 | return err(o, msg, path, _(": perhaps a D/F conflict?")); |
9047ebbc MV |
926 | } |
927 | ||
75456f96 JS |
928 | static int update_file_flags(struct merge_options *o, |
929 | const struct object_id *oid, | |
930 | unsigned mode, | |
931 | const char *path, | |
932 | int update_cache, | |
933 | int update_wd) | |
9047ebbc | 934 | { |
6003303a JS |
935 | int ret = 0; |
936 | ||
b7fa51da | 937 | if (o->call_depth) |
9047ebbc MV |
938 | update_wd = 0; |
939 | ||
940 | if (update_wd) { | |
941 | enum object_type type; | |
942 | void *buf; | |
943 | unsigned long size; | |
944 | ||
68d03e4a | 945 | if (S_ISGITLINK(mode)) { |
0c44c943 JH |
946 | /* |
947 | * We may later decide to recursively descend into | |
948 | * the submodule directory and update its index | |
949 | * and/or work tree, but we do not do that now. | |
950 | */ | |
68d03e4a | 951 | update_wd = 0; |
0c44c943 | 952 | goto update_index; |
68d03e4a | 953 | } |
9047ebbc | 954 | |
b4f5aca4 | 955 | buf = read_object_file(oid, &type, &size); |
9047ebbc | 956 | if (!buf) |
bc9204d4 | 957 | return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path); |
6003303a | 958 | if (type != OBJ_BLOB) { |
bc9204d4 | 959 | ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path); |
6003303a JS |
960 | goto free_buf; |
961 | } | |
9047ebbc | 962 | if (S_ISREG(mode)) { |
f285a2d7 | 963 | struct strbuf strbuf = STRBUF_INIT; |
9047ebbc MV |
964 | if (convert_to_working_tree(path, buf, size, &strbuf)) { |
965 | free(buf); | |
966 | size = strbuf.len; | |
967 | buf = strbuf_detach(&strbuf, NULL); | |
968 | } | |
969 | } | |
970 | ||
ed0148a5 | 971 | if (make_room_for_path(o, path) < 0) { |
9047ebbc | 972 | update_wd = 0; |
75456f96 | 973 | goto free_buf; |
9047ebbc MV |
974 | } |
975 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { | |
976 | int fd; | |
977 | if (mode & 0100) | |
978 | mode = 0777; | |
979 | else | |
980 | mode = 0666; | |
981 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); | |
6003303a | 982 | if (fd < 0) { |
bc9204d4 JS |
983 | ret = err(o, _("failed to open '%s': %s"), |
984 | path, strerror(errno)); | |
6003303a JS |
985 | goto free_buf; |
986 | } | |
f633ea2c | 987 | write_in_full(fd, buf, size); |
9047ebbc MV |
988 | close(fd); |
989 | } else if (S_ISLNK(mode)) { | |
990 | char *lnk = xmemdupz(buf, size); | |
991 | safe_create_leading_directories_const(path); | |
992 | unlink(path); | |
304dcf26 | 993 | if (symlink(lnk, path)) |
bc9204d4 JS |
994 | ret = err(o, _("failed to symlink '%s': %s"), |
995 | path, strerror(errno)); | |
9047ebbc MV |
996 | free(lnk); |
997 | } else | |
bc9204d4 JS |
998 | ret = err(o, |
999 | _("do not know what to do with %06o %s '%s'"), | |
1000 | mode, oid_to_hex(oid), path); | |
75456f96 | 1001 | free_buf: |
9047ebbc MV |
1002 | free(buf); |
1003 | } | |
1004 | update_index: | |
6003303a | 1005 | if (!ret && update_cache) |
fd53b7ff EN |
1006 | if (add_cacheinfo(o, mode, oid, path, 0, update_wd, |
1007 | ADD_CACHE_OK_TO_ADD)) | |
1008 | return -1; | |
6003303a | 1009 | return ret; |
9047ebbc MV |
1010 | } |
1011 | ||
75456f96 JS |
1012 | static int update_file(struct merge_options *o, |
1013 | int clean, | |
1014 | const struct object_id *oid, | |
1015 | unsigned mode, | |
1016 | const char *path) | |
9047ebbc | 1017 | { |
75456f96 | 1018 | return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth); |
9047ebbc MV |
1019 | } |
1020 | ||
1021 | /* Low level file merging, update and removal */ | |
1022 | ||
9cba13ca | 1023 | struct merge_file_info { |
9b561499 | 1024 | struct object_id oid; |
9047ebbc MV |
1025 | unsigned mode; |
1026 | unsigned clean:1, | |
1027 | merge:1; | |
1028 | }; | |
1029 | ||
b7fa51da MV |
1030 | static int merge_3way(struct merge_options *o, |
1031 | mmbuffer_t *result_buf, | |
0c059420 EN |
1032 | const struct diff_filespec *one, |
1033 | const struct diff_filespec *a, | |
1034 | const struct diff_filespec *b, | |
9047ebbc MV |
1035 | const char *branch1, |
1036 | const char *branch2) | |
1037 | { | |
1038 | mmfile_t orig, src1, src2; | |
712516bc | 1039 | struct ll_merge_options ll_opts = {0}; |
4c5868f4 | 1040 | char *base_name, *name1, *name2; |
9047ebbc | 1041 | int merge_status; |
8cc5b290 | 1042 | |
712516bc | 1043 | ll_opts.renormalize = o->renormalize; |
58a1ece4 | 1044 | ll_opts.xdl_opts = o->xdl_opts; |
712516bc JN |
1045 | |
1046 | if (o->call_depth) { | |
1047 | ll_opts.virtual_ancestor = 1; | |
1048 | ll_opts.variant = 0; | |
1049 | } else { | |
8cc5b290 AP |
1050 | switch (o->recursive_variant) { |
1051 | case MERGE_RECURSIVE_OURS: | |
712516bc | 1052 | ll_opts.variant = XDL_MERGE_FAVOR_OURS; |
8cc5b290 AP |
1053 | break; |
1054 | case MERGE_RECURSIVE_THEIRS: | |
712516bc | 1055 | ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; |
8cc5b290 AP |
1056 | break; |
1057 | default: | |
712516bc | 1058 | ll_opts.variant = 0; |
8cc5b290 AP |
1059 | break; |
1060 | } | |
1061 | } | |
9047ebbc | 1062 | |
4c5868f4 JN |
1063 | if (strcmp(a->path, b->path) || |
1064 | (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) { | |
1065 | base_name = o->ancestor == NULL ? NULL : | |
4e2d094d RJ |
1066 | mkpathdup("%s:%s", o->ancestor, one->path); |
1067 | name1 = mkpathdup("%s:%s", branch1, a->path); | |
1068 | name2 = mkpathdup("%s:%s", branch2, b->path); | |
606475f3 | 1069 | } else { |
4c5868f4 | 1070 | base_name = o->ancestor == NULL ? NULL : |
4e2d094d RJ |
1071 | mkpathdup("%s", o->ancestor); |
1072 | name1 = mkpathdup("%s", branch1); | |
1073 | name2 = mkpathdup("%s", branch2); | |
606475f3 | 1074 | } |
9047ebbc | 1075 | |
d449347d | 1076 | read_mmblob(&orig, &one->oid); |
1077 | read_mmblob(&src1, &a->oid); | |
1078 | read_mmblob(&src2, &b->oid); | |
9047ebbc | 1079 | |
4c5868f4 | 1080 | merge_status = ll_merge(result_buf, a->path, &orig, base_name, |
712516bc | 1081 | &src1, name1, &src2, name2, &ll_opts); |
9047ebbc | 1082 | |
4e2d094d | 1083 | free(base_name); |
9047ebbc MV |
1084 | free(name1); |
1085 | free(name2); | |
1086 | free(orig.ptr); | |
1087 | free(src1.ptr); | |
1088 | free(src2.ptr); | |
1089 | return merge_status; | |
1090 | } | |
1091 | ||
18cfc088 SB |
1092 | static int find_first_merges(struct object_array *result, const char *path, |
1093 | struct commit *a, struct commit *b) | |
1094 | { | |
1095 | int i, j; | |
1096 | struct object_array merges = OBJECT_ARRAY_INIT; | |
1097 | struct commit *commit; | |
1098 | int contains_another; | |
1099 | ||
1100 | char merged_revision[42]; | |
1101 | const char *rev_args[] = { "rev-list", "--merges", "--ancestry-path", | |
1102 | "--all", merged_revision, NULL }; | |
1103 | struct rev_info revs; | |
1104 | struct setup_revision_opt rev_opts; | |
1105 | ||
1106 | memset(result, 0, sizeof(struct object_array)); | |
1107 | memset(&rev_opts, 0, sizeof(rev_opts)); | |
1108 | ||
1109 | /* get all revisions that merge commit a */ | |
1110 | xsnprintf(merged_revision, sizeof(merged_revision), "^%s", | |
1111 | oid_to_hex(&a->object.oid)); | |
1112 | init_revisions(&revs, NULL); | |
1113 | rev_opts.submodule = path; | |
1114 | /* FIXME: can't handle linked worktrees in submodules yet */ | |
1115 | revs.single_worktree = path != NULL; | |
1116 | setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts); | |
1117 | ||
1118 | /* save all revisions from the above list that contain b */ | |
1119 | if (prepare_revision_walk(&revs)) | |
1120 | die("revision walk setup failed"); | |
1121 | while ((commit = get_revision(&revs)) != NULL) { | |
1122 | struct object *o = &(commit->object); | |
1123 | if (in_merge_bases(b, commit)) | |
1124 | add_object_array(o, NULL, &merges); | |
1125 | } | |
1126 | reset_revision_walk(); | |
1127 | ||
1128 | /* Now we've got all merges that contain a and b. Prune all | |
1129 | * merges that contain another found merge and save them in | |
1130 | * result. | |
1131 | */ | |
1132 | for (i = 0; i < merges.nr; i++) { | |
1133 | struct commit *m1 = (struct commit *) merges.objects[i].item; | |
1134 | ||
1135 | contains_another = 0; | |
1136 | for (j = 0; j < merges.nr; j++) { | |
1137 | struct commit *m2 = (struct commit *) merges.objects[j].item; | |
1138 | if (i != j && in_merge_bases(m2, m1)) { | |
1139 | contains_another = 1; | |
1140 | break; | |
1141 | } | |
1142 | } | |
1143 | ||
1144 | if (!contains_another) | |
1145 | add_object_array(merges.objects[i].item, NULL, result); | |
1146 | } | |
1147 | ||
1148 | object_array_clear(&merges); | |
1149 | return result->nr; | |
1150 | } | |
1151 | ||
1152 | static void print_commit(struct commit *commit) | |
1153 | { | |
1154 | struct strbuf sb = STRBUF_INIT; | |
1155 | struct pretty_print_context ctx = {0}; | |
1156 | ctx.date_mode.type = DATE_NORMAL; | |
1157 | format_commit_message(commit, " %h: %m %s", &sb, &ctx); | |
1158 | fprintf(stderr, "%s\n", sb.buf); | |
1159 | strbuf_release(&sb); | |
1160 | } | |
1161 | ||
325f3a8e SB |
1162 | static int merge_submodule(struct merge_options *o, |
1163 | struct object_id *result, const char *path, | |
18cfc088 | 1164 | const struct object_id *base, const struct object_id *a, |
325f3a8e | 1165 | const struct object_id *b) |
18cfc088 SB |
1166 | { |
1167 | struct commit *commit_base, *commit_a, *commit_b; | |
1168 | int parent_count; | |
1169 | struct object_array merges; | |
1170 | ||
1171 | int i; | |
325f3a8e | 1172 | int search = !o->call_depth; |
18cfc088 SB |
1173 | |
1174 | /* store a in result in case we fail */ | |
1175 | oidcpy(result, a); | |
1176 | ||
1177 | /* we can not handle deletion conflicts */ | |
1178 | if (is_null_oid(base)) | |
1179 | return 0; | |
1180 | if (is_null_oid(a)) | |
1181 | return 0; | |
1182 | if (is_null_oid(b)) | |
1183 | return 0; | |
1184 | ||
1185 | if (add_submodule_odb(path)) { | |
325f3a8e | 1186 | output(o, 1, _("Failed to merge submodule %s (not checked out)"), path); |
18cfc088 SB |
1187 | return 0; |
1188 | } | |
1189 | ||
1190 | if (!(commit_base = lookup_commit_reference(base)) || | |
1191 | !(commit_a = lookup_commit_reference(a)) || | |
1192 | !(commit_b = lookup_commit_reference(b))) { | |
325f3a8e | 1193 | output(o, 1, _("Failed to merge submodule %s (commits not present)"), path); |
18cfc088 SB |
1194 | return 0; |
1195 | } | |
1196 | ||
1197 | /* check whether both changes are forward */ | |
1198 | if (!in_merge_bases(commit_base, commit_a) || | |
1199 | !in_merge_bases(commit_base, commit_b)) { | |
325f3a8e | 1200 | output(o, 1, _("Failed to merge submodule %s (commits don't follow merge-base)"), path); |
18cfc088 SB |
1201 | return 0; |
1202 | } | |
1203 | ||
1204 | /* Case #1: a is contained in b or vice versa */ | |
1205 | if (in_merge_bases(commit_a, commit_b)) { | |
1206 | oidcpy(result, b); | |
76f42125 LM |
1207 | if (show(o, 3)) { |
1208 | output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path); | |
1209 | output_commit_title(o, commit_b); | |
1210 | } else if (show(o, 2)) | |
1211 | output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(b)); | |
1212 | else | |
1213 | ; /* no output */ | |
1214 | ||
18cfc088 SB |
1215 | return 1; |
1216 | } | |
1217 | if (in_merge_bases(commit_b, commit_a)) { | |
1218 | oidcpy(result, a); | |
76f42125 LM |
1219 | if (show(o, 3)) { |
1220 | output(o, 3, _("Fast-forwarding submodule %s to the following commit:"), path); | |
1221 | output_commit_title(o, commit_a); | |
1222 | } else if (show(o, 2)) | |
1223 | output(o, 2, _("Fast-forwarding submodule %s to %s"), path, oid_to_hex(a)); | |
1224 | else | |
1225 | ; /* no output */ | |
1226 | ||
18cfc088 SB |
1227 | return 1; |
1228 | } | |
1229 | ||
1230 | /* | |
1231 | * Case #2: There are one or more merges that contain a and b in | |
1232 | * the submodule. If there is only one, then present it as a | |
1233 | * suggestion to the user, but leave it marked unmerged so the | |
1234 | * user needs to confirm the resolution. | |
1235 | */ | |
1236 | ||
1237 | /* Skip the search if makes no sense to the calling context. */ | |
1238 | if (!search) | |
1239 | return 0; | |
1240 | ||
1241 | /* find commit which merges them */ | |
1242 | parent_count = find_first_merges(&merges, path, commit_a, commit_b); | |
1243 | switch (parent_count) { | |
1244 | case 0: | |
325f3a8e | 1245 | output(o, 1, _("Failed to merge submodule %s (merge following commits not found)"), path); |
18cfc088 SB |
1246 | break; |
1247 | ||
1248 | case 1: | |
325f3a8e SB |
1249 | output(o, 1, _("Failed to merge submodule %s (not fast-forward)"), path); |
1250 | output(o, 2, _("Found a possible merge resolution for the submodule:\n")); | |
18cfc088 | 1251 | print_commit((struct commit *) merges.objects[0].item); |
325f3a8e | 1252 | output(o, 2, _( |
18cfc088 SB |
1253 | "If this is correct simply add it to the index " |
1254 | "for example\n" | |
1255 | "by using:\n\n" | |
1256 | " git update-index --cacheinfo 160000 %s \"%s\"\n\n" | |
325f3a8e | 1257 | "which will accept this suggestion.\n"), |
18cfc088 SB |
1258 | oid_to_hex(&merges.objects[0].item->oid), path); |
1259 | break; | |
1260 | ||
1261 | default: | |
325f3a8e | 1262 | output(o, 1, _("Failed to merge submodule %s (multiple merges found)"), path); |
18cfc088 SB |
1263 | for (i = 0; i < merges.nr; i++) |
1264 | print_commit((struct commit *) merges.objects[i].item); | |
1265 | } | |
1266 | ||
1267 | object_array_clear(&merges); | |
1268 | return 0; | |
1269 | } | |
1270 | ||
3c8a51e8 | 1271 | static int merge_file_1(struct merge_options *o, |
05cf21eb EN |
1272 | const struct diff_filespec *one, |
1273 | const struct diff_filespec *a, | |
1274 | const struct diff_filespec *b, | |
1275 | const char *filename, | |
1276 | const char *branch1, | |
1277 | const char *branch2, | |
1278 | struct merge_file_info *result) | |
9047ebbc | 1279 | { |
3c8a51e8 JS |
1280 | result->merge = 0; |
1281 | result->clean = 1; | |
9047ebbc MV |
1282 | |
1283 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { | |
3c8a51e8 | 1284 | result->clean = 0; |
9047ebbc | 1285 | if (S_ISREG(a->mode)) { |
3c8a51e8 JS |
1286 | result->mode = a->mode; |
1287 | oidcpy(&result->oid, &a->oid); | |
9047ebbc | 1288 | } else { |
3c8a51e8 JS |
1289 | result->mode = b->mode; |
1290 | oidcpy(&result->oid, &b->oid); | |
9047ebbc MV |
1291 | } |
1292 | } else { | |
b4da9d62 | 1293 | if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid)) |
3c8a51e8 | 1294 | result->merge = 1; |
9047ebbc MV |
1295 | |
1296 | /* | |
1297 | * Merge modes | |
1298 | */ | |
b7fa51da | 1299 | if (a->mode == b->mode || a->mode == one->mode) |
3c8a51e8 | 1300 | result->mode = b->mode; |
9047ebbc | 1301 | else { |
3c8a51e8 | 1302 | result->mode = a->mode; |
b7fa51da | 1303 | if (b->mode != one->mode) { |
3c8a51e8 JS |
1304 | result->clean = 0; |
1305 | result->merge = 1; | |
9047ebbc MV |
1306 | } |
1307 | } | |
1308 | ||
b4da9d62 | 1309 | if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid)) |
3c8a51e8 | 1310 | oidcpy(&result->oid, &b->oid); |
b4da9d62 | 1311 | else if (oid_eq(&b->oid, &one->oid)) |
3c8a51e8 | 1312 | oidcpy(&result->oid, &a->oid); |
9047ebbc MV |
1313 | else if (S_ISREG(a->mode)) { |
1314 | mmbuffer_t result_buf; | |
6003303a | 1315 | int ret = 0, merge_status; |
9047ebbc | 1316 | |
b7fa51da | 1317 | merge_status = merge_3way(o, &result_buf, one, a, b, |
9047ebbc MV |
1318 | branch1, branch2); |
1319 | ||
1320 | if ((merge_status < 0) || !result_buf.ptr) | |
bc9204d4 | 1321 | ret = err(o, _("Failed to execute internal merge")); |
9047ebbc | 1322 | |
a09c985e PO |
1323 | if (!ret && |
1324 | write_object_file(result_buf.ptr, result_buf.size, | |
1325 | blob_type, &result->oid)) | |
bc9204d4 JS |
1326 | ret = err(o, _("Unable to add %s to database"), |
1327 | a->path); | |
9047ebbc MV |
1328 | |
1329 | free(result_buf.ptr); | |
6003303a JS |
1330 | if (ret) |
1331 | return ret; | |
3c8a51e8 | 1332 | result->clean = (merge_status == 0); |
9047ebbc | 1333 | } else if (S_ISGITLINK(a->mode)) { |
325f3a8e | 1334 | result->clean = merge_submodule(o, &result->oid, |
a0d12c44 | 1335 | one->path, |
71f35d5c | 1336 | &one->oid, |
1337 | &a->oid, | |
325f3a8e | 1338 | &b->oid); |
9047ebbc | 1339 | } else if (S_ISLNK(a->mode)) { |
fd48b464 JH |
1340 | switch (o->recursive_variant) { |
1341 | case MERGE_RECURSIVE_NORMAL: | |
1342 | oidcpy(&result->oid, &a->oid); | |
1343 | if (!oid_eq(&a->oid, &b->oid)) | |
1344 | result->clean = 0; | |
1345 | break; | |
1346 | case MERGE_RECURSIVE_OURS: | |
1347 | oidcpy(&result->oid, &a->oid); | |
1348 | break; | |
1349 | case MERGE_RECURSIVE_THEIRS: | |
1350 | oidcpy(&result->oid, &b->oid); | |
1351 | break; | |
1352 | } | |
ef1177d1 | 1353 | } else |
033abf97 | 1354 | BUG("unsupported object type in the tree"); |
9047ebbc MV |
1355 | } |
1356 | ||
05cf21eb EN |
1357 | if (result->merge) |
1358 | output(o, 2, _("Auto-merging %s"), filename); | |
1359 | ||
3c8a51e8 | 1360 | return 0; |
9047ebbc MV |
1361 | } |
1362 | ||
3c8a51e8 | 1363 | static int merge_file_special_markers(struct merge_options *o, |
05cf21eb EN |
1364 | const struct diff_filespec *one, |
1365 | const struct diff_filespec *a, | |
1366 | const struct diff_filespec *b, | |
1367 | const char *target_filename, | |
1368 | const char *branch1, | |
1369 | const char *filename1, | |
1370 | const char *branch2, | |
1371 | const char *filename2, | |
1372 | struct merge_file_info *mfi) | |
dac47415 EN |
1373 | { |
1374 | char *side1 = NULL; | |
1375 | char *side2 = NULL; | |
3c8a51e8 | 1376 | int ret; |
dac47415 | 1377 | |
28310186 JK |
1378 | if (filename1) |
1379 | side1 = xstrfmt("%s:%s", branch1, filename1); | |
1380 | if (filename2) | |
1381 | side2 = xstrfmt("%s:%s", branch2, filename2); | |
dac47415 | 1382 | |
05cf21eb | 1383 | ret = merge_file_1(o, one, a, b, target_filename, |
3c8a51e8 JS |
1384 | side1 ? side1 : branch1, |
1385 | side2 ? side2 : branch2, mfi); | |
05cf21eb | 1386 | |
dac47415 EN |
1387 | free(side1); |
1388 | free(side2); | |
3c8a51e8 | 1389 | return ret; |
dac47415 EN |
1390 | } |
1391 | ||
3c8a51e8 | 1392 | static int merge_file_one(struct merge_options *o, |
05cf21eb EN |
1393 | const char *path, |
1394 | const struct object_id *o_oid, int o_mode, | |
1395 | const struct object_id *a_oid, int a_mode, | |
1396 | const struct object_id *b_oid, int b_mode, | |
1397 | const char *branch1, | |
1398 | const char *branch2, | |
1399 | struct merge_file_info *mfi) | |
6bdaead1 EN |
1400 | { |
1401 | struct diff_filespec one, a, b; | |
1402 | ||
1403 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 1404 | oidcpy(&one.oid, o_oid); |
6bdaead1 | 1405 | one.mode = o_mode; |
b4da9d62 | 1406 | oidcpy(&a.oid, a_oid); |
6bdaead1 | 1407 | a.mode = a_mode; |
b4da9d62 | 1408 | oidcpy(&b.oid, b_oid); |
6bdaead1 | 1409 | b.mode = b_mode; |
05cf21eb | 1410 | return merge_file_1(o, &one, &a, &b, path, branch1, branch2, mfi); |
6bdaead1 EN |
1411 | } |
1412 | ||
9c0743fe EN |
1413 | static int conflict_rename_dir(struct merge_options *o, |
1414 | struct diff_filepair *pair, | |
1415 | const char *rename_branch, | |
1416 | const char *other_branch) | |
1417 | { | |
1418 | const struct diff_filespec *dest = pair->two; | |
1419 | ||
79c47598 EN |
1420 | if (!o->call_depth && would_lose_untracked(dest->path)) { |
1421 | char *alt_path = unique_path(o, dest->path, rename_branch); | |
1422 | ||
1423 | output(o, 1, _("Error: Refusing to lose untracked file at %s; " | |
1424 | "writing to %s instead."), | |
1425 | dest->path, alt_path); | |
1426 | /* | |
1427 | * Write the file in worktree at alt_path, but not in the | |
1428 | * index. Instead, write to dest->path for the index but | |
1429 | * only at the higher appropriate stage. | |
1430 | */ | |
1431 | if (update_file(o, 0, &dest->oid, dest->mode, alt_path)) | |
1432 | return -1; | |
1433 | free(alt_path); | |
1434 | return update_stages(o, dest->path, NULL, | |
1435 | rename_branch == o->branch1 ? dest : NULL, | |
1436 | rename_branch == o->branch1 ? NULL : dest); | |
1437 | } | |
1438 | ||
1439 | /* Update dest->path both in index and in worktree */ | |
9c0743fe EN |
1440 | if (update_file(o, 1, &dest->oid, dest->mode, dest->path)) |
1441 | return -1; | |
1442 | return 0; | |
6bdaead1 EN |
1443 | } |
1444 | ||
75456f96 | 1445 | static int handle_change_delete(struct merge_options *o, |
b26d87f2 | 1446 | const char *path, const char *old_path, |
b4da9d62 | 1447 | const struct object_id *o_oid, int o_mode, |
b26d87f2 MM |
1448 | const struct object_id *changed_oid, |
1449 | int changed_mode, | |
1450 | const char *change_branch, | |
1451 | const char *delete_branch, | |
b7033252 EN |
1452 | const char *change, const char *change_past) |
1453 | { | |
b26d87f2 MM |
1454 | char *alt_path = NULL; |
1455 | const char *update_path = path; | |
75456f96 | 1456 | int ret = 0; |
b26d87f2 | 1457 | |
79c47598 EN |
1458 | if (dir_in_way(path, !o->call_depth, 0) || |
1459 | (!o->call_depth && would_lose_untracked(path))) { | |
b26d87f2 | 1460 | update_path = alt_path = unique_path(o, path, change_branch); |
b7033252 EN |
1461 | } |
1462 | ||
1463 | if (o->call_depth) { | |
1464 | /* | |
1465 | * We cannot arbitrarily accept either a_sha or b_sha as | |
1466 | * correct; since there is no true "middle point" between | |
1467 | * them, simply reuse the base version for virtual merge base. | |
1468 | */ | |
75456f96 JS |
1469 | ret = remove_file_from_cache(path); |
1470 | if (!ret) | |
b26d87f2 | 1471 | ret = update_file(o, 0, o_oid, o_mode, update_path); |
b7033252 | 1472 | } else { |
b26d87f2 MM |
1473 | if (!alt_path) { |
1474 | if (!old_path) { | |
1475 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1476 | "and %s in %s. Version %s of %s left in tree."), | |
1477 | change, path, delete_branch, change_past, | |
1478 | change_branch, change_branch, path); | |
1479 | } else { | |
1480 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1481 | "and %s to %s in %s. Version %s of %s left in tree."), | |
1482 | change, old_path, delete_branch, change_past, path, | |
1483 | change_branch, change_branch, path); | |
1484 | } | |
55653a68 | 1485 | } else { |
b26d87f2 MM |
1486 | if (!old_path) { |
1487 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1488 | "and %s in %s. Version %s of %s left in tree at %s."), | |
1489 | change, path, delete_branch, change_past, | |
1490 | change_branch, change_branch, path, alt_path); | |
1491 | } else { | |
1492 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1493 | "and %s to %s in %s. Version %s of %s left in tree at %s."), | |
1494 | change, old_path, delete_branch, change_past, path, | |
1495 | change_branch, change_branch, path, alt_path); | |
1496 | } | |
55653a68 | 1497 | } |
35a74abf | 1498 | /* |
b26d87f2 MM |
1499 | * No need to call update_file() on path when change_branch == |
1500 | * o->branch1 && !alt_path, since that would needlessly touch | |
1501 | * path. We could call update_file_flags() with update_cache=0 | |
1502 | * and update_wd=0, but that's a no-op. | |
35a74abf | 1503 | */ |
b26d87f2 MM |
1504 | if (change_branch != o->branch1 || alt_path) |
1505 | ret = update_file(o, 0, changed_oid, changed_mode, update_path); | |
b7033252 | 1506 | } |
b26d87f2 | 1507 | free(alt_path); |
75456f96 JS |
1508 | |
1509 | return ret; | |
b7033252 EN |
1510 | } |
1511 | ||
75456f96 | 1512 | static int conflict_rename_delete(struct merge_options *o, |
6ef2cb00 EN |
1513 | struct diff_filepair *pair, |
1514 | const char *rename_branch, | |
b26d87f2 | 1515 | const char *delete_branch) |
9047ebbc | 1516 | { |
e03acb8b EN |
1517 | const struct diff_filespec *orig = pair->one; |
1518 | const struct diff_filespec *dest = pair->two; | |
6ef2cb00 | 1519 | |
75456f96 JS |
1520 | if (handle_change_delete(o, |
1521 | o->call_depth ? orig->path : dest->path, | |
b26d87f2 | 1522 | o->call_depth ? NULL : orig->path, |
75456f96 | 1523 | &orig->oid, orig->mode, |
b26d87f2 MM |
1524 | &dest->oid, dest->mode, |
1525 | rename_branch, delete_branch, | |
75456f96 JS |
1526 | _("rename"), _("renamed"))) |
1527 | return -1; | |
e03acb8b | 1528 | |
75456f96 JS |
1529 | if (o->call_depth) |
1530 | return remove_file_from_cache(dest->path); | |
1531 | else | |
bc9204d4 | 1532 | return update_stages(o, dest->path, NULL, |
75456f96 JS |
1533 | rename_branch == o->branch1 ? dest : NULL, |
1534 | rename_branch == o->branch1 ? NULL : dest); | |
6ef2cb00 EN |
1535 | } |
1536 | ||
1ac91b32 EN |
1537 | static struct diff_filespec *filespec_from_entry(struct diff_filespec *target, |
1538 | struct stage_data *entry, | |
1539 | int stage) | |
9047ebbc | 1540 | { |
b4da9d62 | 1541 | struct object_id *oid = &entry->stages[stage].oid; |
1ac91b32 | 1542 | unsigned mode = entry->stages[stage].mode; |
b4da9d62 | 1543 | if (mode == 0 || is_null_oid(oid)) |
1ac91b32 | 1544 | return NULL; |
b4da9d62 | 1545 | oidcpy(&target->oid, oid); |
1ac91b32 EN |
1546 | target->mode = mode; |
1547 | return target; | |
1548 | } | |
1549 | ||
75456f96 | 1550 | static int handle_file(struct merge_options *o, |
3672c971 EN |
1551 | struct diff_filespec *rename, |
1552 | int stage, | |
1553 | struct rename_conflict_info *ci) | |
1554 | { | |
1555 | char *dst_name = rename->path; | |
1556 | struct stage_data *dst_entry; | |
1557 | const char *cur_branch, *other_branch; | |
1558 | struct diff_filespec other; | |
1559 | struct diff_filespec *add; | |
75456f96 | 1560 | int ret; |
3672c971 EN |
1561 | |
1562 | if (stage == 2) { | |
1563 | dst_entry = ci->dst_entry1; | |
1564 | cur_branch = ci->branch1; | |
1565 | other_branch = ci->branch2; | |
1566 | } else { | |
1567 | dst_entry = ci->dst_entry2; | |
1568 | cur_branch = ci->branch2; | |
1569 | other_branch = ci->branch1; | |
9047ebbc | 1570 | } |
3672c971 EN |
1571 | |
1572 | add = filespec_from_entry(&other, dst_entry, stage ^ 1); | |
3672c971 | 1573 | if (add) { |
18797a3b | 1574 | int ren_src_was_dirty = was_dirty(o, rename->path); |
3672c971 | 1575 | char *add_name = unique_path(o, rename->path, other_branch); |
75456f96 JS |
1576 | if (update_file(o, 0, &add->oid, add->mode, add_name)) |
1577 | return -1; | |
3672c971 | 1578 | |
18797a3b EN |
1579 | if (ren_src_was_dirty) { |
1580 | output(o, 1, _("Refusing to lose dirty file at %s"), | |
1581 | rename->path); | |
1582 | } | |
1583 | /* | |
1584 | * Because the double negatives somehow keep confusing me... | |
1585 | * 1) update_wd iff !ren_src_was_dirty. | |
1586 | * 2) no_wd iff !update_wd | |
1587 | * 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty | |
1588 | */ | |
1589 | remove_file(o, 0, rename->path, ren_src_was_dirty); | |
3672c971 EN |
1590 | dst_name = unique_path(o, rename->path, cur_branch); |
1591 | } else { | |
5423d2e7 | 1592 | if (dir_in_way(rename->path, !o->call_depth, 0)) { |
3672c971 | 1593 | dst_name = unique_path(o, rename->path, cur_branch); |
55653a68 | 1594 | output(o, 1, _("%s is a directory in %s adding as %s instead"), |
3672c971 | 1595 | rename->path, other_branch, dst_name); |
79c47598 EN |
1596 | } else if (!o->call_depth && |
1597 | would_lose_untracked(rename->path)) { | |
1598 | dst_name = unique_path(o, rename->path, cur_branch); | |
1599 | output(o, 1, _("Refusing to lose untracked file at %s; " | |
1600 | "adding as %s instead"), | |
1601 | rename->path, dst_name); | |
3672c971 | 1602 | } |
9047ebbc | 1603 | } |
75456f96 JS |
1604 | if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name))) |
1605 | ; /* fall through, do allow dst_name to be released */ | |
1606 | else if (stage == 2) | |
bc9204d4 | 1607 | ret = update_stages(o, rename->path, NULL, rename, add); |
f53d3977 | 1608 | else |
bc9204d4 | 1609 | ret = update_stages(o, rename->path, NULL, add, rename); |
3672c971 EN |
1610 | |
1611 | if (dst_name != rename->path) | |
1612 | free(dst_name); | |
75456f96 JS |
1613 | |
1614 | return ret; | |
3672c971 EN |
1615 | } |
1616 | ||
75456f96 | 1617 | static int conflict_rename_rename_1to2(struct merge_options *o, |
a99b7f22 | 1618 | struct rename_conflict_info *ci) |
9047ebbc | 1619 | { |
09c01f85 | 1620 | /* One file was renamed in both branches, but to different names. */ |
a99b7f22 EN |
1621 | struct diff_filespec *one = ci->pair1->one; |
1622 | struct diff_filespec *a = ci->pair1->two; | |
1623 | struct diff_filespec *b = ci->pair2->two; | |
4f66dade | 1624 | |
55653a68 | 1625 | output(o, 1, _("CONFLICT (rename/rename): " |
4f66dade | 1626 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
55653a68 | 1627 | "rename \"%s\"->\"%s\" in \"%s\"%s"), |
a99b7f22 EN |
1628 | one->path, a->path, ci->branch1, |
1629 | one->path, b->path, ci->branch2, | |
55653a68 | 1630 | o->call_depth ? _(" (left unresolved)") : ""); |
b7fa51da | 1631 | if (o->call_depth) { |
c52ff85d | 1632 | struct merge_file_info mfi; |
6d63070c EN |
1633 | struct diff_filespec other; |
1634 | struct diff_filespec *add; | |
3c8a51e8 | 1635 | if (merge_file_one(o, one->path, |
b4da9d62 | 1636 | &one->oid, one->mode, |
1637 | &a->oid, a->mode, | |
1638 | &b->oid, b->mode, | |
3c8a51e8 | 1639 | ci->branch1, ci->branch2, &mfi)) |
75456f96 JS |
1640 | return -1; |
1641 | ||
9047ebbc | 1642 | /* |
c52ff85d EN |
1643 | * FIXME: For rename/add-source conflicts (if we could detect |
1644 | * such), this is wrong. We should instead find a unique | |
1645 | * pathname and then either rename the add-source file to that | |
1646 | * unique path, or use that unique path instead of src here. | |
9047ebbc | 1647 | */ |
75456f96 JS |
1648 | if (update_file(o, 0, &mfi.oid, mfi.mode, one->path)) |
1649 | return -1; | |
07413c5a | 1650 | |
6d63070c EN |
1651 | /* |
1652 | * Above, we put the merged content at the merge-base's | |
1653 | * path. Now we usually need to delete both a->path and | |
1654 | * b->path. However, the rename on each side of the merge | |
1655 | * could also be involved in a rename/add conflict. In | |
1656 | * such cases, we should keep the added file around, | |
1657 | * resolving the conflict at that path in its favor. | |
1658 | */ | |
1659 | add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); | |
75456f96 JS |
1660 | if (add) { |
1661 | if (update_file(o, 0, &add->oid, add->mode, a->path)) | |
1662 | return -1; | |
1663 | } | |
6d63070c EN |
1664 | else |
1665 | remove_file_from_cache(a->path); | |
1666 | add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); | |
75456f96 JS |
1667 | if (add) { |
1668 | if (update_file(o, 0, &add->oid, add->mode, b->path)) | |
1669 | return -1; | |
1670 | } | |
6d63070c EN |
1671 | else |
1672 | remove_file_from_cache(b->path); | |
75456f96 JS |
1673 | } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci)) |
1674 | return -1; | |
1675 | ||
1676 | return 0; | |
9047ebbc MV |
1677 | } |
1678 | ||
75456f96 | 1679 | static int conflict_rename_rename_2to1(struct merge_options *o, |
461f5041 | 1680 | struct rename_conflict_info *ci) |
9047ebbc | 1681 | { |
461f5041 EN |
1682 | /* Two files, a & b, were renamed to the same thing, c. */ |
1683 | struct diff_filespec *a = ci->pair1->one; | |
1684 | struct diff_filespec *b = ci->pair2->one; | |
1685 | struct diff_filespec *c1 = ci->pair1->two; | |
1686 | struct diff_filespec *c2 = ci->pair2->two; | |
1687 | char *path = c1->path; /* == c2->path */ | |
05cf21eb EN |
1688 | char *path_side_1_desc; |
1689 | char *path_side_2_desc; | |
434b8525 EN |
1690 | struct merge_file_info mfi_c1; |
1691 | struct merge_file_info mfi_c2; | |
75456f96 | 1692 | int ret; |
461f5041 | 1693 | |
55653a68 | 1694 | output(o, 1, _("CONFLICT (rename/rename): " |
461f5041 | 1695 | "Rename %s->%s in %s. " |
55653a68 | 1696 | "Rename %s->%s in %s"), |
461f5041 EN |
1697 | a->path, c1->path, ci->branch1, |
1698 | b->path, c2->path, ci->branch2); | |
1699 | ||
8e1b62f1 EN |
1700 | remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path)); |
1701 | remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path)); | |
461f5041 | 1702 | |
05cf21eb EN |
1703 | path_side_1_desc = xstrfmt("%s (was %s)", path, a->path); |
1704 | path_side_2_desc = xstrfmt("%s (was %s)", path, b->path); | |
3c8a51e8 | 1705 | if (merge_file_special_markers(o, a, c1, &ci->ren1_other, |
05cf21eb | 1706 | path_side_1_desc, |
3c8a51e8 JS |
1707 | o->branch1, c1->path, |
1708 | o->branch2, ci->ren1_other.path, &mfi_c1) || | |
1709 | merge_file_special_markers(o, b, &ci->ren2_other, c2, | |
05cf21eb | 1710 | path_side_2_desc, |
3c8a51e8 JS |
1711 | o->branch1, ci->ren2_other.path, |
1712 | o->branch2, c2->path, &mfi_c2)) | |
75456f96 | 1713 | return -1; |
05cf21eb EN |
1714 | free(path_side_1_desc); |
1715 | free(path_side_2_desc); | |
434b8525 | 1716 | |
0a6b8712 | 1717 | if (o->call_depth) { |
434b8525 EN |
1718 | /* |
1719 | * If mfi_c1.clean && mfi_c2.clean, then it might make | |
1720 | * sense to do a two-way merge of those results. But, I | |
1721 | * think in all cases, it makes sense to have the virtual | |
1722 | * merge base just undo the renames; they can be detected | |
1723 | * again later for the non-recursive merge. | |
1724 | */ | |
1725 | remove_file(o, 0, path, 0); | |
75456f96 JS |
1726 | ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path); |
1727 | if (!ret) | |
1728 | ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, | |
1729 | b->path); | |
0a6b8712 | 1730 | } else { |
461f5041 EN |
1731 | char *new_path1 = unique_path(o, path, ci->branch1); |
1732 | char *new_path2 = unique_path(o, path, ci->branch2); | |
55653a68 | 1733 | output(o, 1, _("Renaming %s to %s and %s to %s instead"), |
461f5041 | 1734 | a->path, new_path1, b->path, new_path2); |
18797a3b EN |
1735 | if (was_dirty(o, path)) |
1736 | output(o, 1, _("Refusing to lose dirty file at %s"), | |
1737 | path); | |
1738 | else if (would_lose_untracked(path)) | |
79c47598 EN |
1739 | /* |
1740 | * Only way we get here is if both renames were from | |
1741 | * a directory rename AND user had an untracked file | |
1742 | * at the location where both files end up after the | |
1743 | * two directory renames. See testcase 10d of t6043. | |
1744 | */ | |
1745 | output(o, 1, _("Refusing to lose untracked file at " | |
1746 | "%s, even though it's in the way."), | |
1747 | path); | |
1748 | else | |
1749 | remove_file(o, 0, path, 0); | |
75456f96 JS |
1750 | ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1); |
1751 | if (!ret) | |
1752 | ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, | |
1753 | new_path2); | |
9c0743fe EN |
1754 | /* |
1755 | * unpack_trees() actually populates the index for us for | |
1756 | * "normal" rename/rename(2to1) situtations so that the | |
1757 | * correct entries are at the higher stages, which would | |
1758 | * make the call below to update_stages_for_stage_data | |
1759 | * unnecessary. However, if either of the renames came | |
1760 | * from a directory rename, then unpack_trees() will not | |
1761 | * have gotten the right data loaded into the index, so we | |
1762 | * need to do so now. (While it'd be tempting to move this | |
1763 | * call to update_stages_for_stage_data() to | |
1764 | * apply_directory_rename_modifications(), that would break | |
1765 | * our intermediate calls to would_lose_untracked() since | |
1766 | * those rely on the current in-memory index. See also the | |
1767 | * big "NOTE" in update_stages()). | |
1768 | */ | |
1769 | if (update_stages_for_stage_data(o, path, ci->dst_entry1)) | |
1770 | ret = -1; | |
1771 | ||
0a6b8712 EN |
1772 | free(new_path2); |
1773 | free(new_path1); | |
1774 | } | |
75456f96 JS |
1775 | |
1776 | return ret; | |
9047ebbc MV |
1777 | } |
1778 | ||
9ba91557 | 1779 | /* |
e5257b2a | 1780 | * Get the diff_filepairs changed between o_tree and tree. |
9ba91557 | 1781 | */ |
e5257b2a EN |
1782 | static struct diff_queue_struct *get_diffpairs(struct merge_options *o, |
1783 | struct tree *o_tree, | |
1784 | struct tree *tree) | |
9ba91557 | 1785 | { |
e5257b2a | 1786 | struct diff_queue_struct *ret; |
9ba91557 EN |
1787 | struct diff_options opts; |
1788 | ||
9ba91557 EN |
1789 | diff_setup(&opts); |
1790 | opts.flags.recursive = 1; | |
1791 | opts.flags.rename_empty = 0; | |
85b46030 BP |
1792 | opts.detect_rename = merge_detect_rename(o); |
1793 | /* | |
1794 | * We do not have logic to handle the detection of copies. In | |
1795 | * fact, it may not even make sense to add such logic: would we | |
1796 | * really want a change to a base file to be propagated through | |
1797 | * multiple other files by a merge? | |
1798 | */ | |
1799 | if (opts.detect_rename > DIFF_DETECT_RENAME) | |
1800 | opts.detect_rename = DIFF_DETECT_RENAME; | |
9ba91557 EN |
1801 | opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : |
1802 | o->diff_rename_limit >= 0 ? o->diff_rename_limit : | |
1803 | 1000; | |
1804 | opts.rename_score = o->rename_score; | |
1805 | opts.show_rename_progress = o->show_rename_progress; | |
1806 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
1807 | diff_setup_done(&opts); | |
1808 | diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts); | |
1809 | diffcore_std(&opts); | |
1810 | if (opts.needed_rename_limit > o->needed_rename_limit) | |
1811 | o->needed_rename_limit = opts.needed_rename_limit; | |
e5257b2a EN |
1812 | |
1813 | ret = xmalloc(sizeof(*ret)); | |
1814 | *ret = diff_queued_diff; | |
1815 | ||
1816 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
1817 | diff_queued_diff.nr = 0; | |
1818 | diff_queued_diff.queue = NULL; | |
1819 | diff_flush(&opts); | |
1820 | return ret; | |
1821 | } | |
1822 | ||
96e7ffbd EN |
1823 | static int tree_has_path(struct tree *tree, const char *path) |
1824 | { | |
1825 | struct object_id hashy; | |
1826 | unsigned int mode_o; | |
1827 | ||
1828 | return !get_tree_entry(&tree->object.oid, path, | |
1829 | &hashy, &mode_o); | |
1830 | } | |
1831 | ||
e95ab70a EN |
1832 | /* |
1833 | * Return a new string that replaces the beginning portion (which matches | |
1834 | * entry->dir), with entry->new_dir. In perl-speak: | |
1835 | * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/); | |
1836 | * NOTE: | |
1837 | * Caller must ensure that old_path starts with entry->dir + '/'. | |
1838 | */ | |
1839 | static char *apply_dir_rename(struct dir_rename_entry *entry, | |
1840 | const char *old_path) | |
1841 | { | |
1842 | struct strbuf new_path = STRBUF_INIT; | |
1843 | int oldlen, newlen; | |
1844 | ||
1845 | if (entry->non_unique_new_dir) | |
1846 | return NULL; | |
1847 | ||
1848 | oldlen = strlen(entry->dir); | |
1849 | newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1; | |
1850 | strbuf_grow(&new_path, newlen); | |
1851 | strbuf_addbuf(&new_path, &entry->new_dir); | |
1852 | strbuf_addstr(&new_path, &old_path[oldlen]); | |
1853 | ||
1854 | return strbuf_detach(&new_path, NULL); | |
1855 | } | |
1856 | ||
7fe40b88 EN |
1857 | static void get_renamed_dir_portion(const char *old_path, const char *new_path, |
1858 | char **old_dir, char **new_dir) | |
1859 | { | |
1860 | char *end_of_old, *end_of_new; | |
1861 | int old_len, new_len; | |
1862 | ||
1863 | *old_dir = NULL; | |
1864 | *new_dir = NULL; | |
1865 | ||
1866 | /* | |
1867 | * For | |
1868 | * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c" | |
1869 | * the "e/foo.c" part is the same, we just want to know that | |
1870 | * "a/b/c/d" was renamed to "a/b/some/thing/else" | |
1871 | * so, for this example, this function returns "a/b/c/d" in | |
1872 | * *old_dir and "a/b/some/thing/else" in *new_dir. | |
1873 | * | |
1874 | * Also, if the basename of the file changed, we don't care. We | |
1875 | * want to know which portion of the directory, if any, changed. | |
1876 | */ | |
1877 | end_of_old = strrchr(old_path, '/'); | |
1878 | end_of_new = strrchr(new_path, '/'); | |
1879 | ||
1880 | if (end_of_old == NULL || end_of_new == NULL) | |
1881 | return; | |
1882 | while (*--end_of_new == *--end_of_old && | |
1883 | end_of_old != old_path && | |
1884 | end_of_new != new_path) | |
1885 | ; /* Do nothing; all in the while loop */ | |
1886 | /* | |
1887 | * We've found the first non-matching character in the directory | |
1888 | * paths. That means the current directory we were comparing | |
1889 | * represents the rename. Move end_of_old and end_of_new back | |
1890 | * to the full directory name. | |
1891 | */ | |
1892 | if (*end_of_old == '/') | |
1893 | end_of_old++; | |
1894 | if (*end_of_old != '/') | |
1895 | end_of_new++; | |
1896 | end_of_old = strchr(end_of_old, '/'); | |
1897 | end_of_new = strchr(end_of_new, '/'); | |
1898 | ||
1899 | /* | |
1900 | * It may have been the case that old_path and new_path were the same | |
1901 | * directory all along. Don't claim a rename if they're the same. | |
1902 | */ | |
1903 | old_len = end_of_old - old_path; | |
1904 | new_len = end_of_new - new_path; | |
1905 | ||
1906 | if (old_len != new_len || strncmp(old_path, new_path, old_len)) { | |
1907 | *old_dir = xstrndup(old_path, old_len); | |
1908 | *new_dir = xstrndup(new_path, new_len); | |
1909 | } | |
1910 | } | |
1911 | ||
96e7ffbd EN |
1912 | static void remove_hashmap_entries(struct hashmap *dir_renames, |
1913 | struct string_list *items_to_remove) | |
1914 | { | |
1915 | int i; | |
1916 | struct dir_rename_entry *entry; | |
1917 | ||
1918 | for (i = 0; i < items_to_remove->nr; i++) { | |
1919 | entry = items_to_remove->items[i].util; | |
1920 | hashmap_remove(dir_renames, entry, NULL); | |
1921 | } | |
1922 | string_list_clear(items_to_remove, 0); | |
1923 | } | |
1924 | ||
f6f77559 EN |
1925 | /* |
1926 | * See if there is a directory rename for path, and if there are any file | |
1927 | * level conflicts for the renamed location. If there is a rename and | |
1928 | * there are no conflicts, return the new name. Otherwise, return NULL. | |
1929 | */ | |
1930 | static char *handle_path_level_conflicts(struct merge_options *o, | |
1931 | const char *path, | |
1932 | struct dir_rename_entry *entry, | |
1933 | struct hashmap *collisions, | |
1934 | struct tree *tree) | |
1935 | { | |
1936 | char *new_path = NULL; | |
1937 | struct collision_entry *collision_ent; | |
1938 | int clean = 1; | |
1939 | struct strbuf collision_paths = STRBUF_INIT; | |
1940 | ||
1941 | /* | |
1942 | * entry has the mapping of old directory name to new directory name | |
1943 | * that we want to apply to path. | |
1944 | */ | |
1945 | new_path = apply_dir_rename(entry, path); | |
1946 | ||
1947 | if (!new_path) { | |
1948 | /* This should only happen when entry->non_unique_new_dir set */ | |
1949 | if (!entry->non_unique_new_dir) | |
1950 | BUG("entry->non_unqiue_dir not set and !new_path"); | |
1951 | output(o, 1, _("CONFLICT (directory rename split): " | |
1952 | "Unclear where to place %s because directory " | |
1953 | "%s was renamed to multiple other directories, " | |
1954 | "with no destination getting a majority of the " | |
1955 | "files."), | |
1956 | path, entry->dir); | |
1957 | clean = 0; | |
1958 | return NULL; | |
1959 | } | |
1960 | ||
1961 | /* | |
1962 | * The caller needs to have ensured that it has pre-populated | |
1963 | * collisions with all paths that map to new_path. Do a quick check | |
1964 | * to ensure that's the case. | |
1965 | */ | |
1966 | collision_ent = collision_find_entry(collisions, new_path); | |
1967 | if (collision_ent == NULL) | |
1968 | BUG("collision_ent is NULL"); | |
1969 | ||
1970 | /* | |
1971 | * Check for one-sided add/add/.../add conflicts, i.e. | |
1972 | * where implicit renames from the other side doing | |
1973 | * directory rename(s) can affect this side of history | |
1974 | * to put multiple paths into the same location. Warn | |
1975 | * and bail on directory renames for such paths. | |
1976 | */ | |
1977 | if (collision_ent->reported_already) { | |
1978 | clean = 0; | |
1979 | } else if (tree_has_path(tree, new_path)) { | |
1980 | collision_ent->reported_already = 1; | |
1981 | strbuf_add_separated_string_list(&collision_paths, ", ", | |
1982 | &collision_ent->source_files); | |
1983 | output(o, 1, _("CONFLICT (implicit dir rename): Existing " | |
1984 | "file/dir at %s in the way of implicit " | |
1985 | "directory rename(s) putting the following " | |
1986 | "path(s) there: %s."), | |
1987 | new_path, collision_paths.buf); | |
1988 | clean = 0; | |
1989 | } else if (collision_ent->source_files.nr > 1) { | |
1990 | collision_ent->reported_already = 1; | |
1991 | strbuf_add_separated_string_list(&collision_paths, ", ", | |
1992 | &collision_ent->source_files); | |
1993 | output(o, 1, _("CONFLICT (implicit dir rename): Cannot map " | |
1994 | "more than one path to %s; implicit directory " | |
1995 | "renames tried to put these paths there: %s"), | |
1996 | new_path, collision_paths.buf); | |
1997 | clean = 0; | |
1998 | } | |
1999 | ||
2000 | /* Free memory we no longer need */ | |
2001 | strbuf_release(&collision_paths); | |
2002 | if (!clean && new_path) { | |
2003 | free(new_path); | |
2004 | return NULL; | |
2005 | } | |
2006 | ||
2007 | return new_path; | |
2008 | } | |
2009 | ||
96e7ffbd EN |
2010 | /* |
2011 | * There are a couple things we want to do at the directory level: | |
2012 | * 1. Check for both sides renaming to the same thing, in order to avoid | |
2013 | * implicit renaming of files that should be left in place. (See | |
2014 | * testcase 6b in t6043 for details.) | |
2015 | * 2. Prune directory renames if there are still files left in the | |
2016 | * the original directory. These represent a partial directory rename, | |
2017 | * i.e. a rename where only some of the files within the directory | |
2018 | * were renamed elsewhere. (Technically, this could be done earlier | |
2019 | * in get_directory_renames(), except that would prevent us from | |
2020 | * doing the previous check and thus failing testcase 6b.) | |
2021 | * 3. Check for rename/rename(1to2) conflicts (at the directory level). | |
2022 | * In the future, we could potentially record this info as well and | |
2023 | * omit reporting rename/rename(1to2) conflicts for each path within | |
2024 | * the affected directories, thus cleaning up the merge output. | |
2025 | * NOTE: We do NOT check for rename/rename(2to1) conflicts at the | |
2026 | * directory level, because merging directories is fine. If it | |
2027 | * causes conflicts for files within those merged directories, then | |
2028 | * that should be detected at the individual path level. | |
2029 | */ | |
2030 | static void handle_directory_level_conflicts(struct merge_options *o, | |
2031 | struct hashmap *dir_re_head, | |
2032 | struct tree *head, | |
2033 | struct hashmap *dir_re_merge, | |
2034 | struct tree *merge) | |
2035 | { | |
2036 | struct hashmap_iter iter; | |
2037 | struct dir_rename_entry *head_ent; | |
2038 | struct dir_rename_entry *merge_ent; | |
2039 | ||
2040 | struct string_list remove_from_head = STRING_LIST_INIT_NODUP; | |
2041 | struct string_list remove_from_merge = STRING_LIST_INIT_NODUP; | |
2042 | ||
2043 | hashmap_iter_init(dir_re_head, &iter); | |
2044 | while ((head_ent = hashmap_iter_next(&iter))) { | |
2045 | merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir); | |
2046 | if (merge_ent && | |
2047 | !head_ent->non_unique_new_dir && | |
2048 | !merge_ent->non_unique_new_dir && | |
2049 | !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) { | |
2050 | /* 1. Renamed identically; remove it from both sides */ | |
2051 | string_list_append(&remove_from_head, | |
2052 | head_ent->dir)->util = head_ent; | |
2053 | strbuf_release(&head_ent->new_dir); | |
2054 | string_list_append(&remove_from_merge, | |
2055 | merge_ent->dir)->util = merge_ent; | |
2056 | strbuf_release(&merge_ent->new_dir); | |
2057 | } else if (tree_has_path(head, head_ent->dir)) { | |
2058 | /* 2. This wasn't a directory rename after all */ | |
2059 | string_list_append(&remove_from_head, | |
2060 | head_ent->dir)->util = head_ent; | |
2061 | strbuf_release(&head_ent->new_dir); | |
2062 | } | |
2063 | } | |
2064 | ||
2065 | remove_hashmap_entries(dir_re_head, &remove_from_head); | |
2066 | remove_hashmap_entries(dir_re_merge, &remove_from_merge); | |
2067 | ||
2068 | hashmap_iter_init(dir_re_merge, &iter); | |
2069 | while ((merge_ent = hashmap_iter_next(&iter))) { | |
2070 | head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir); | |
2071 | if (tree_has_path(merge, merge_ent->dir)) { | |
2072 | /* 2. This wasn't a directory rename after all */ | |
2073 | string_list_append(&remove_from_merge, | |
2074 | merge_ent->dir)->util = merge_ent; | |
2075 | } else if (head_ent && | |
2076 | !head_ent->non_unique_new_dir && | |
2077 | !merge_ent->non_unique_new_dir) { | |
2078 | /* 3. rename/rename(1to2) */ | |
2079 | /* | |
2080 | * We can assume it's not rename/rename(1to1) because | |
2081 | * that was case (1), already checked above. So we | |
2082 | * know that head_ent->new_dir and merge_ent->new_dir | |
2083 | * are different strings. | |
2084 | */ | |
2085 | output(o, 1, _("CONFLICT (rename/rename): " | |
2086 | "Rename directory %s->%s in %s. " | |
2087 | "Rename directory %s->%s in %s"), | |
2088 | head_ent->dir, head_ent->new_dir.buf, o->branch1, | |
2089 | head_ent->dir, merge_ent->new_dir.buf, o->branch2); | |
2090 | string_list_append(&remove_from_head, | |
2091 | head_ent->dir)->util = head_ent; | |
2092 | strbuf_release(&head_ent->new_dir); | |
2093 | string_list_append(&remove_from_merge, | |
2094 | merge_ent->dir)->util = merge_ent; | |
2095 | strbuf_release(&merge_ent->new_dir); | |
2096 | } | |
2097 | } | |
2098 | ||
2099 | remove_hashmap_entries(dir_re_head, &remove_from_head); | |
2100 | remove_hashmap_entries(dir_re_merge, &remove_from_merge); | |
2101 | } | |
2102 | ||
7fe40b88 EN |
2103 | static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs, |
2104 | struct tree *tree) | |
2105 | { | |
2106 | struct hashmap *dir_renames; | |
2107 | struct hashmap_iter iter; | |
2108 | struct dir_rename_entry *entry; | |
2109 | int i; | |
2110 | ||
2111 | /* | |
2112 | * Typically, we think of a directory rename as all files from a | |
2113 | * certain directory being moved to a target directory. However, | |
2114 | * what if someone first moved two files from the original | |
2115 | * directory in one commit, and then renamed the directory | |
2116 | * somewhere else in a later commit? At merge time, we just know | |
2117 | * that files from the original directory went to two different | |
2118 | * places, and that the bulk of them ended up in the same place. | |
2119 | * We want each directory rename to represent where the bulk of the | |
2120 | * files from that directory end up; this function exists to find | |
2121 | * where the bulk of the files went. | |
2122 | * | |
2123 | * The first loop below simply iterates through the list of file | |
2124 | * renames, finding out how often each directory rename pair | |
2125 | * possibility occurs. | |
2126 | */ | |
2127 | dir_renames = xmalloc(sizeof(*dir_renames)); | |
2128 | dir_rename_init(dir_renames); | |
2129 | for (i = 0; i < pairs->nr; ++i) { | |
2130 | struct string_list_item *item; | |
2131 | int *count; | |
2132 | struct diff_filepair *pair = pairs->queue[i]; | |
2133 | char *old_dir, *new_dir; | |
2134 | ||
2135 | /* File not part of directory rename if it wasn't renamed */ | |
2136 | if (pair->status != 'R') | |
2137 | continue; | |
2138 | ||
2139 | get_renamed_dir_portion(pair->one->path, pair->two->path, | |
2140 | &old_dir, &new_dir); | |
2141 | if (!old_dir) | |
2142 | /* Directory didn't change at all; ignore this one. */ | |
2143 | continue; | |
2144 | ||
2145 | entry = dir_rename_find_entry(dir_renames, old_dir); | |
2146 | if (!entry) { | |
2147 | entry = xmalloc(sizeof(*entry)); | |
2148 | dir_rename_entry_init(entry, old_dir); | |
2149 | hashmap_put(dir_renames, entry); | |
2150 | } else { | |
2151 | free(old_dir); | |
2152 | } | |
2153 | item = string_list_lookup(&entry->possible_new_dirs, new_dir); | |
2154 | if (!item) { | |
2155 | item = string_list_insert(&entry->possible_new_dirs, | |
2156 | new_dir); | |
2157 | item->util = xcalloc(1, sizeof(int)); | |
2158 | } else { | |
2159 | free(new_dir); | |
2160 | } | |
2161 | count = item->util; | |
2162 | *count += 1; | |
2163 | } | |
2164 | ||
2165 | /* | |
2166 | * For each directory with files moved out of it, we find out which | |
2167 | * target directory received the most files so we can declare it to | |
2168 | * be the "winning" target location for the directory rename. This | |
2169 | * winner gets recorded in new_dir. If there is no winner | |
2170 | * (multiple target directories received the same number of files), | |
2171 | * we set non_unique_new_dir. Once we've determined the winner (or | |
2172 | * that there is no winner), we no longer need possible_new_dirs. | |
2173 | */ | |
2174 | hashmap_iter_init(dir_renames, &iter); | |
2175 | while ((entry = hashmap_iter_next(&iter))) { | |
2176 | int max = 0; | |
2177 | int bad_max = 0; | |
2178 | char *best = NULL; | |
2179 | ||
2180 | for (i = 0; i < entry->possible_new_dirs.nr; i++) { | |
2181 | int *count = entry->possible_new_dirs.items[i].util; | |
2182 | ||
2183 | if (*count == max) | |
2184 | bad_max = max; | |
2185 | else if (*count > max) { | |
2186 | max = *count; | |
2187 | best = entry->possible_new_dirs.items[i].string; | |
2188 | } | |
2189 | } | |
2190 | if (bad_max == max) | |
2191 | entry->non_unique_new_dir = 1; | |
2192 | else { | |
2193 | assert(entry->new_dir.len == 0); | |
2194 | strbuf_addstr(&entry->new_dir, best); | |
2195 | } | |
2196 | /* | |
2197 | * The relevant directory sub-portion of the original full | |
2198 | * filepaths were xstrndup'ed before inserting into | |
2199 | * possible_new_dirs, and instead of manually iterating the | |
2200 | * list and free'ing each, just lie and tell | |
2201 | * possible_new_dirs that it did the strdup'ing so that it | |
2202 | * will free them for us. | |
2203 | */ | |
2204 | entry->possible_new_dirs.strdup_strings = 1; | |
2205 | string_list_clear(&entry->possible_new_dirs, 1); | |
2206 | } | |
2207 | ||
2208 | return dir_renames; | |
2209 | } | |
2210 | ||
e95ab70a EN |
2211 | static struct dir_rename_entry *check_dir_renamed(const char *path, |
2212 | struct hashmap *dir_renames) | |
2213 | { | |
2214 | char temp[PATH_MAX]; | |
2215 | char *end; | |
2216 | struct dir_rename_entry *entry; | |
2217 | ||
2218 | strcpy(temp, path); | |
2219 | while ((end = strrchr(temp, '/'))) { | |
2220 | *end = '\0'; | |
2221 | entry = dir_rename_find_entry(dir_renames, temp); | |
2222 | if (entry) | |
2223 | return entry; | |
2224 | } | |
2225 | return NULL; | |
2226 | } | |
2227 | ||
2228 | static void compute_collisions(struct hashmap *collisions, | |
2229 | struct hashmap *dir_renames, | |
2230 | struct diff_queue_struct *pairs) | |
2231 | { | |
2232 | int i; | |
2233 | ||
2234 | /* | |
2235 | * Multiple files can be mapped to the same path due to directory | |
2236 | * renames done by the other side of history. Since that other | |
2237 | * side of history could have merged multiple directories into one, | |
2238 | * if our side of history added the same file basename to each of | |
2239 | * those directories, then all N of them would get implicitly | |
2240 | * renamed by the directory rename detection into the same path, | |
2241 | * and we'd get an add/add/.../add conflict, and all those adds | |
2242 | * from *this* side of history. This is not representable in the | |
2243 | * index, and users aren't going to easily be able to make sense of | |
2244 | * it. So we need to provide a good warning about what's | |
2245 | * happening, and fall back to no-directory-rename detection | |
2246 | * behavior for those paths. | |
2247 | * | |
2248 | * See testcases 9e and all of section 5 from t6043 for examples. | |
2249 | */ | |
2250 | collision_init(collisions); | |
2251 | ||
2252 | for (i = 0; i < pairs->nr; ++i) { | |
2253 | struct dir_rename_entry *dir_rename_ent; | |
2254 | struct collision_entry *collision_ent; | |
2255 | char *new_path; | |
2256 | struct diff_filepair *pair = pairs->queue[i]; | |
2257 | ||
6e7e027f | 2258 | if (pair->status != 'A' && pair->status != 'R') |
e95ab70a EN |
2259 | continue; |
2260 | dir_rename_ent = check_dir_renamed(pair->two->path, | |
2261 | dir_renames); | |
2262 | if (!dir_rename_ent) | |
2263 | continue; | |
2264 | ||
2265 | new_path = apply_dir_rename(dir_rename_ent, pair->two->path); | |
2266 | if (!new_path) | |
2267 | /* | |
2268 | * dir_rename_ent->non_unique_new_path is true, which | |
2269 | * means there is no directory rename for us to use, | |
2270 | * which means it won't cause us any additional | |
2271 | * collisions. | |
2272 | */ | |
2273 | continue; | |
2274 | collision_ent = collision_find_entry(collisions, new_path); | |
2275 | if (!collision_ent) { | |
2276 | collision_ent = xcalloc(1, | |
2277 | sizeof(struct collision_entry)); | |
2278 | hashmap_entry_init(collision_ent, strhash(new_path)); | |
2279 | hashmap_put(collisions, collision_ent); | |
2280 | collision_ent->target_file = new_path; | |
2281 | } else { | |
2282 | free(new_path); | |
2283 | } | |
2284 | string_list_insert(&collision_ent->source_files, | |
2285 | pair->two->path); | |
2286 | } | |
2287 | } | |
2288 | ||
f6f77559 EN |
2289 | static char *check_for_directory_rename(struct merge_options *o, |
2290 | const char *path, | |
2291 | struct tree *tree, | |
2292 | struct hashmap *dir_renames, | |
2293 | struct hashmap *dir_rename_exclusions, | |
2294 | struct hashmap *collisions, | |
2295 | int *clean_merge) | |
2296 | { | |
2297 | char *new_path = NULL; | |
2298 | struct dir_rename_entry *entry = check_dir_renamed(path, dir_renames); | |
2299 | struct dir_rename_entry *oentry = NULL; | |
2300 | ||
2301 | if (!entry) | |
2302 | return new_path; | |
2303 | ||
2304 | /* | |
2305 | * This next part is a little weird. We do not want to do an | |
2306 | * implicit rename into a directory we renamed on our side, because | |
2307 | * that will result in a spurious rename/rename(1to2) conflict. An | |
2308 | * example: | |
2309 | * Base commit: dumbdir/afile, otherdir/bfile | |
2310 | * Side 1: smrtdir/afile, otherdir/bfile | |
2311 | * Side 2: dumbdir/afile, dumbdir/bfile | |
2312 | * Here, while working on Side 1, we could notice that otherdir was | |
2313 | * renamed/merged to dumbdir, and change the diff_filepair for | |
2314 | * otherdir/bfile into a rename into dumbdir/bfile. However, Side | |
2315 | * 2 will notice the rename from dumbdir to smrtdir, and do the | |
2316 | * transitive rename to move it from dumbdir/bfile to | |
2317 | * smrtdir/bfile. That gives us bfile in dumbdir vs being in | |
2318 | * smrtdir, a rename/rename(1to2) conflict. We really just want | |
2319 | * the file to end up in smrtdir. And the way to achieve that is | |
2320 | * to not let Side1 do the rename to dumbdir, since we know that is | |
2321 | * the source of one of our directory renames. | |
2322 | * | |
2323 | * That's why oentry and dir_rename_exclusions is here. | |
2324 | * | |
2325 | * As it turns out, this also prevents N-way transient rename | |
2326 | * confusion; See testcases 9c and 9d of t6043. | |
2327 | */ | |
2328 | oentry = dir_rename_find_entry(dir_rename_exclusions, entry->new_dir.buf); | |
2329 | if (oentry) { | |
2330 | output(o, 1, _("WARNING: Avoiding applying %s -> %s rename " | |
2331 | "to %s, because %s itself was renamed."), | |
2332 | entry->dir, entry->new_dir.buf, path, entry->new_dir.buf); | |
2333 | } else { | |
2334 | new_path = handle_path_level_conflicts(o, path, entry, | |
2335 | collisions, tree); | |
2336 | *clean_merge &= (new_path != NULL); | |
2337 | } | |
2338 | ||
2339 | return new_path; | |
2340 | } | |
2341 | ||
9c0743fe EN |
2342 | static void apply_directory_rename_modifications(struct merge_options *o, |
2343 | struct diff_filepair *pair, | |
2344 | char *new_path, | |
2345 | struct rename *re, | |
2346 | struct tree *tree, | |
2347 | struct tree *o_tree, | |
2348 | struct tree *a_tree, | |
2349 | struct tree *b_tree, | |
2350 | struct string_list *entries, | |
2351 | int *clean) | |
2352 | { | |
2353 | struct string_list_item *item; | |
2354 | int stage = (tree == a_tree ? 2 : 3); | |
18797a3b | 2355 | int update_wd; |
9c0743fe EN |
2356 | |
2357 | /* | |
2358 | * In all cases where we can do directory rename detection, | |
2359 | * unpack_trees() will have read pair->two->path into the | |
2360 | * index and the working copy. We need to remove it so that | |
2361 | * we can instead place it at new_path. It is guaranteed to | |
2362 | * not be untracked (unpack_trees() would have errored out | |
2363 | * saying the file would have been overwritten), but it might | |
2364 | * be dirty, though. | |
2365 | */ | |
18797a3b EN |
2366 | update_wd = !was_dirty(o, pair->two->path); |
2367 | if (!update_wd) | |
2368 | output(o, 1, _("Refusing to lose dirty file at %s"), | |
2369 | pair->two->path); | |
2370 | remove_file(o, 1, pair->two->path, !update_wd); | |
9c0743fe EN |
2371 | |
2372 | /* Find or create a new re->dst_entry */ | |
2373 | item = string_list_lookup(entries, new_path); | |
2374 | if (item) { | |
2375 | /* | |
2376 | * Since we're renaming on this side of history, and it's | |
2377 | * due to a directory rename on the other side of history | |
2378 | * (which we only allow when the directory in question no | |
2379 | * longer exists on the other side of history), the | |
2380 | * original entry for re->dst_entry is no longer | |
2381 | * necessary... | |
2382 | */ | |
2383 | re->dst_entry->processed = 1; | |
2384 | ||
2385 | /* | |
2386 | * ...because we'll be using this new one. | |
2387 | */ | |
2388 | re->dst_entry = item->util; | |
2389 | } else { | |
2390 | /* | |
2391 | * re->dst_entry is for the before-dir-rename path, and we | |
2392 | * need it to hold information for the after-dir-rename | |
2393 | * path. Before creating a new entry, we need to mark the | |
2394 | * old one as unnecessary (...unless it is shared by | |
2395 | * src_entry, i.e. this didn't use to be a rename, in which | |
2396 | * case we can just allow the normal processing to happen | |
2397 | * for it). | |
2398 | */ | |
2399 | if (pair->status == 'R') | |
2400 | re->dst_entry->processed = 1; | |
2401 | ||
2402 | re->dst_entry = insert_stage_data(new_path, | |
2403 | o_tree, a_tree, b_tree, | |
2404 | entries); | |
2405 | item = string_list_insert(entries, new_path); | |
2406 | item->util = re->dst_entry; | |
2407 | } | |
2408 | ||
2409 | /* | |
2410 | * Update the stage_data with the information about the path we are | |
2411 | * moving into place. That slot will be empty and available for us | |
2412 | * to write to because of the collision checks in | |
2413 | * handle_path_level_conflicts(). In other words, | |
2414 | * re->dst_entry->stages[stage].oid will be the null_oid, so it's | |
2415 | * open for us to write to. | |
2416 | * | |
2417 | * It may be tempting to actually update the index at this point as | |
2418 | * well, using update_stages_for_stage_data(), but as per the big | |
2419 | * "NOTE" in update_stages(), doing so will modify the current | |
2420 | * in-memory index which will break calls to would_lose_untracked() | |
2421 | * that we need to make. Instead, we need to just make sure that | |
2422 | * the various conflict_rename_*() functions update the index | |
2423 | * explicitly rather than relying on unpack_trees() to have done it. | |
2424 | */ | |
2425 | get_tree_entry(&tree->object.oid, | |
2426 | pair->two->path, | |
2427 | &re->dst_entry->stages[stage].oid, | |
2428 | &re->dst_entry->stages[stage].mode); | |
2429 | ||
2430 | /* Update pair status */ | |
2431 | if (pair->status == 'A') { | |
2432 | /* | |
2433 | * Recording rename information for this add makes it look | |
2434 | * like a rename/delete conflict. Make sure we can | |
2435 | * correctly handle this as an add that was moved to a new | |
2436 | * directory instead of reporting a rename/delete conflict. | |
2437 | */ | |
2438 | re->add_turned_into_rename = 1; | |
2439 | } | |
2440 | /* | |
2441 | * We don't actually look at pair->status again, but it seems | |
2442 | * pedagogically correct to adjust it. | |
2443 | */ | |
2444 | pair->status = 'R'; | |
2445 | ||
2446 | /* | |
2447 | * Finally, record the new location. | |
2448 | */ | |
2449 | pair->two->path = new_path; | |
2450 | } | |
2451 | ||
e5257b2a EN |
2452 | /* |
2453 | * Get information of all renames which occurred in 'pairs', making use of | |
2454 | * any implicit directory renames inferred from the other side of history. | |
2455 | * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree') | |
2456 | * to be able to associate the correct cache entries with the rename | |
2457 | * information; tree is always equal to either a_tree or b_tree. | |
2458 | */ | |
2459 | static struct string_list *get_renames(struct merge_options *o, | |
2460 | struct diff_queue_struct *pairs, | |
e95ab70a | 2461 | struct hashmap *dir_renames, |
f6f77559 | 2462 | struct hashmap *dir_rename_exclusions, |
e5257b2a EN |
2463 | struct tree *tree, |
2464 | struct tree *o_tree, | |
2465 | struct tree *a_tree, | |
2466 | struct tree *b_tree, | |
f6f77559 EN |
2467 | struct string_list *entries, |
2468 | int *clean_merge) | |
e5257b2a EN |
2469 | { |
2470 | int i; | |
e95ab70a EN |
2471 | struct hashmap collisions; |
2472 | struct hashmap_iter iter; | |
2473 | struct collision_entry *e; | |
e5257b2a EN |
2474 | struct string_list *renames; |
2475 | ||
e95ab70a | 2476 | compute_collisions(&collisions, dir_renames, pairs); |
e5257b2a EN |
2477 | renames = xcalloc(1, sizeof(struct string_list)); |
2478 | ||
2479 | for (i = 0; i < pairs->nr; ++i) { | |
9ba91557 EN |
2480 | struct string_list_item *item; |
2481 | struct rename *re; | |
e5257b2a | 2482 | struct diff_filepair *pair = pairs->queue[i]; |
f6f77559 | 2483 | char *new_path; /* non-NULL only with directory renames */ |
9ba91557 | 2484 | |
6e7e027f | 2485 | if (pair->status != 'A' && pair->status != 'R') { |
9ba91557 EN |
2486 | diff_free_filepair(pair); |
2487 | continue; | |
2488 | } | |
f6f77559 EN |
2489 | new_path = check_for_directory_rename(o, pair->two->path, tree, |
2490 | dir_renames, | |
2491 | dir_rename_exclusions, | |
2492 | &collisions, | |
2493 | clean_merge); | |
2494 | if (pair->status != 'R' && !new_path) { | |
2495 | diff_free_filepair(pair); | |
2496 | continue; | |
2497 | } | |
2498 | ||
9ba91557 EN |
2499 | re = xmalloc(sizeof(*re)); |
2500 | re->processed = 0; | |
9c0743fe | 2501 | re->add_turned_into_rename = 0; |
9ba91557 EN |
2502 | re->pair = pair; |
2503 | item = string_list_lookup(entries, re->pair->one->path); | |
2504 | if (!item) | |
2505 | re->src_entry = insert_stage_data(re->pair->one->path, | |
2506 | o_tree, a_tree, b_tree, entries); | |
2507 | else | |
2508 | re->src_entry = item->util; | |
2509 | ||
2510 | item = string_list_lookup(entries, re->pair->two->path); | |
2511 | if (!item) | |
2512 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
2513 | o_tree, a_tree, b_tree, entries); | |
2514 | else | |
2515 | re->dst_entry = item->util; | |
2516 | item = string_list_insert(renames, pair->one->path); | |
2517 | item->util = re; | |
9c0743fe EN |
2518 | if (new_path) |
2519 | apply_directory_rename_modifications(o, pair, new_path, | |
2520 | re, tree, o_tree, | |
2521 | a_tree, b_tree, | |
2522 | entries, | |
2523 | clean_merge); | |
9ba91557 | 2524 | } |
e95ab70a EN |
2525 | |
2526 | hashmap_iter_init(&collisions, &iter); | |
2527 | while ((e = hashmap_iter_next(&iter))) { | |
2528 | free(e->target_file); | |
2529 | string_list_clear(&e->source_files, 0); | |
2530 | } | |
2531 | hashmap_free(&collisions, 1); | |
9ba91557 EN |
2532 | return renames; |
2533 | } | |
2534 | ||
8a2fce18 MV |
2535 | static int process_renames(struct merge_options *o, |
2536 | struct string_list *a_renames, | |
2537 | struct string_list *b_renames) | |
9047ebbc MV |
2538 | { |
2539 | int clean_merge = 1, i, j; | |
183113a5 TF |
2540 | struct string_list a_by_dst = STRING_LIST_INIT_NODUP; |
2541 | struct string_list b_by_dst = STRING_LIST_INIT_NODUP; | |
9047ebbc MV |
2542 | const struct rename *sre; |
2543 | ||
2544 | for (i = 0; i < a_renames->nr; i++) { | |
2545 | sre = a_renames->items[i].util; | |
78a395d3 | 2546 | string_list_insert(&a_by_dst, sre->pair->two->path)->util |
0a6b8712 | 2547 | = (void *)sre; |
9047ebbc MV |
2548 | } |
2549 | for (i = 0; i < b_renames->nr; i++) { | |
2550 | sre = b_renames->items[i].util; | |
78a395d3 | 2551 | string_list_insert(&b_by_dst, sre->pair->two->path)->util |
0a6b8712 | 2552 | = (void *)sre; |
9047ebbc MV |
2553 | } |
2554 | ||
2555 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { | |
8e24cbae | 2556 | struct string_list *renames1, *renames2Dst; |
9047ebbc MV |
2557 | struct rename *ren1 = NULL, *ren2 = NULL; |
2558 | const char *branch1, *branch2; | |
2559 | const char *ren1_src, *ren1_dst; | |
461f5041 | 2560 | struct string_list_item *lookup; |
9047ebbc MV |
2561 | |
2562 | if (i >= a_renames->nr) { | |
9047ebbc MV |
2563 | ren2 = b_renames->items[j++].util; |
2564 | } else if (j >= b_renames->nr) { | |
9047ebbc MV |
2565 | ren1 = a_renames->items[i++].util; |
2566 | } else { | |
8e24cbae BK |
2567 | int compare = strcmp(a_renames->items[i].string, |
2568 | b_renames->items[j].string); | |
9047ebbc MV |
2569 | if (compare <= 0) |
2570 | ren1 = a_renames->items[i++].util; | |
2571 | if (compare >= 0) | |
2572 | ren2 = b_renames->items[j++].util; | |
2573 | } | |
2574 | ||
2575 | /* TODO: refactor, so that 1/2 are not needed */ | |
2576 | if (ren1) { | |
2577 | renames1 = a_renames; | |
9047ebbc | 2578 | renames2Dst = &b_by_dst; |
8a2fce18 MV |
2579 | branch1 = o->branch1; |
2580 | branch2 = o->branch2; | |
9047ebbc | 2581 | } else { |
9047ebbc | 2582 | renames1 = b_renames; |
9047ebbc | 2583 | renames2Dst = &a_by_dst; |
8a2fce18 MV |
2584 | branch1 = o->branch2; |
2585 | branch2 = o->branch1; | |
35d803bc | 2586 | SWAP(ren2, ren1); |
9047ebbc | 2587 | } |
9047ebbc | 2588 | |
9047ebbc MV |
2589 | if (ren1->processed) |
2590 | continue; | |
2591 | ren1->processed = 1; | |
9047ebbc | 2592 | ren1->dst_entry->processed = 1; |
7769a75e EN |
2593 | /* BUG: We should only mark src_entry as processed if we |
2594 | * are not dealing with a rename + add-source case. | |
2595 | */ | |
9047ebbc | 2596 | ren1->src_entry->processed = 1; |
9047ebbc MV |
2597 | |
2598 | ren1_src = ren1->pair->one->path; | |
2599 | ren1_dst = ren1->pair->two->path; | |
2600 | ||
2601 | if (ren2) { | |
461f5041 | 2602 | /* One file renamed on both sides */ |
9047ebbc MV |
2603 | const char *ren2_src = ren2->pair->one->path; |
2604 | const char *ren2_dst = ren2->pair->two->path; | |
4f66dade | 2605 | enum rename_type rename_type; |
9047ebbc | 2606 | if (strcmp(ren1_src, ren2_src) != 0) |
033abf97 | 2607 | BUG("ren1_src != ren2_src"); |
9047ebbc MV |
2608 | ren2->dst_entry->processed = 1; |
2609 | ren2->processed = 1; | |
2610 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
4f66dade | 2611 | rename_type = RENAME_ONE_FILE_TO_TWO; |
461f5041 | 2612 | clean_merge = 0; |
9047ebbc | 2613 | } else { |
4f66dade | 2614 | rename_type = RENAME_ONE_FILE_TO_ONE; |
7769a75e EN |
2615 | /* BUG: We should only remove ren1_src in |
2616 | * the base stage (think of rename + | |
2617 | * add-source cases). | |
2618 | */ | |
b7fa51da | 2619 | remove_file(o, 1, ren1_src, 1); |
b8ddf164 EN |
2620 | update_entry(ren1->dst_entry, |
2621 | ren1->pair->one, | |
2622 | ren1->pair->two, | |
2623 | ren2->pair->two); | |
9047ebbc | 2624 | } |
4f66dade EN |
2625 | setup_rename_conflict_info(rename_type, |
2626 | ren1->pair, | |
2627 | ren2->pair, | |
2628 | branch1, | |
2629 | branch2, | |
2630 | ren1->dst_entry, | |
232c635f EN |
2631 | ren2->dst_entry, |
2632 | o, | |
2633 | NULL, | |
2634 | NULL); | |
461f5041 EN |
2635 | } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) { |
2636 | /* Two different files renamed to the same thing */ | |
2637 | char *ren2_dst; | |
2638 | ren2 = lookup->util; | |
2639 | ren2_dst = ren2->pair->two->path; | |
2640 | if (strcmp(ren1_dst, ren2_dst) != 0) | |
033abf97 | 2641 | BUG("ren1_dst != ren2_dst"); |
461f5041 EN |
2642 | |
2643 | clean_merge = 0; | |
2644 | ren2->processed = 1; | |
2645 | /* | |
2646 | * BUG: We should only mark src_entry as processed | |
2647 | * if we are not dealing with a rename + add-source | |
2648 | * case. | |
2649 | */ | |
2650 | ren2->src_entry->processed = 1; | |
2651 | ||
2652 | setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE, | |
2653 | ren1->pair, | |
2654 | ren2->pair, | |
2655 | branch1, | |
2656 | branch2, | |
2657 | ren1->dst_entry, | |
232c635f EN |
2658 | ren2->dst_entry, |
2659 | o, | |
2660 | ren1->src_entry, | |
2661 | ren2->src_entry); | |
2662 | ||
9047ebbc MV |
2663 | } else { |
2664 | /* Renamed in 1, maybe changed in 2 */ | |
9047ebbc MV |
2665 | /* we only use sha1 and mode of these */ |
2666 | struct diff_filespec src_other, dst_other; | |
41d70bd6 | 2667 | int try_merge; |
9047ebbc | 2668 | |
41d70bd6 EN |
2669 | /* |
2670 | * unpack_trees loads entries from common-commit | |
2671 | * into stage 1, from head-commit into stage 2, and | |
2672 | * from merge-commit into stage 3. We keep track | |
2673 | * of which side corresponds to the rename. | |
2674 | */ | |
2675 | int renamed_stage = a_renames == renames1 ? 2 : 3; | |
2676 | int other_stage = a_renames == renames1 ? 3 : 2; | |
9047ebbc | 2677 | |
7769a75e EN |
2678 | /* BUG: We should only remove ren1_src in the base |
2679 | * stage and in other_stage (think of rename + | |
2680 | * add-source case). | |
2681 | */ | |
531357a4 | 2682 | remove_file(o, 1, ren1_src, |
a35edc84 | 2683 | renamed_stage == 2 || !was_tracked(o, ren1_src)); |
9047ebbc | 2684 | |
fd429e98 | 2685 | oidcpy(&src_other.oid, |
2686 | &ren1->src_entry->stages[other_stage].oid); | |
41d70bd6 | 2687 | src_other.mode = ren1->src_entry->stages[other_stage].mode; |
fd429e98 | 2688 | oidcpy(&dst_other.oid, |
2689 | &ren1->dst_entry->stages[other_stage].oid); | |
41d70bd6 | 2690 | dst_other.mode = ren1->dst_entry->stages[other_stage].mode; |
9047ebbc MV |
2691 | try_merge = 0; |
2692 | ||
9c0743fe EN |
2693 | if (oid_eq(&src_other.oid, &null_oid) && |
2694 | ren1->add_turned_into_rename) { | |
2695 | setup_rename_conflict_info(RENAME_DIR, | |
2696 | ren1->pair, | |
2697 | NULL, | |
2698 | branch1, | |
2699 | branch2, | |
2700 | ren1->dst_entry, | |
2701 | NULL, | |
2702 | o, | |
2703 | NULL, | |
2704 | NULL); | |
2705 | } else if (oid_eq(&src_other.oid, &null_oid)) { | |
4f66dade EN |
2706 | setup_rename_conflict_info(RENAME_DELETE, |
2707 | ren1->pair, | |
2708 | NULL, | |
2709 | branch1, | |
2710 | branch2, | |
2711 | ren1->dst_entry, | |
232c635f EN |
2712 | NULL, |
2713 | o, | |
2714 | NULL, | |
4f66dade | 2715 | NULL); |
d5af5105 | 2716 | } else if ((dst_other.mode == ren1->pair->two->mode) && |
b4da9d62 | 2717 | oid_eq(&dst_other.oid, &ren1->pair->two->oid)) { |
35a74abf EN |
2718 | /* |
2719 | * Added file on the other side identical to | |
2720 | * the file being renamed: clean merge. | |
2721 | * Also, there is no need to overwrite the | |
2722 | * file already in the working copy, so call | |
2723 | * update_file_flags() instead of | |
2724 | * update_file(). | |
2725 | */ | |
75456f96 JS |
2726 | if (update_file_flags(o, |
2727 | &ren1->pair->two->oid, | |
2728 | ren1->pair->two->mode, | |
2729 | ren1_dst, | |
2730 | 1, /* update_cache */ | |
2731 | 0 /* update_wd */)) | |
2732 | clean_merge = -1; | |
b4da9d62 | 2733 | } else if (!oid_eq(&dst_other.oid, &null_oid)) { |
9047ebbc MV |
2734 | clean_merge = 0; |
2735 | try_merge = 1; | |
55653a68 JX |
2736 | output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. " |
2737 | "%s added in %s"), | |
9047ebbc MV |
2738 | ren1_src, ren1_dst, branch1, |
2739 | ren1_dst, branch2); | |
c94736a2 JH |
2740 | if (o->call_depth) { |
2741 | struct merge_file_info mfi; | |
3c8a51e8 JS |
2742 | if (merge_file_one(o, ren1_dst, &null_oid, 0, |
2743 | &ren1->pair->two->oid, | |
2744 | ren1->pair->two->mode, | |
2745 | &dst_other.oid, | |
2746 | dst_other.mode, | |
75456f96 JS |
2747 | branch1, branch2, &mfi)) { |
2748 | clean_merge = -1; | |
2749 | goto cleanup_and_return; | |
2750 | } | |
55653a68 | 2751 | output(o, 1, _("Adding merged %s"), ren1_dst); |
75456f96 JS |
2752 | if (update_file(o, 0, &mfi.oid, |
2753 | mfi.mode, ren1_dst)) | |
2754 | clean_merge = -1; | |
2a669c34 | 2755 | try_merge = 0; |
c94736a2 | 2756 | } else { |
3d6b8e88 | 2757 | char *new_path = unique_path(o, ren1_dst, branch2); |
55653a68 | 2758 | output(o, 1, _("Adding as %s instead"), new_path); |
75456f96 JS |
2759 | if (update_file(o, 0, &dst_other.oid, |
2760 | dst_other.mode, new_path)) | |
2761 | clean_merge = -1; | |
3d6b8e88 | 2762 | free(new_path); |
c94736a2 | 2763 | } |
9047ebbc MV |
2764 | } else |
2765 | try_merge = 1; | |
2766 | ||
75456f96 JS |
2767 | if (clean_merge < 0) |
2768 | goto cleanup_and_return; | |
9047ebbc | 2769 | if (try_merge) { |
8a2fce18 | 2770 | struct diff_filespec *one, *a, *b; |
9047ebbc MV |
2771 | src_other.path = (char *)ren1_src; |
2772 | ||
8a2fce18 | 2773 | one = ren1->pair->one; |
9047ebbc MV |
2774 | if (a_renames == renames1) { |
2775 | a = ren1->pair->two; | |
2776 | b = &src_other; | |
2777 | } else { | |
2778 | b = ren1->pair->two; | |
2779 | a = &src_other; | |
2780 | } | |
b8ddf164 | 2781 | update_entry(ren1->dst_entry, one, a, b); |
4f66dade EN |
2782 | setup_rename_conflict_info(RENAME_NORMAL, |
2783 | ren1->pair, | |
2784 | NULL, | |
2785 | branch1, | |
2786 | NULL, | |
2787 | ren1->dst_entry, | |
232c635f EN |
2788 | NULL, |
2789 | o, | |
2790 | NULL, | |
4f66dade | 2791 | NULL); |
9047ebbc MV |
2792 | } |
2793 | } | |
2794 | } | |
75456f96 | 2795 | cleanup_and_return: |
9047ebbc MV |
2796 | string_list_clear(&a_by_dst, 0); |
2797 | string_list_clear(&b_by_dst, 0); | |
2798 | ||
2799 | return clean_merge; | |
2800 | } | |
2801 | ||
f172589e EN |
2802 | struct rename_info { |
2803 | struct string_list *head_renames; | |
2804 | struct string_list *merge_renames; | |
2805 | }; | |
2806 | ||
7fe40b88 EN |
2807 | static void initial_cleanup_rename(struct diff_queue_struct *pairs, |
2808 | struct hashmap *dir_renames) | |
ffc16c49 | 2809 | { |
7fe40b88 EN |
2810 | struct hashmap_iter iter; |
2811 | struct dir_rename_entry *e; | |
2812 | ||
2813 | hashmap_iter_init(dir_renames, &iter); | |
2814 | while ((e = hashmap_iter_next(&iter))) { | |
2815 | free(e->dir); | |
2816 | strbuf_release(&e->new_dir); | |
2817 | /* possible_new_dirs already cleared in get_directory_renames */ | |
2818 | } | |
2819 | hashmap_free(dir_renames, 1); | |
2820 | free(dir_renames); | |
2821 | ||
ffc16c49 EN |
2822 | free(pairs->queue); |
2823 | free(pairs); | |
2824 | } | |
2825 | ||
f172589e EN |
2826 | static int handle_renames(struct merge_options *o, |
2827 | struct tree *common, | |
2828 | struct tree *head, | |
2829 | struct tree *merge, | |
2830 | struct string_list *entries, | |
2831 | struct rename_info *ri) | |
2832 | { | |
e5257b2a | 2833 | struct diff_queue_struct *head_pairs, *merge_pairs; |
7fe40b88 | 2834 | struct hashmap *dir_re_head, *dir_re_merge; |
f6f77559 | 2835 | int clean = 1; |
e5257b2a | 2836 | |
3992ff0c EN |
2837 | ri->head_renames = NULL; |
2838 | ri->merge_renames = NULL; | |
2839 | ||
85b46030 | 2840 | if (!merge_detect_rename(o)) |
3992ff0c EN |
2841 | return 1; |
2842 | ||
e5257b2a EN |
2843 | head_pairs = get_diffpairs(o, common, head); |
2844 | merge_pairs = get_diffpairs(o, common, merge); | |
2845 | ||
7fe40b88 EN |
2846 | dir_re_head = get_directory_renames(head_pairs, head); |
2847 | dir_re_merge = get_directory_renames(merge_pairs, merge); | |
2848 | ||
96e7ffbd EN |
2849 | handle_directory_level_conflicts(o, |
2850 | dir_re_head, head, | |
2851 | dir_re_merge, merge); | |
2852 | ||
e95ab70a | 2853 | ri->head_renames = get_renames(o, head_pairs, |
f6f77559 EN |
2854 | dir_re_merge, dir_re_head, head, |
2855 | common, head, merge, entries, | |
2856 | &clean); | |
2857 | if (clean < 0) | |
2858 | goto cleanup; | |
e95ab70a | 2859 | ri->merge_renames = get_renames(o, merge_pairs, |
f6f77559 EN |
2860 | dir_re_head, dir_re_merge, merge, |
2861 | common, head, merge, entries, | |
2862 | &clean); | |
2863 | if (clean < 0) | |
2864 | goto cleanup; | |
2865 | clean &= process_renames(o, ri->head_renames, ri->merge_renames); | |
2866 | ||
2867 | cleanup: | |
e5257b2a EN |
2868 | /* |
2869 | * Some cleanup is deferred until cleanup_renames() because the | |
2870 | * data structures are still needed and referenced in | |
2871 | * process_entry(). But there are a few things we can free now. | |
2872 | */ | |
7fe40b88 EN |
2873 | initial_cleanup_rename(head_pairs, dir_re_head); |
2874 | initial_cleanup_rename(merge_pairs, dir_re_merge); | |
e5257b2a EN |
2875 | |
2876 | return clean; | |
f172589e EN |
2877 | } |
2878 | ||
ffc16c49 | 2879 | static void final_cleanup_rename(struct string_list *rename) |
f172589e | 2880 | { |
9cfee25a EN |
2881 | const struct rename *re; |
2882 | int i; | |
f172589e | 2883 | |
3992ff0c EN |
2884 | if (rename == NULL) |
2885 | return; | |
2886 | ||
9cfee25a EN |
2887 | for (i = 0; i < rename->nr; i++) { |
2888 | re = rename->items[i].util; | |
2889 | diff_free_filepair(re->pair); | |
2890 | } | |
2891 | string_list_clear(rename, 1); | |
2892 | free(rename); | |
2893 | } | |
2894 | ||
ffc16c49 | 2895 | static void final_cleanup_renames(struct rename_info *re_info) |
9cfee25a | 2896 | { |
ffc16c49 EN |
2897 | final_cleanup_rename(re_info->head_renames); |
2898 | final_cleanup_rename(re_info->merge_renames); | |
f172589e EN |
2899 | } |
2900 | ||
b4da9d62 | 2901 | static struct object_id *stage_oid(const struct object_id *oid, unsigned mode) |
9047ebbc | 2902 | { |
b4da9d62 | 2903 | return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid; |
9047ebbc MV |
2904 | } |
2905 | ||
bc9204d4 JS |
2906 | static int read_oid_strbuf(struct merge_options *o, |
2907 | const struct object_id *oid, struct strbuf *dst) | |
331a1838 EB |
2908 | { |
2909 | void *buf; | |
2910 | enum object_type type; | |
2911 | unsigned long size; | |
b4f5aca4 | 2912 | buf = read_object_file(oid, &type, &size); |
331a1838 | 2913 | if (!buf) |
bc9204d4 | 2914 | return err(o, _("cannot read object %s"), oid_to_hex(oid)); |
331a1838 EB |
2915 | if (type != OBJ_BLOB) { |
2916 | free(buf); | |
bc9204d4 | 2917 | return err(o, _("object %s is not a blob"), oid_to_hex(oid)); |
331a1838 EB |
2918 | } |
2919 | strbuf_attach(dst, buf, size, size + 1); | |
2920 | return 0; | |
2921 | } | |
2922 | ||
bc9204d4 JS |
2923 | static int blob_unchanged(struct merge_options *opt, |
2924 | const struct object_id *o_oid, | |
72fac66b | 2925 | unsigned o_mode, |
b4da9d62 | 2926 | const struct object_id *a_oid, |
72fac66b | 2927 | unsigned a_mode, |
3e7589b7 | 2928 | int renormalize, const char *path) |
331a1838 EB |
2929 | { |
2930 | struct strbuf o = STRBUF_INIT; | |
2931 | struct strbuf a = STRBUF_INIT; | |
2932 | int ret = 0; /* assume changed for safety */ | |
2933 | ||
72fac66b JK |
2934 | if (a_mode != o_mode) |
2935 | return 0; | |
b4da9d62 | 2936 | if (oid_eq(o_oid, a_oid)) |
331a1838 | 2937 | return 1; |
3e7589b7 | 2938 | if (!renormalize) |
331a1838 EB |
2939 | return 0; |
2940 | ||
b4da9d62 | 2941 | assert(o_oid && a_oid); |
bc9204d4 | 2942 | if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a)) |
331a1838 EB |
2943 | goto error_return; |
2944 | /* | |
2945 | * Note: binary | is used so that both renormalizations are | |
2946 | * performed. Comparison can be skipped if both files are | |
2947 | * unchanged since their sha1s have already been compared. | |
2948 | */ | |
a33e0b2a BW |
2949 | if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) | |
2950 | renormalize_buffer(&the_index, path, a.buf, a.len, &a)) | |
331a1838 EB |
2951 | ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); |
2952 | ||
2953 | error_return: | |
2954 | strbuf_release(&o); | |
2955 | strbuf_release(&a); | |
2956 | return ret; | |
2957 | } | |
2958 | ||
75456f96 | 2959 | static int handle_modify_delete(struct merge_options *o, |
5e3ce663 | 2960 | const char *path, |
b4da9d62 | 2961 | struct object_id *o_oid, int o_mode, |
2962 | struct object_id *a_oid, int a_mode, | |
2963 | struct object_id *b_oid, int b_mode) | |
5e3ce663 | 2964 | { |
b26d87f2 MM |
2965 | const char *modify_branch, *delete_branch; |
2966 | struct object_id *changed_oid; | |
2967 | int changed_mode; | |
2968 | ||
2969 | if (a_oid) { | |
2970 | modify_branch = o->branch1; | |
2971 | delete_branch = o->branch2; | |
2972 | changed_oid = a_oid; | |
2973 | changed_mode = a_mode; | |
2974 | } else { | |
2975 | modify_branch = o->branch2; | |
2976 | delete_branch = o->branch1; | |
2977 | changed_oid = b_oid; | |
2978 | changed_mode = b_mode; | |
2979 | } | |
2980 | ||
75456f96 | 2981 | return handle_change_delete(o, |
b26d87f2 | 2982 | path, NULL, |
75456f96 | 2983 | o_oid, o_mode, |
b26d87f2 MM |
2984 | changed_oid, changed_mode, |
2985 | modify_branch, delete_branch, | |
75456f96 | 2986 | _("modify"), _("modified")); |
5e3ce663 EN |
2987 | } |
2988 | ||
0c4918d1 EN |
2989 | static int merge_content(struct merge_options *o, |
2990 | const char *path, | |
bd42380e | 2991 | int is_dirty, |
b4da9d62 | 2992 | struct object_id *o_oid, int o_mode, |
2993 | struct object_id *a_oid, int a_mode, | |
2994 | struct object_id *b_oid, int b_mode, | |
4f66dade | 2995 | struct rename_conflict_info *rename_conflict_info) |
0c4918d1 | 2996 | { |
55653a68 | 2997 | const char *reason = _("content"); |
5b448b85 | 2998 | const char *path1 = NULL, *path2 = NULL; |
0c4918d1 EN |
2999 | struct merge_file_info mfi; |
3000 | struct diff_filespec one, a, b; | |
4ab9a157 | 3001 | unsigned df_conflict_remains = 0; |
0c4918d1 | 3002 | |
b4da9d62 | 3003 | if (!o_oid) { |
55653a68 | 3004 | reason = _("add/add"); |
b4da9d62 | 3005 | o_oid = (struct object_id *)&null_oid; |
0c4918d1 EN |
3006 | } |
3007 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 3008 | oidcpy(&one.oid, o_oid); |
0c4918d1 | 3009 | one.mode = o_mode; |
b4da9d62 | 3010 | oidcpy(&a.oid, a_oid); |
0c4918d1 | 3011 | a.mode = a_mode; |
b4da9d62 | 3012 | oidcpy(&b.oid, b_oid); |
0c4918d1 EN |
3013 | b.mode = b_mode; |
3014 | ||
3c217c07 | 3015 | if (rename_conflict_info) { |
3c217c07 EN |
3016 | struct diff_filepair *pair1 = rename_conflict_info->pair1; |
3017 | ||
3018 | path1 = (o->branch1 == rename_conflict_info->branch1) ? | |
3019 | pair1->two->path : pair1->one->path; | |
3020 | /* If rename_conflict_info->pair2 != NULL, we are in | |
3021 | * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a | |
3022 | * normal rename. | |
3023 | */ | |
3024 | path2 = (rename_conflict_info->pair2 || | |
3025 | o->branch2 == rename_conflict_info->branch1) ? | |
3026 | pair1->two->path : pair1->one->path; | |
3c217c07 | 3027 | |
5423d2e7 DT |
3028 | if (dir_in_way(path, !o->call_depth, |
3029 | S_ISGITLINK(pair1->two->mode))) | |
3c217c07 | 3030 | df_conflict_remains = 1; |
4ab9a157 | 3031 | } |
05cf21eb | 3032 | if (merge_file_special_markers(o, &one, &a, &b, path, |
3c8a51e8 JS |
3033 | o->branch1, path1, |
3034 | o->branch2, path2, &mfi)) | |
3035 | return -1; | |
4ab9a157 | 3036 | |
1de70dbd EN |
3037 | /* |
3038 | * We can skip updating the working tree file iff: | |
3039 | * a) The merge is clean | |
3040 | * b) The merge matches what was in HEAD (content, mode, pathname) | |
3041 | * c) The target path is usable (i.e. not involved in D/F conflict) | |
3042 | */ | |
3043 | if (mfi.clean && | |
3044 | was_tracked_and_matches(o, path, &mfi.oid, mfi.mode) && | |
3045 | !df_conflict_remains) { | |
55653a68 | 3046 | output(o, 3, _("Skipped %s (merged same as existing)"), path); |
1de70dbd EN |
3047 | if (add_cacheinfo(o, mfi.mode, &mfi.oid, path, |
3048 | 0, (!o->call_depth && !is_dirty), 0)) | |
3049 | return -1; | |
3050 | return mfi.clean; | |
05cf21eb | 3051 | } |
0c4918d1 EN |
3052 | |
3053 | if (!mfi.clean) { | |
3054 | if (S_ISGITLINK(mfi.mode)) | |
55653a68 JX |
3055 | reason = _("submodule"); |
3056 | output(o, 1, _("CONFLICT (%s): Merge conflict in %s"), | |
0c4918d1 | 3057 | reason, path); |
4f66dade | 3058 | if (rename_conflict_info && !df_conflict_remains) |
bc9204d4 | 3059 | if (update_stages(o, path, &one, &a, &b)) |
75456f96 | 3060 | return -1; |
0c4918d1 EN |
3061 | } |
3062 | ||
bd42380e | 3063 | if (df_conflict_remains || is_dirty) { |
3d6b8e88 | 3064 | char *new_path; |
51931bf0 EN |
3065 | if (o->call_depth) { |
3066 | remove_file_from_cache(path); | |
3067 | } else { | |
75456f96 | 3068 | if (!mfi.clean) { |
bc9204d4 | 3069 | if (update_stages(o, path, &one, &a, &b)) |
75456f96 JS |
3070 | return -1; |
3071 | } else { | |
a35edc84 | 3072 | int file_from_stage2 = was_tracked(o, path); |
51931bf0 | 3073 | struct diff_filespec merged; |
9b561499 | 3074 | oidcpy(&merged.oid, &mfi.oid); |
51931bf0 EN |
3075 | merged.mode = mfi.mode; |
3076 | ||
bc9204d4 | 3077 | if (update_stages(o, path, NULL, |
75456f96 JS |
3078 | file_from_stage2 ? &merged : NULL, |
3079 | file_from_stage2 ? NULL : &merged)) | |
3080 | return -1; | |
51931bf0 EN |
3081 | } |
3082 | ||
3083 | } | |
4f66dade | 3084 | new_path = unique_path(o, path, rename_conflict_info->branch1); |
bd42380e EN |
3085 | if (is_dirty) { |
3086 | output(o, 1, _("Refusing to lose dirty file at %s"), | |
3087 | path); | |
3088 | } | |
55653a68 | 3089 | output(o, 1, _("Adding as %s instead"), new_path); |
75456f96 JS |
3090 | if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) { |
3091 | free(new_path); | |
3092 | return -1; | |
3093 | } | |
3d6b8e88 | 3094 | free(new_path); |
51931bf0 | 3095 | mfi.clean = 0; |
75456f96 JS |
3096 | } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path)) |
3097 | return -1; | |
bd42380e | 3098 | return !is_dirty && mfi.clean; |
0c4918d1 EN |
3099 | } |
3100 | ||
64b1abe9 EN |
3101 | static int conflict_rename_normal(struct merge_options *o, |
3102 | const char *path, | |
3103 | struct object_id *o_oid, unsigned int o_mode, | |
3104 | struct object_id *a_oid, unsigned int a_mode, | |
3105 | struct object_id *b_oid, unsigned int b_mode, | |
3106 | struct rename_conflict_info *ci) | |
3107 | { | |
64b1abe9 | 3108 | /* Merge the content and write it out */ |
bd42380e EN |
3109 | return merge_content(o, path, was_dirty(o, path), |
3110 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, | |
3111 | ci); | |
0c4918d1 EN |
3112 | } |
3113 | ||
9047ebbc | 3114 | /* Per entry merge function */ |
8a2fce18 MV |
3115 | static int process_entry(struct merge_options *o, |
3116 | const char *path, struct stage_data *entry) | |
9047ebbc | 3117 | { |
9047ebbc | 3118 | int clean_merge = 1; |
1bc0ab7c | 3119 | int normalize = o->renormalize; |
9047ebbc MV |
3120 | unsigned o_mode = entry->stages[1].mode; |
3121 | unsigned a_mode = entry->stages[2].mode; | |
3122 | unsigned b_mode = entry->stages[3].mode; | |
b4da9d62 | 3123 | struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode); |
3124 | struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode); | |
3125 | struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode); | |
9047ebbc | 3126 | |
37348937 | 3127 | entry->processed = 1; |
4f66dade EN |
3128 | if (entry->rename_conflict_info) { |
3129 | struct rename_conflict_info *conflict_info = entry->rename_conflict_info; | |
07413c5a | 3130 | switch (conflict_info->rename_type) { |
882fd11a | 3131 | case RENAME_NORMAL: |
4f66dade | 3132 | case RENAME_ONE_FILE_TO_ONE: |
64b1abe9 EN |
3133 | clean_merge = conflict_rename_normal(o, |
3134 | path, | |
3135 | o_oid, o_mode, | |
3136 | a_oid, a_mode, | |
3137 | b_oid, b_mode, | |
3138 | conflict_info); | |
882fd11a | 3139 | break; |
9c0743fe EN |
3140 | case RENAME_DIR: |
3141 | clean_merge = 1; | |
3142 | if (conflict_rename_dir(o, | |
3143 | conflict_info->pair1, | |
3144 | conflict_info->branch1, | |
3145 | conflict_info->branch2)) | |
3146 | clean_merge = -1; | |
882fd11a | 3147 | break; |
3b130adf EN |
3148 | case RENAME_DELETE: |
3149 | clean_merge = 0; | |
75456f96 JS |
3150 | if (conflict_rename_delete(o, |
3151 | conflict_info->pair1, | |
3152 | conflict_info->branch1, | |
3153 | conflict_info->branch2)) | |
3154 | clean_merge = -1; | |
3b130adf | 3155 | break; |
07413c5a | 3156 | case RENAME_ONE_FILE_TO_TWO: |
07413c5a | 3157 | clean_merge = 0; |
75456f96 JS |
3158 | if (conflict_rename_rename_1to2(o, conflict_info)) |
3159 | clean_merge = -1; | |
07413c5a | 3160 | break; |
461f5041 EN |
3161 | case RENAME_TWO_FILES_TO_ONE: |
3162 | clean_merge = 0; | |
75456f96 JS |
3163 | if (conflict_rename_rename_2to1(o, conflict_info)) |
3164 | clean_merge = -1; | |
07413c5a EN |
3165 | break; |
3166 | default: | |
3167 | entry->processed = 0; | |
3168 | break; | |
3169 | } | |
b4da9d62 | 3170 | } else if (o_oid && (!a_oid || !b_oid)) { |
edd2faf5 | 3171 | /* Case A: Deleted in one */ |
b4da9d62 | 3172 | if ((!a_oid && !b_oid) || |
bc9204d4 JS |
3173 | (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) || |
3174 | (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) { | |
edd2faf5 EN |
3175 | /* Deleted in both or deleted in one and |
3176 | * unchanged in the other */ | |
b4da9d62 | 3177 | if (a_oid) |
55653a68 | 3178 | output(o, 2, _("Removing %s"), path); |
edd2faf5 | 3179 | /* do not touch working file if it did not exist */ |
b4da9d62 | 3180 | remove_file(o, 1, path, !a_oid); |
edd2faf5 EN |
3181 | } else { |
3182 | /* Modify/delete; deleted side may have put a directory in the way */ | |
edd2faf5 | 3183 | clean_merge = 0; |
75456f96 JS |
3184 | if (handle_modify_delete(o, path, o_oid, o_mode, |
3185 | a_oid, a_mode, b_oid, b_mode)) | |
3186 | clean_merge = -1; | |
3d6b8e88 | 3187 | } |
b4da9d62 | 3188 | } else if ((!o_oid && a_oid && !b_oid) || |
3189 | (!o_oid && !a_oid && b_oid)) { | |
edd2faf5 EN |
3190 | /* Case B: Added in one. */ |
3191 | /* [nothing|directory] -> ([nothing|directory], file) */ | |
3192 | ||
9c0bbb50 EN |
3193 | const char *add_branch; |
3194 | const char *other_branch; | |
3195 | unsigned mode; | |
b4da9d62 | 3196 | const struct object_id *oid; |
9c0bbb50 | 3197 | const char *conf; |
37348937 | 3198 | |
b4da9d62 | 3199 | if (a_oid) { |
9c0bbb50 EN |
3200 | add_branch = o->branch1; |
3201 | other_branch = o->branch2; | |
3202 | mode = a_mode; | |
b4da9d62 | 3203 | oid = a_oid; |
55653a68 | 3204 | conf = _("file/directory"); |
9c0bbb50 EN |
3205 | } else { |
3206 | add_branch = o->branch2; | |
3207 | other_branch = o->branch1; | |
3208 | mode = b_mode; | |
b4da9d62 | 3209 | oid = b_oid; |
55653a68 | 3210 | conf = _("directory/file"); |
9c0bbb50 | 3211 | } |
c641ca67 EN |
3212 | if (dir_in_way(path, |
3213 | !o->call_depth && !S_ISGITLINK(a_mode), | |
3214 | 0)) { | |
3d6b8e88 | 3215 | char *new_path = unique_path(o, path, add_branch); |
9c0bbb50 | 3216 | clean_merge = 0; |
55653a68 JX |
3217 | output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " |
3218 | "Adding %s as %s"), | |
9c0bbb50 | 3219 | conf, path, other_branch, path, new_path); |
75456f96 JS |
3220 | if (update_file(o, 0, oid, mode, new_path)) |
3221 | clean_merge = -1; | |
3222 | else if (o->call_depth) | |
7b1c610f | 3223 | remove_file_from_cache(path); |
3d6b8e88 | 3224 | free(new_path); |
9c0bbb50 | 3225 | } else { |
55653a68 | 3226 | output(o, 2, _("Adding %s"), path); |
35a74abf | 3227 | /* do not overwrite file if already present */ |
75456f96 JS |
3228 | if (update_file_flags(o, oid, mode, path, 1, !a_oid)) |
3229 | clean_merge = -1; | |
9c0bbb50 | 3230 | } |
b4da9d62 | 3231 | } else if (a_oid && b_oid) { |
edd2faf5 EN |
3232 | /* Case C: Added in both (check for same permissions) and */ |
3233 | /* case D: Modified in both, but differently. */ | |
bd42380e EN |
3234 | int is_dirty = 0; /* unpack_trees would have bailed if dirty */ |
3235 | clean_merge = merge_content(o, path, is_dirty, | |
b4da9d62 | 3236 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, |
edd2faf5 | 3237 | NULL); |
b4da9d62 | 3238 | } else if (!o_oid && !a_oid && !b_oid) { |
edd2faf5 EN |
3239 | /* |
3240 | * this entry was deleted altogether. a_mode == 0 means | |
3241 | * we had that path and want to actively remove it. | |
3242 | */ | |
3243 | remove_file(o, 1, path, !a_mode); | |
3244 | } else | |
033abf97 | 3245 | BUG("fatal merge failure, shouldn't happen."); |
37348937 EN |
3246 | |
3247 | return clean_merge; | |
3248 | } | |
3249 | ||
8a2fce18 MV |
3250 | int merge_trees(struct merge_options *o, |
3251 | struct tree *head, | |
9047ebbc MV |
3252 | struct tree *merge, |
3253 | struct tree *common, | |
9047ebbc MV |
3254 | struct tree **result) |
3255 | { | |
3256 | int code, clean; | |
3257 | ||
85e51b78 JH |
3258 | if (o->subtree_shift) { |
3259 | merge = shift_tree_object(head, merge, o->subtree_shift); | |
3260 | common = shift_tree_object(head, common, o->subtree_shift); | |
9047ebbc MV |
3261 | } |
3262 | ||
b4da9d62 | 3263 | if (oid_eq(&common->object.oid, &merge->object.oid)) { |
65170c07 EN |
3264 | struct strbuf sb = STRBUF_INIT; |
3265 | ||
f309e8e7 | 3266 | if (!o->call_depth && index_has_changes(&sb)) { |
65170c07 EN |
3267 | err(o, _("Dirty index: cannot merge (dirty: %s)"), |
3268 | sb.buf); | |
3269 | return 0; | |
3270 | } | |
7560f547 | 3271 | output(o, 0, _("Already up to date!")); |
9047ebbc MV |
3272 | *result = head; |
3273 | return 1; | |
3274 | } | |
3275 | ||
3f1c1c36 | 3276 | code = unpack_trees_start(o, common, head, merge); |
9047ebbc | 3277 | |
fadd069d JH |
3278 | if (code != 0) { |
3279 | if (show(o, 4) || o->call_depth) | |
bc9204d4 | 3280 | err(o, _("merging of trees %s and %s failed"), |
f2fd0760 | 3281 | oid_to_hex(&head->object.oid), |
3282 | oid_to_hex(&merge->object.oid)); | |
3f1c1c36 | 3283 | unpack_trees_finish(o); |
6003303a | 3284 | return -1; |
fadd069d | 3285 | } |
9047ebbc MV |
3286 | |
3287 | if (unmerged_cache()) { | |
f172589e EN |
3288 | struct string_list *entries; |
3289 | struct rename_info re_info; | |
9047ebbc | 3290 | int i; |
fc65b00d KW |
3291 | /* |
3292 | * Only need the hashmap while processing entries, so | |
3293 | * initialize it here and free it when we are done running | |
3294 | * through the entries. Keeping it in the merge_options as | |
3295 | * opposed to decaring a local hashmap is for convenience | |
3296 | * so that we don't have to pass it to around. | |
3297 | */ | |
3298 | hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512); | |
696ee23c MV |
3299 | get_files_dirs(o, head); |
3300 | get_files_dirs(o, merge); | |
9047ebbc MV |
3301 | |
3302 | entries = get_unmerged(); | |
f172589e EN |
3303 | clean = handle_renames(o, common, head, merge, entries, |
3304 | &re_info); | |
6c8647da | 3305 | record_df_conflict_files(o, entries); |
75456f96 | 3306 | if (clean < 0) |
e336bdc5 | 3307 | goto cleanup; |
edd2faf5 | 3308 | for (i = entries->nr-1; 0 <= i; i--) { |
9047ebbc MV |
3309 | const char *path = entries->items[i].string; |
3310 | struct stage_data *e = entries->items[i].util; | |
75456f96 JS |
3311 | if (!e->processed) { |
3312 | int ret = process_entry(o, path, e); | |
3313 | if (!ret) | |
3314 | clean = 0; | |
e336bdc5 KW |
3315 | else if (ret < 0) { |
3316 | clean = ret; | |
3317 | goto cleanup; | |
3318 | } | |
75456f96 | 3319 | } |
9047ebbc | 3320 | } |
7edba4c4 JH |
3321 | for (i = 0; i < entries->nr; i++) { |
3322 | struct stage_data *e = entries->items[i].util; | |
3323 | if (!e->processed) | |
033abf97 | 3324 | BUG("unprocessed path??? %s", |
7edba4c4 JH |
3325 | entries->items[i].string); |
3326 | } | |
9047ebbc | 3327 | |
e336bdc5 | 3328 | cleanup: |
ffc16c49 | 3329 | final_cleanup_renames(&re_info); |
f172589e | 3330 | |
9047ebbc | 3331 | string_list_clear(entries, 1); |
f172589e | 3332 | free(entries); |
9047ebbc | 3333 | |
fc65b00d KW |
3334 | hashmap_free(&o->current_file_dir_set, 1); |
3335 | ||
3f1c1c36 EN |
3336 | if (clean < 0) { |
3337 | unpack_trees_finish(o); | |
e336bdc5 | 3338 | return clean; |
3f1c1c36 | 3339 | } |
9047ebbc MV |
3340 | } |
3341 | else | |
3342 | clean = 1; | |
3343 | ||
3f1c1c36 | 3344 | unpack_trees_finish(o); |
a35edc84 | 3345 | |
fbc87eb5 JS |
3346 | if (o->call_depth && !(*result = write_tree_from_memory(o))) |
3347 | return -1; | |
9047ebbc MV |
3348 | |
3349 | return clean; | |
3350 | } | |
3351 | ||
3352 | static struct commit_list *reverse_commit_list(struct commit_list *list) | |
3353 | { | |
3354 | struct commit_list *next = NULL, *current, *backup; | |
3355 | for (current = list; current; current = backup) { | |
3356 | backup = current->next; | |
3357 | current->next = next; | |
3358 | next = current; | |
3359 | } | |
3360 | return next; | |
3361 | } | |
3362 | ||
3363 | /* | |
3364 | * Merge the commits h1 and h2, return the resulting virtual | |
3365 | * commit object and a flag indicating the cleanness of the merge. | |
3366 | */ | |
8a2fce18 MV |
3367 | int merge_recursive(struct merge_options *o, |
3368 | struct commit *h1, | |
9047ebbc | 3369 | struct commit *h2, |
9047ebbc MV |
3370 | struct commit_list *ca, |
3371 | struct commit **result) | |
3372 | { | |
3373 | struct commit_list *iter; | |
3374 | struct commit *merged_common_ancestors; | |
156e1782 | 3375 | struct tree *mrtree; |
9047ebbc MV |
3376 | int clean; |
3377 | ||
8a2fce18 | 3378 | if (show(o, 4)) { |
55653a68 | 3379 | output(o, 4, _("Merging:")); |
5033639c MV |
3380 | output_commit_title(o, h1); |
3381 | output_commit_title(o, h2); | |
9047ebbc MV |
3382 | } |
3383 | ||
3384 | if (!ca) { | |
2ce406cc | 3385 | ca = get_merge_bases(h1, h2); |
9047ebbc MV |
3386 | ca = reverse_commit_list(ca); |
3387 | } | |
3388 | ||
8a2fce18 | 3389 | if (show(o, 5)) { |
e0453cd8 RT |
3390 | unsigned cnt = commit_list_count(ca); |
3391 | ||
3392 | output(o, 5, Q_("found %u common ancestor:", | |
3393 | "found %u common ancestors:", cnt), cnt); | |
9047ebbc | 3394 | for (iter = ca; iter; iter = iter->next) |
5033639c | 3395 | output_commit_title(o, iter->item); |
9047ebbc MV |
3396 | } |
3397 | ||
3398 | merged_common_ancestors = pop_commit(&ca); | |
3399 | if (merged_common_ancestors == NULL) { | |
03f622c8 JN |
3400 | /* if there is no common ancestor, use an empty tree */ |
3401 | struct tree *tree; | |
9047ebbc | 3402 | |
eb0ccfd7 | 3403 | tree = lookup_tree(the_hash_algo->empty_tree); |
9047ebbc MV |
3404 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); |
3405 | } | |
3406 | ||
3407 | for (iter = ca; iter; iter = iter->next) { | |
8a2fce18 | 3408 | const char *saved_b1, *saved_b2; |
5033639c | 3409 | o->call_depth++; |
9047ebbc MV |
3410 | /* |
3411 | * When the merge fails, the result contains files | |
3412 | * with conflict markers. The cleanness flag is | |
de8946de JS |
3413 | * ignored (unless indicating an error), it was never |
3414 | * actually used, as result of merge_trees has always | |
3415 | * overwritten it: the committed "conflicts" were | |
3416 | * already resolved. | |
9047ebbc MV |
3417 | */ |
3418 | discard_cache(); | |
8a2fce18 MV |
3419 | saved_b1 = o->branch1; |
3420 | saved_b2 = o->branch2; | |
3421 | o->branch1 = "Temporary merge branch 1"; | |
3422 | o->branch2 = "Temporary merge branch 2"; | |
de8946de JS |
3423 | if (merge_recursive(o, merged_common_ancestors, iter->item, |
3424 | NULL, &merged_common_ancestors) < 0) | |
3425 | return -1; | |
8a2fce18 MV |
3426 | o->branch1 = saved_b1; |
3427 | o->branch2 = saved_b2; | |
5033639c | 3428 | o->call_depth--; |
9047ebbc MV |
3429 | |
3430 | if (!merged_common_ancestors) | |
bc9204d4 | 3431 | return err(o, _("merge returned no commit")); |
9047ebbc MV |
3432 | } |
3433 | ||
3434 | discard_cache(); | |
b7fa51da | 3435 | if (!o->call_depth) |
9047ebbc | 3436 | read_cache(); |
9047ebbc | 3437 | |
7ca56aa0 | 3438 | o->ancestor = "merged common ancestors"; |
2e27bd77 DS |
3439 | clean = merge_trees(o, get_commit_tree(h1), get_commit_tree(h2), |
3440 | get_commit_tree(merged_common_ancestors), | |
8a2fce18 | 3441 | &mrtree); |
6999bc70 JS |
3442 | if (clean < 0) { |
3443 | flush_output(o); | |
de8946de | 3444 | return clean; |
6999bc70 | 3445 | } |
9047ebbc | 3446 | |
b7fa51da | 3447 | if (o->call_depth) { |
9047ebbc MV |
3448 | *result = make_virtual_commit(mrtree, "merged tree"); |
3449 | commit_list_insert(h1, &(*result)->parents); | |
3450 | commit_list_insert(h2, &(*result)->parents->next); | |
3451 | } | |
c7d84924 | 3452 | flush_output(o); |
548009c0 JS |
3453 | if (!o->call_depth && o->buffer_output < 2) |
3454 | strbuf_release(&o->obuf); | |
f31027c9 JH |
3455 | if (show(o, 2)) |
3456 | diff_warn_rename_limit("merge.renamelimit", | |
3457 | o->needed_rename_limit, 0); | |
9047ebbc MV |
3458 | return clean; |
3459 | } | |
3460 | ||
4e8161a8 | 3461 | static struct commit *get_ref(const struct object_id *oid, const char *name) |
73118f89 SB |
3462 | { |
3463 | struct object *object; | |
3464 | ||
c251c83d | 3465 | object = deref_tag(parse_object(oid), name, strlen(name)); |
73118f89 SB |
3466 | if (!object) |
3467 | return NULL; | |
3468 | if (object->type == OBJ_TREE) | |
3469 | return make_virtual_commit((struct tree*)object, name); | |
3470 | if (object->type != OBJ_COMMIT) | |
3471 | return NULL; | |
3472 | if (parse_commit((struct commit *)object)) | |
3473 | return NULL; | |
3474 | return (struct commit *)object; | |
3475 | } | |
3476 | ||
8a2fce18 | 3477 | int merge_recursive_generic(struct merge_options *o, |
4e8161a8 | 3478 | const struct object_id *head, |
3479 | const struct object_id *merge, | |
8a2fce18 | 3480 | int num_base_list, |
4e8161a8 | 3481 | const struct object_id **base_list, |
8a2fce18 | 3482 | struct commit **result) |
73118f89 | 3483 | { |
03b86647 | 3484 | int clean; |
837e34eb | 3485 | struct lock_file lock = LOCK_INIT; |
8a2fce18 MV |
3486 | struct commit *head_commit = get_ref(head, o->branch1); |
3487 | struct commit *next_commit = get_ref(merge, o->branch2); | |
73118f89 SB |
3488 | struct commit_list *ca = NULL; |
3489 | ||
3490 | if (base_list) { | |
3491 | int i; | |
8a2fce18 | 3492 | for (i = 0; i < num_base_list; ++i) { |
73118f89 | 3493 | struct commit *base; |
4e8161a8 | 3494 | if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i])))) |
bc9204d4 | 3495 | return err(o, _("Could not parse object '%s'"), |
4e8161a8 | 3496 | oid_to_hex(base_list[i])); |
73118f89 SB |
3497 | commit_list_insert(base, &ca); |
3498 | } | |
3499 | } | |
3500 | ||
837e34eb | 3501 | hold_locked_index(&lock, LOCK_DIE_ON_ERROR); |
8a2fce18 MV |
3502 | clean = merge_recursive(o, head_commit, next_commit, ca, |
3503 | result); | |
51d3f43d MÅ |
3504 | if (clean < 0) { |
3505 | rollback_lock_file(&lock); | |
de8946de | 3506 | return clean; |
51d3f43d | 3507 | } |
de8946de | 3508 | |
61000814 MÅ |
3509 | if (write_locked_index(&the_index, &lock, |
3510 | COMMIT_LOCK | SKIP_IF_UNCHANGED)) | |
bc9204d4 | 3511 | return err(o, _("Unable to write index.")); |
73118f89 SB |
3512 | |
3513 | return clean ? 0 : 1; | |
3514 | } | |
3515 | ||
0e7bcb1b | 3516 | static void merge_recursive_config(struct merge_options *o) |
9047ebbc | 3517 | { |
85b46030 | 3518 | char *value = NULL; |
0e7bcb1b TA |
3519 | git_config_get_int("merge.verbosity", &o->verbosity); |
3520 | git_config_get_int("diff.renamelimit", &o->diff_rename_limit); | |
3521 | git_config_get_int("merge.renamelimit", &o->merge_rename_limit); | |
85b46030 BP |
3522 | if (!git_config_get_string("diff.renames", &value)) { |
3523 | o->diff_detect_rename = git_config_rename("diff.renames", value); | |
3524 | free(value); | |
3525 | } | |
3526 | if (!git_config_get_string("merge.renames", &value)) { | |
3527 | o->merge_detect_rename = git_config_rename("merge.renames", value); | |
3528 | free(value); | |
3529 | } | |
0e7bcb1b | 3530 | git_config(git_xmerge_config, NULL); |
9047ebbc MV |
3531 | } |
3532 | ||
8a2fce18 | 3533 | void init_merge_options(struct merge_options *o) |
9047ebbc | 3534 | { |
80486220 | 3535 | const char *merge_verbosity; |
8a2fce18 MV |
3536 | memset(o, 0, sizeof(struct merge_options)); |
3537 | o->verbosity = 2; | |
3538 | o->buffer_output = 1; | |
3539 | o->diff_rename_limit = -1; | |
3540 | o->merge_rename_limit = -1; | |
7610fa57 | 3541 | o->renormalize = 0; |
85b46030 BP |
3542 | o->diff_detect_rename = -1; |
3543 | o->merge_detect_rename = -1; | |
0e7bcb1b | 3544 | merge_recursive_config(o); |
80486220 AO |
3545 | merge_verbosity = getenv("GIT_MERGE_VERBOSITY"); |
3546 | if (merge_verbosity) | |
3547 | o->verbosity = strtol(merge_verbosity, NULL, 10); | |
8a2fce18 MV |
3548 | if (o->verbosity >= 5) |
3549 | o->buffer_output = 0; | |
c7d84924 | 3550 | strbuf_init(&o->obuf, 0); |
f93d7c6f | 3551 | string_list_init(&o->df_conflict_file_set, 1); |
9047ebbc | 3552 | } |
635a7bb1 JN |
3553 | |
3554 | int parse_merge_opt(struct merge_options *o, const char *s) | |
3555 | { | |
95b567c7 JK |
3556 | const char *arg; |
3557 | ||
635a7bb1 JN |
3558 | if (!s || !*s) |
3559 | return -1; | |
3560 | if (!strcmp(s, "ours")) | |
3561 | o->recursive_variant = MERGE_RECURSIVE_OURS; | |
3562 | else if (!strcmp(s, "theirs")) | |
3563 | o->recursive_variant = MERGE_RECURSIVE_THEIRS; | |
3564 | else if (!strcmp(s, "subtree")) | |
3565 | o->subtree_shift = ""; | |
95b567c7 JK |
3566 | else if (skip_prefix(s, "subtree=", &arg)) |
3567 | o->subtree_shift = arg; | |
58a1ece4 | 3568 | else if (!strcmp(s, "patience")) |
307ab20b | 3569 | o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); |
8c912eea | 3570 | else if (!strcmp(s, "histogram")) |
307ab20b | 3571 | o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); |
95b567c7 JK |
3572 | else if (skip_prefix(s, "diff-algorithm=", &arg)) { |
3573 | long value = parse_algorithm_value(arg); | |
07924d4d MP |
3574 | if (value < 0) |
3575 | return -1; | |
3576 | /* clear out previous settings */ | |
3577 | DIFF_XDL_CLR(o, NEED_MINIMAL); | |
3578 | o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; | |
3579 | o->xdl_opts |= value; | |
3580 | } | |
4e5dd044 | 3581 | else if (!strcmp(s, "ignore-space-change")) |
c2d4b4cd | 3582 | DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE); |
4e5dd044 | 3583 | else if (!strcmp(s, "ignore-all-space")) |
c2d4b4cd | 3584 | DIFF_XDL_SET(o, IGNORE_WHITESPACE); |
4e5dd044 | 3585 | else if (!strcmp(s, "ignore-space-at-eol")) |
c2d4b4cd | 3586 | DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL); |
e9282f02 JH |
3587 | else if (!strcmp(s, "ignore-cr-at-eol")) |
3588 | DIFF_XDL_SET(o, IGNORE_CR_AT_EOL); | |
635a7bb1 JN |
3589 | else if (!strcmp(s, "renormalize")) |
3590 | o->renormalize = 1; | |
3591 | else if (!strcmp(s, "no-renormalize")) | |
3592 | o->renormalize = 0; | |
d2b11eca | 3593 | else if (!strcmp(s, "no-renames")) |
85b46030 | 3594 | o->merge_detect_rename = 0; |
87892f60 | 3595 | else if (!strcmp(s, "find-renames")) { |
85b46030 | 3596 | o->merge_detect_rename = 1; |
87892f60 FGA |
3597 | o->rename_score = 0; |
3598 | } | |
1b47ad16 FGA |
3599 | else if (skip_prefix(s, "find-renames=", &arg) || |
3600 | skip_prefix(s, "rename-threshold=", &arg)) { | |
95b567c7 | 3601 | if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0) |
10ae7526 | 3602 | return -1; |
85b46030 | 3603 | o->merge_detect_rename = 1; |
10ae7526 | 3604 | } |
635a7bb1 JN |
3605 | else |
3606 | return -1; | |
3607 | return 0; | |
3608 | } |