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