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