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