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