]>
Commit | Line | Data |
---|---|---|
9047ebbc MV |
1 | /* |
2 | * Recursive Merge algorithm stolen from git-merge-recursive.py by | |
3 | * Fredrik Kuivinen. | |
4 | * The thieves were Alex Riesen and Johannes Schindelin, in June/July 2006 | |
5 | */ | |
6 | #include "cache.h" | |
b2141fc1 | 7 | #include "config.h" |
1c4b6604 | 8 | #include "advice.h" |
697cc8ef | 9 | #include "lockfile.h" |
9047ebbc MV |
10 | #include "cache-tree.h" |
11 | #include "commit.h" | |
12 | #include "blob.h" | |
13 | #include "builtin.h" | |
14 | #include "tree-walk.h" | |
15 | #include "diff.h" | |
16 | #include "diffcore.h" | |
17 | #include "tag.h" | |
18 | #include "unpack-trees.h" | |
19 | #include "string-list.h" | |
20 | #include "xdiff-interface.h" | |
21 | #include "ll-merge.h" | |
9047ebbc MV |
22 | #include "attr.h" |
23 | #include "merge-recursive.h" | |
9800c0df | 24 | #include "dir.h" |
68d03e4a | 25 | #include "submodule.h" |
9047ebbc | 26 | |
fc65b00d KW |
27 | struct path_hashmap_entry { |
28 | struct hashmap_entry e; | |
29 | char path[FLEX_ARRAY]; | |
30 | }; | |
31 | ||
32 | static int path_hashmap_cmp(const void *cmp_data, | |
33 | const void *entry, | |
34 | const void *entry_or_key, | |
35 | const void *keydata) | |
36 | { | |
37 | const struct path_hashmap_entry *a = entry; | |
38 | const struct path_hashmap_entry *b = entry_or_key; | |
39 | const char *key = keydata; | |
40 | ||
41 | if (ignore_case) | |
42 | return strcasecmp(a->path, key ? key : b->path); | |
43 | else | |
44 | return strcmp(a->path, key ? key : b->path); | |
45 | } | |
46 | ||
47 | static unsigned int path_hash(const char *path) | |
48 | { | |
49 | return ignore_case ? strihash(path) : strhash(path); | |
50 | } | |
51 | ||
8383408d EN |
52 | static struct dir_rename_entry *dir_rename_find_entry(struct hashmap *hashmap, |
53 | char *dir) | |
54 | { | |
55 | struct dir_rename_entry key; | |
56 | ||
57 | if (dir == NULL) | |
58 | return NULL; | |
59 | hashmap_entry_init(&key, strhash(dir)); | |
60 | key.dir = dir; | |
61 | return hashmap_get(hashmap, &key, NULL); | |
62 | } | |
63 | ||
64 | static int dir_rename_cmp(const void *unused_cmp_data, | |
65 | const void *entry, | |
66 | const void *entry_or_key, | |
67 | const void *unused_keydata) | |
68 | { | |
69 | const struct dir_rename_entry *e1 = entry; | |
70 | const struct dir_rename_entry *e2 = entry_or_key; | |
71 | ||
72 | return strcmp(e1->dir, e2->dir); | |
73 | } | |
74 | ||
75 | static void dir_rename_init(struct hashmap *map) | |
76 | { | |
77 | hashmap_init(map, dir_rename_cmp, NULL, 0); | |
78 | } | |
79 | ||
80 | static void dir_rename_entry_init(struct dir_rename_entry *entry, | |
81 | char *directory) | |
82 | { | |
83 | hashmap_entry_init(entry, strhash(directory)); | |
84 | entry->dir = directory; | |
85 | entry->non_unique_new_dir = 0; | |
86 | strbuf_init(&entry->new_dir, 0); | |
87 | string_list_init(&entry->possible_new_dirs, 0); | |
88 | } | |
89 | ||
ea625cb0 EN |
90 | static struct collision_entry *collision_find_entry(struct hashmap *hashmap, |
91 | char *target_file) | |
92 | { | |
93 | struct collision_entry key; | |
94 | ||
95 | hashmap_entry_init(&key, strhash(target_file)); | |
96 | key.target_file = target_file; | |
97 | return hashmap_get(hashmap, &key, NULL); | |
98 | } | |
99 | ||
100 | static int collision_cmp(void *unused_cmp_data, | |
101 | const struct collision_entry *e1, | |
102 | const struct collision_entry *e2, | |
103 | const void *unused_keydata) | |
104 | { | |
105 | return strcmp(e1->target_file, e2->target_file); | |
106 | } | |
107 | ||
108 | static void collision_init(struct hashmap *map) | |
109 | { | |
110 | hashmap_init(map, (hashmap_cmp_fn) collision_cmp, NULL, 0); | |
111 | } | |
112 | ||
bc9204d4 JS |
113 | static void flush_output(struct merge_options *o) |
114 | { | |
f1e2426b | 115 | if (o->buffer_output < 2 && o->obuf.len) { |
bc9204d4 JS |
116 | fputs(o->obuf.buf, stdout); |
117 | strbuf_reset(&o->obuf); | |
118 | } | |
119 | } | |
120 | ||
121 | static int err(struct merge_options *o, const char *err, ...) | |
122 | { | |
123 | va_list params; | |
124 | ||
f1e2426b JS |
125 | if (o->buffer_output < 2) |
126 | flush_output(o); | |
127 | else { | |
128 | strbuf_complete(&o->obuf, '\n'); | |
129 | strbuf_addstr(&o->obuf, "error: "); | |
130 | } | |
bc9204d4 JS |
131 | va_start(params, err); |
132 | strbuf_vaddf(&o->obuf, err, params); | |
133 | va_end(params); | |
f1e2426b JS |
134 | if (o->buffer_output > 1) |
135 | strbuf_addch(&o->obuf, '\n'); | |
136 | else { | |
137 | error("%s", o->obuf.buf); | |
138 | strbuf_reset(&o->obuf); | |
139 | } | |
bc9204d4 JS |
140 | |
141 | return -1; | |
142 | } | |
143 | ||
85e51b78 JH |
144 | static struct tree *shift_tree_object(struct tree *one, struct tree *two, |
145 | const char *subtree_shift) | |
9047ebbc | 146 | { |
f2fd0760 | 147 | struct object_id shifted; |
9047ebbc | 148 | |
85e51b78 | 149 | if (!*subtree_shift) { |
82db3d44 | 150 | shift_tree(&one->object.oid, &two->object.oid, &shifted, 0); |
85e51b78 | 151 | } else { |
82db3d44 | 152 | shift_tree_by(&one->object.oid, &two->object.oid, &shifted, |
85e51b78 JH |
153 | subtree_shift); |
154 | } | |
f2fd0760 | 155 | if (!oidcmp(&two->object.oid, &shifted)) |
9047ebbc | 156 | return two; |
740ee055 | 157 | return lookup_tree(&shifted); |
9047ebbc MV |
158 | } |
159 | ||
2af202be | 160 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) |
9047ebbc | 161 | { |
10322a0a | 162 | struct commit *commit = alloc_commit_node(); |
ae8e4c9c | 163 | |
a2571653 | 164 | set_merge_remote_desc(commit, comment, (struct object *)commit); |
9047ebbc | 165 | commit->tree = tree; |
9047ebbc MV |
166 | commit->object.parsed = 1; |
167 | return commit; | |
168 | } | |
169 | ||
170 | /* | |
171 | * Since we use get_tree_entry(), which does not put the read object into | |
172 | * the object pool, we cannot rely on a == b. | |
173 | */ | |
b4da9d62 | 174 | static int oid_eq(const struct object_id *a, const struct object_id *b) |
9047ebbc MV |
175 | { |
176 | if (!a && !b) | |
177 | return 2; | |
b4da9d62 | 178 | return a && b && oidcmp(a, b) == 0; |
9047ebbc MV |
179 | } |
180 | ||
25c39363 EN |
181 | enum rename_type { |
182 | RENAME_NORMAL = 0, | |
183 | RENAME_DELETE, | |
4f66dade | 184 | RENAME_ONE_FILE_TO_ONE, |
461f5041 EN |
185 | RENAME_ONE_FILE_TO_TWO, |
186 | RENAME_TWO_FILES_TO_ONE | |
25c39363 EN |
187 | }; |
188 | ||
4f66dade | 189 | struct rename_conflict_info { |
25c39363 EN |
190 | enum rename_type rename_type; |
191 | struct diff_filepair *pair1; | |
192 | struct diff_filepair *pair2; | |
193 | const char *branch1; | |
194 | const char *branch2; | |
195 | struct stage_data *dst_entry1; | |
196 | struct stage_data *dst_entry2; | |
232c635f EN |
197 | struct diff_filespec ren1_other; |
198 | struct diff_filespec ren2_other; | |
25c39363 EN |
199 | }; |
200 | ||
9047ebbc MV |
201 | /* |
202 | * Since we want to write the index eventually, we cannot reuse the index | |
203 | * for these (temporary) data. | |
204 | */ | |
9cba13ca JN |
205 | struct stage_data { |
206 | struct { | |
9047ebbc | 207 | unsigned mode; |
fd429e98 | 208 | struct object_id oid; |
9047ebbc | 209 | } stages[4]; |
4f66dade | 210 | struct rename_conflict_info *rename_conflict_info; |
9047ebbc MV |
211 | unsigned processed:1; |
212 | }; | |
213 | ||
4f66dade EN |
214 | static inline void setup_rename_conflict_info(enum rename_type rename_type, |
215 | struct diff_filepair *pair1, | |
216 | struct diff_filepair *pair2, | |
217 | const char *branch1, | |
218 | const char *branch2, | |
219 | struct stage_data *dst_entry1, | |
232c635f EN |
220 | struct stage_data *dst_entry2, |
221 | struct merge_options *o, | |
222 | struct stage_data *src_entry1, | |
223 | struct stage_data *src_entry2) | |
25c39363 | 224 | { |
4f66dade | 225 | struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info)); |
25c39363 EN |
226 | ci->rename_type = rename_type; |
227 | ci->pair1 = pair1; | |
228 | ci->branch1 = branch1; | |
229 | ci->branch2 = branch2; | |
230 | ||
231 | ci->dst_entry1 = dst_entry1; | |
4f66dade | 232 | dst_entry1->rename_conflict_info = ci; |
25c39363 EN |
233 | dst_entry1->processed = 0; |
234 | ||
235 | assert(!pair2 == !dst_entry2); | |
236 | if (dst_entry2) { | |
237 | ci->dst_entry2 = dst_entry2; | |
238 | ci->pair2 = pair2; | |
4f66dade | 239 | dst_entry2->rename_conflict_info = ci; |
25c39363 | 240 | } |
232c635f EN |
241 | |
242 | if (rename_type == RENAME_TWO_FILES_TO_ONE) { | |
243 | /* | |
244 | * For each rename, there could have been | |
245 | * modifications on the side of history where that | |
246 | * file was not renamed. | |
247 | */ | |
248 | int ostage1 = o->branch1 == branch1 ? 3 : 2; | |
249 | int ostage2 = ostage1 ^ 1; | |
250 | ||
251 | ci->ren1_other.path = pair1->one->path; | |
fd429e98 | 252 | oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid); |
232c635f EN |
253 | ci->ren1_other.mode = src_entry1->stages[ostage1].mode; |
254 | ||
255 | ci->ren2_other.path = pair2->one->path; | |
fd429e98 | 256 | oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid); |
232c635f | 257 | ci->ren2_other.mode = src_entry2->stages[ostage2].mode; |
25c39363 EN |
258 | } |
259 | } | |
260 | ||
8a2fce18 | 261 | static int show(struct merge_options *o, int v) |
9047ebbc | 262 | { |
5033639c | 263 | return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5; |
9047ebbc MV |
264 | } |
265 | ||
28bea9e5 | 266 | __attribute__((format (printf, 3, 4))) |
8a2fce18 | 267 | static void output(struct merge_options *o, int v, const char *fmt, ...) |
9047ebbc | 268 | { |
9047ebbc MV |
269 | va_list ap; |
270 | ||
8a2fce18 | 271 | if (!show(o, v)) |
9047ebbc MV |
272 | return; |
273 | ||
415792ed | 274 | strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); |
9047ebbc MV |
275 | |
276 | va_start(ap, fmt); | |
ebeb6090 | 277 | strbuf_vaddf(&o->obuf, fmt, ap); |
9047ebbc MV |
278 | va_end(ap); |
279 | ||
294b2680 | 280 | strbuf_addch(&o->obuf, '\n'); |
8a2fce18 | 281 | if (!o->buffer_output) |
c7d84924 | 282 | flush_output(o); |
9047ebbc MV |
283 | } |
284 | ||
5033639c | 285 | static void output_commit_title(struct merge_options *o, struct commit *commit) |
9047ebbc | 286 | { |
dde75cb0 | 287 | strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); |
9047ebbc | 288 | if (commit->util) |
dde75cb0 JS |
289 | strbuf_addf(&o->obuf, "virtual %s\n", |
290 | merge_remote_util(commit)->name); | |
9047ebbc | 291 | else { |
a94bb683 RS |
292 | strbuf_add_unique_abbrev(&o->obuf, commit->object.oid.hash, |
293 | DEFAULT_ABBREV); | |
294 | strbuf_addch(&o->obuf, ' '); | |
9047ebbc | 295 | if (parse_commit(commit) != 0) |
a22ae753 | 296 | strbuf_addstr(&o->obuf, _("(bad commit)\n")); |
9047ebbc | 297 | else { |
49b7120e | 298 | const char *title; |
8597ea3a | 299 | const char *msg = get_commit_buffer(commit, NULL); |
bc6b8fc1 | 300 | int len = find_commit_subject(msg, &title); |
49b7120e | 301 | if (len) |
dde75cb0 | 302 | strbuf_addf(&o->obuf, "%.*s\n", len, title); |
bc6b8fc1 | 303 | unuse_commit_buffer(commit, msg); |
9047ebbc MV |
304 | } |
305 | } | |
dde75cb0 | 306 | flush_output(o); |
9047ebbc MV |
307 | } |
308 | ||
bc9204d4 JS |
309 | static int add_cacheinfo(struct merge_options *o, |
310 | unsigned int mode, const struct object_id *oid, | |
9047ebbc MV |
311 | const char *path, int stage, int refresh, int options) |
312 | { | |
313 | struct cache_entry *ce; | |
1335d76e JH |
314 | int ret; |
315 | ||
21bed620 | 316 | ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, 0); |
9047ebbc | 317 | if (!ce) |
bc9204d4 | 318 | return err(o, _("addinfo_cache failed for path '%s'"), path); |
1335d76e JH |
319 | |
320 | ret = add_cache_entry(ce, options); | |
321 | if (refresh) { | |
322 | struct cache_entry *nce; | |
323 | ||
324 | nce = refresh_cache_entry(ce, CE_MATCH_REFRESH | CE_MATCH_IGNORE_MISSING); | |
55e9f0e5 | 325 | if (!nce) |
1749053d | 326 | return err(o, _("addinfo_cache failed for path '%s'"), path); |
1335d76e JH |
327 | if (nce != ce) |
328 | ret = add_cache_entry(nce, options); | |
329 | } | |
330 | return ret; | |
9047ebbc MV |
331 | } |
332 | ||
9047ebbc MV |
333 | static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) |
334 | { | |
335 | parse_tree(tree); | |
336 | init_tree_desc(desc, tree->buffer, tree->size); | |
337 | } | |
338 | ||
339 | static int git_merge_trees(int index_only, | |
340 | struct tree *common, | |
341 | struct tree *head, | |
342 | struct tree *merge) | |
343 | { | |
344 | int rc; | |
345 | struct tree_desc t[3]; | |
346 | struct unpack_trees_options opts; | |
347 | ||
348 | memset(&opts, 0, sizeof(opts)); | |
349 | if (index_only) | |
350 | opts.index_only = 1; | |
351 | else | |
352 | opts.update = 1; | |
353 | opts.merge = 1; | |
354 | opts.head_idx = 2; | |
355 | opts.fn = threeway_merge; | |
356 | opts.src_index = &the_index; | |
357 | opts.dst_index = &the_index; | |
e294030f | 358 | setup_unpack_trees_porcelain(&opts, "merge"); |
9047ebbc MV |
359 | |
360 | init_tree_desc_from_tree(t+0, common); | |
361 | init_tree_desc_from_tree(t+1, head); | |
362 | init_tree_desc_from_tree(t+2, merge); | |
363 | ||
364 | rc = unpack_trees(3, t, &opts); | |
365 | cache_tree_free(&active_cache_tree); | |
366 | return rc; | |
367 | } | |
368 | ||
8a2fce18 | 369 | struct tree *write_tree_from_memory(struct merge_options *o) |
9047ebbc MV |
370 | { |
371 | struct tree *result = NULL; | |
372 | ||
373 | if (unmerged_cache()) { | |
374 | int i; | |
19c6a4f8 | 375 | fprintf(stderr, "BUG: There are unmerged index entries:\n"); |
9047ebbc | 376 | for (i = 0; i < active_nr; i++) { |
9c5e6c80 | 377 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc | 378 | if (ce_stage(ce)) |
c43ba42e | 379 | fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), |
19c6a4f8 | 380 | (int)ce_namelen(ce), ce->name); |
9047ebbc | 381 | } |
ef1177d1 | 382 | die("BUG: unmerged index entries in merge-recursive.c"); |
9047ebbc MV |
383 | } |
384 | ||
385 | if (!active_cache_tree) | |
386 | active_cache_tree = cache_tree(); | |
387 | ||
388 | if (!cache_tree_fully_valid(active_cache_tree) && | |
6003303a | 389 | cache_tree_update(&the_index, 0) < 0) { |
bc9204d4 | 390 | err(o, _("error building trees")); |
6003303a JS |
391 | return NULL; |
392 | } | |
9047ebbc | 393 | |
740ee055 | 394 | result = lookup_tree(&active_cache_tree->oid); |
9047ebbc MV |
395 | |
396 | return result; | |
397 | } | |
398 | ||
399 | static int save_files_dirs(const unsigned char *sha1, | |
6a0b0b6d | 400 | struct strbuf *base, const char *path, |
9047ebbc MV |
401 | unsigned int mode, int stage, void *context) |
402 | { | |
fc65b00d | 403 | struct path_hashmap_entry *entry; |
6a0b0b6d | 404 | int baselen = base->len; |
696ee23c MV |
405 | struct merge_options *o = context; |
406 | ||
6a0b0b6d | 407 | strbuf_addstr(base, path); |
9047ebbc | 408 | |
fc65b00d KW |
409 | FLEX_ALLOC_MEM(entry, path, base->buf, base->len); |
410 | hashmap_entry_init(entry, path_hash(entry->path)); | |
411 | hashmap_add(&o->current_file_dir_set, entry); | |
9047ebbc | 412 | |
6a0b0b6d | 413 | strbuf_setlen(base, baselen); |
d3bee161 | 414 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
9047ebbc MV |
415 | } |
416 | ||
ef9c4dc3 | 417 | static void get_files_dirs(struct merge_options *o, struct tree *tree) |
9047ebbc | 418 | { |
f0096c06 | 419 | struct pathspec match_all; |
9a087274 | 420 | memset(&match_all, 0, sizeof(match_all)); |
ef9c4dc3 | 421 | read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o); |
9047ebbc MV |
422 | } |
423 | ||
424 | /* | |
425 | * Returns an index_entry instance which doesn't have to correspond to | |
426 | * a real cache entry in Git's index. | |
427 | */ | |
428 | static struct stage_data *insert_stage_data(const char *path, | |
429 | struct tree *o, struct tree *a, struct tree *b, | |
430 | struct string_list *entries) | |
431 | { | |
432 | struct string_list_item *item; | |
433 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); | |
ed1c9977 | 434 | get_tree_entry(o->object.oid.hash, path, |
fd429e98 | 435 | e->stages[1].oid.hash, &e->stages[1].mode); |
ed1c9977 | 436 | get_tree_entry(a->object.oid.hash, path, |
fd429e98 | 437 | e->stages[2].oid.hash, &e->stages[2].mode); |
ed1c9977 | 438 | get_tree_entry(b->object.oid.hash, path, |
fd429e98 | 439 | e->stages[3].oid.hash, &e->stages[3].mode); |
78a395d3 | 440 | item = string_list_insert(entries, path); |
9047ebbc MV |
441 | item->util = e; |
442 | return e; | |
443 | } | |
444 | ||
445 | /* | |
446 | * Create a dictionary mapping file names to stage_data objects. The | |
447 | * dictionary contains one entry for every path with a non-zero stage entry. | |
448 | */ | |
449 | static struct string_list *get_unmerged(void) | |
450 | { | |
451 | struct string_list *unmerged = xcalloc(1, sizeof(struct string_list)); | |
452 | int i; | |
453 | ||
454 | unmerged->strdup_strings = 1; | |
455 | ||
456 | for (i = 0; i < active_nr; i++) { | |
457 | struct string_list_item *item; | |
458 | struct stage_data *e; | |
9c5e6c80 | 459 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc MV |
460 | if (!ce_stage(ce)) |
461 | continue; | |
462 | ||
e8c8b713 | 463 | item = string_list_lookup(unmerged, ce->name); |
9047ebbc | 464 | if (!item) { |
78a395d3 | 465 | item = string_list_insert(unmerged, ce->name); |
9047ebbc MV |
466 | item->util = xcalloc(1, sizeof(struct stage_data)); |
467 | } | |
468 | e = item->util; | |
469 | e->stages[ce_stage(ce)].mode = ce->ce_mode; | |
99d1a986 | 470 | oidcpy(&e->stages[ce_stage(ce)].oid, &ce->oid); |
9047ebbc MV |
471 | } |
472 | ||
473 | return unmerged; | |
474 | } | |
475 | ||
fa6ca111 | 476 | static int string_list_df_name_compare(const char *one, const char *two) |
ef02b317 | 477 | { |
fa6ca111 NTND |
478 | int onelen = strlen(one); |
479 | int twolen = strlen(two); | |
f0fd4d05 EN |
480 | /* |
481 | * Here we only care that entries for D/F conflicts are | |
482 | * adjacent, in particular with the file of the D/F conflict | |
483 | * appearing before files below the corresponding directory. | |
484 | * The order of the rest of the list is irrelevant for us. | |
ef02b317 | 485 | * |
f0fd4d05 EN |
486 | * To achieve this, we sort with df_name_compare and provide |
487 | * the mode S_IFDIR so that D/F conflicts will sort correctly. | |
488 | * We use the mode S_IFDIR for everything else for simplicity, | |
489 | * since in other cases any changes in their order due to | |
490 | * sorting cause no problems for us. | |
491 | */ | |
fa6ca111 NTND |
492 | int cmp = df_name_compare(one, onelen, S_IFDIR, |
493 | two, twolen, S_IFDIR); | |
f0fd4d05 EN |
494 | /* |
495 | * Now that 'foo' and 'foo/bar' compare equal, we have to make sure | |
496 | * that 'foo' comes before 'foo/bar'. | |
ef02b317 | 497 | */ |
f0fd4d05 EN |
498 | if (cmp) |
499 | return cmp; | |
500 | return onelen - twolen; | |
501 | } | |
502 | ||
70cc3d36 EN |
503 | static void record_df_conflict_files(struct merge_options *o, |
504 | struct string_list *entries) | |
ef02b317 | 505 | { |
70cc3d36 | 506 | /* If there is a D/F conflict and the file for such a conflict |
f7d650c0 | 507 | * currently exist in the working tree, we want to allow it to be |
edd2faf5 EN |
508 | * removed to make room for the corresponding directory if needed. |
509 | * The files underneath the directories of such D/F conflicts will | |
510 | * be processed before the corresponding file involved in the D/F | |
511 | * conflict. If the D/F directory ends up being removed by the | |
512 | * merge, then we won't have to touch the D/F file. If the D/F | |
513 | * directory needs to be written to the working copy, then the D/F | |
514 | * file will simply be removed (in make_room_for_path()) to make | |
515 | * room for the necessary paths. Note that if both the directory | |
516 | * and the file need to be present, then the D/F file will be | |
517 | * reinstated with a new unique name at the time it is processed. | |
ef02b317 | 518 | */ |
af4941d4 | 519 | struct string_list df_sorted_entries = STRING_LIST_INIT_NODUP; |
ef02b317 | 520 | const char *last_file = NULL; |
c8516500 | 521 | int last_len = 0; |
ef02b317 EN |
522 | int i; |
523 | ||
0b30e812 EN |
524 | /* |
525 | * If we're merging merge-bases, we don't want to bother with | |
526 | * any working directory changes. | |
527 | */ | |
528 | if (o->call_depth) | |
529 | return; | |
530 | ||
f0fd4d05 | 531 | /* Ensure D/F conflicts are adjacent in the entries list. */ |
ef02b317 | 532 | for (i = 0; i < entries->nr; i++) { |
f701aae0 EN |
533 | struct string_list_item *next = &entries->items[i]; |
534 | string_list_append(&df_sorted_entries, next->string)->util = | |
535 | next->util; | |
536 | } | |
fa6ca111 NTND |
537 | df_sorted_entries.cmp = string_list_df_name_compare; |
538 | string_list_sort(&df_sorted_entries); | |
f0fd4d05 | 539 | |
70cc3d36 | 540 | string_list_clear(&o->df_conflict_file_set, 1); |
f701aae0 EN |
541 | for (i = 0; i < df_sorted_entries.nr; i++) { |
542 | const char *path = df_sorted_entries.items[i].string; | |
ef02b317 | 543 | int len = strlen(path); |
f701aae0 | 544 | struct stage_data *e = df_sorted_entries.items[i].util; |
ef02b317 EN |
545 | |
546 | /* | |
547 | * Check if last_file & path correspond to a D/F conflict; | |
548 | * i.e. whether path is last_file+'/'+<something>. | |
70cc3d36 EN |
549 | * If so, record that it's okay to remove last_file to make |
550 | * room for path and friends if needed. | |
ef02b317 EN |
551 | */ |
552 | if (last_file && | |
553 | len > last_len && | |
554 | memcmp(path, last_file, last_len) == 0 && | |
555 | path[last_len] == '/') { | |
70cc3d36 | 556 | string_list_insert(&o->df_conflict_file_set, last_file); |
ef02b317 EN |
557 | } |
558 | ||
559 | /* | |
560 | * Determine whether path could exist as a file in the | |
561 | * working directory as a possible D/F conflict. This | |
562 | * will only occur when it exists in stage 2 as a | |
563 | * file. | |
564 | */ | |
565 | if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) { | |
566 | last_file = path; | |
567 | last_len = len; | |
ef02b317 EN |
568 | } else { |
569 | last_file = NULL; | |
570 | } | |
571 | } | |
f701aae0 | 572 | string_list_clear(&df_sorted_entries, 0); |
ef02b317 EN |
573 | } |
574 | ||
9cba13ca | 575 | struct rename { |
9047ebbc | 576 | struct diff_filepair *pair; |
379fc378 EN |
577 | /* |
578 | * Purpose of src_entry and dst_entry: | |
579 | * | |
580 | * If 'before' is renamed to 'after' then src_entry will contain | |
581 | * the versions of 'before' from the merge_base, HEAD, and MERGE in | |
582 | * stages 1, 2, and 3; dst_entry will contain the respective | |
583 | * versions of 'after' in corresponding locations. Thus, we have a | |
584 | * total of six modes and oids, though some will be null. (Stage 0 | |
585 | * is ignored; we're interested in handling conflicts.) | |
586 | * | |
587 | * Since we don't turn on break-rewrites by default, neither | |
588 | * src_entry nor dst_entry can have all three of their stages have | |
589 | * non-null oids, meaning at most four of the six will be non-null. | |
590 | * Also, since this is a rename, both src_entry and dst_entry will | |
591 | * have at least one non-null oid, meaning at least two will be | |
592 | * non-null. Of the six oids, a typical rename will have three be | |
593 | * non-null. Only two implies a rename/delete, and four implies a | |
594 | * rename/add. | |
595 | */ | |
9047ebbc MV |
596 | struct stage_data *src_entry; |
597 | struct stage_data *dst_entry; | |
598 | unsigned processed:1; | |
599 | }; | |
600 | ||
bc9204d4 JS |
601 | static int update_stages(struct merge_options *opt, const char *path, |
602 | const struct diff_filespec *o, | |
650467cf EN |
603 | const struct diff_filespec *a, |
604 | const struct diff_filespec *b) | |
9047ebbc | 605 | { |
f53d3977 EN |
606 | |
607 | /* | |
608 | * NOTE: It is usually a bad idea to call update_stages on a path | |
609 | * before calling update_file on that same path, since it can | |
610 | * sometimes lead to spurious "refusing to lose untracked file..." | |
611 | * messages from update_file (via make_room_for path via | |
612 | * would_lose_untracked). Instead, reverse the order of the calls | |
613 | * (executing update_file first and then update_stages). | |
614 | */ | |
650467cf EN |
615 | int clear = 1; |
616 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK; | |
9047ebbc MV |
617 | if (clear) |
618 | if (remove_file_from_cache(path)) | |
619 | return -1; | |
620 | if (o) | |
bc9204d4 | 621 | if (add_cacheinfo(opt, o->mode, &o->oid, path, 1, 0, options)) |
9047ebbc MV |
622 | return -1; |
623 | if (a) | |
bc9204d4 | 624 | if (add_cacheinfo(opt, a->mode, &a->oid, path, 2, 0, options)) |
9047ebbc MV |
625 | return -1; |
626 | if (b) | |
bc9204d4 | 627 | if (add_cacheinfo(opt, b->mode, &b->oid, path, 3, 0, options)) |
9047ebbc MV |
628 | return -1; |
629 | return 0; | |
630 | } | |
631 | ||
b8ddf164 EN |
632 | static void update_entry(struct stage_data *entry, |
633 | struct diff_filespec *o, | |
634 | struct diff_filespec *a, | |
635 | struct diff_filespec *b) | |
2ff739f9 | 636 | { |
2ff739f9 EN |
637 | entry->processed = 0; |
638 | entry->stages[1].mode = o->mode; | |
639 | entry->stages[2].mode = a->mode; | |
640 | entry->stages[3].mode = b->mode; | |
fd429e98 | 641 | oidcpy(&entry->stages[1].oid, &o->oid); |
642 | oidcpy(&entry->stages[2].oid, &a->oid); | |
643 | oidcpy(&entry->stages[3].oid, &b->oid); | |
2ff739f9 EN |
644 | } |
645 | ||
b7fa51da MV |
646 | static int remove_file(struct merge_options *o, int clean, |
647 | const char *path, int no_wd) | |
9047ebbc | 648 | { |
b7fa51da MV |
649 | int update_cache = o->call_depth || clean; |
650 | int update_working_directory = !o->call_depth && !no_wd; | |
9047ebbc MV |
651 | |
652 | if (update_cache) { | |
653 | if (remove_file_from_cache(path)) | |
654 | return -1; | |
655 | } | |
656 | if (update_working_directory) { | |
ae352c7f DT |
657 | if (ignore_case) { |
658 | struct cache_entry *ce; | |
659 | ce = cache_file_exists(path, strlen(path), ignore_case); | |
4cba2b01 | 660 | if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name)) |
ae352c7f DT |
661 | return 0; |
662 | } | |
25755e84 | 663 | if (remove_path(path)) |
9047ebbc | 664 | return -1; |
9047ebbc MV |
665 | } |
666 | return 0; | |
667 | } | |
668 | ||
45bc131d JK |
669 | /* add a string to a strbuf, but converting "/" to "_" */ |
670 | static void add_flattened_path(struct strbuf *out, const char *s) | |
671 | { | |
672 | size_t i = out->len; | |
673 | strbuf_addstr(out, s); | |
674 | for (; i < out->len; i++) | |
675 | if (out->buf[i] == '/') | |
676 | out->buf[i] = '_'; | |
677 | } | |
678 | ||
696ee23c | 679 | static char *unique_path(struct merge_options *o, const char *path, const char *branch) |
9047ebbc | 680 | { |
fc65b00d | 681 | struct path_hashmap_entry *entry; |
45bc131d | 682 | struct strbuf newpath = STRBUF_INIT; |
9047ebbc | 683 | int suffix = 0; |
45bc131d JK |
684 | size_t base_len; |
685 | ||
686 | strbuf_addf(&newpath, "%s~", path); | |
687 | add_flattened_path(&newpath, branch); | |
688 | ||
689 | base_len = newpath.len; | |
fc65b00d KW |
690 | while (hashmap_get_from_hash(&o->current_file_dir_set, |
691 | path_hash(newpath.buf), newpath.buf) || | |
8e1b62f1 | 692 | (!o->call_depth && file_exists(newpath.buf))) { |
45bc131d JK |
693 | strbuf_setlen(&newpath, base_len); |
694 | strbuf_addf(&newpath, "_%d", suffix++); | |
695 | } | |
696 | ||
fc65b00d KW |
697 | FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len); |
698 | hashmap_entry_init(entry, path_hash(entry->path)); | |
699 | hashmap_add(&o->current_file_dir_set, entry); | |
45bc131d | 700 | return strbuf_detach(&newpath, NULL); |
9047ebbc MV |
701 | } |
702 | ||
5423d2e7 DT |
703 | /** |
704 | * Check whether a directory in the index is in the way of an incoming | |
705 | * file. Return 1 if so. If check_working_copy is non-zero, also | |
706 | * check the working directory. If empty_ok is non-zero, also return | |
707 | * 0 in the case where the working-tree dir exists but is empty. | |
708 | */ | |
709 | static int dir_in_way(const char *path, int check_working_copy, int empty_ok) | |
f2507b4e | 710 | { |
b4600fbe JK |
711 | int pos; |
712 | struct strbuf dirpath = STRBUF_INIT; | |
f2507b4e EN |
713 | struct stat st; |
714 | ||
b4600fbe JK |
715 | strbuf_addstr(&dirpath, path); |
716 | strbuf_addch(&dirpath, '/'); | |
f2507b4e | 717 | |
b4600fbe | 718 | pos = cache_name_pos(dirpath.buf, dirpath.len); |
f2507b4e EN |
719 | |
720 | if (pos < 0) | |
721 | pos = -1 - pos; | |
722 | if (pos < active_nr && | |
b4600fbe JK |
723 | !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) { |
724 | strbuf_release(&dirpath); | |
f2507b4e EN |
725 | return 1; |
726 | } | |
727 | ||
b4600fbe | 728 | strbuf_release(&dirpath); |
5423d2e7 DT |
729 | return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode) && |
730 | !(empty_ok && is_empty_dir(path)); | |
f2507b4e EN |
731 | } |
732 | ||
aacb82de | 733 | static int was_tracked(const char *path) |
60c91181 JH |
734 | { |
735 | int pos = cache_name_pos(path, strlen(path)); | |
736 | ||
f8d83fb6 JS |
737 | if (0 <= pos) |
738 | /* we have been tracking this path */ | |
739 | return 1; | |
740 | ||
741 | /* | |
742 | * Look for an unmerged entry for the path, | |
743 | * specifically stage #2, which would indicate | |
744 | * that "our" side before the merge started | |
745 | * had the path tracked (and resulted in a conflict). | |
746 | */ | |
747 | for (pos = -1 - pos; | |
748 | pos < active_nr && !strcmp(path, active_cache[pos]->name); | |
749 | pos++) | |
750 | if (ce_stage(active_cache[pos]) == 2) | |
aacb82de | 751 | return 1; |
aacb82de | 752 | return 0; |
60c91181 JH |
753 | } |
754 | ||
aacb82de | 755 | static int would_lose_untracked(const char *path) |
9047ebbc | 756 | { |
aacb82de | 757 | return !was_tracked(path) && file_exists(path); |
60c91181 JH |
758 | } |
759 | ||
ed0148a5 | 760 | static int make_room_for_path(struct merge_options *o, const char *path) |
9047ebbc | 761 | { |
ed0148a5 | 762 | int status, i; |
55653a68 | 763 | const char *msg = _("failed to create path '%s'%s"); |
9047ebbc | 764 | |
ed0148a5 EN |
765 | /* Unlink any D/F conflict files that are in the way */ |
766 | for (i = 0; i < o->df_conflict_file_set.nr; i++) { | |
767 | const char *df_path = o->df_conflict_file_set.items[i].string; | |
768 | size_t pathlen = strlen(path); | |
769 | size_t df_pathlen = strlen(df_path); | |
770 | if (df_pathlen < pathlen && | |
771 | path[df_pathlen] == '/' && | |
772 | strncmp(path, df_path, df_pathlen) == 0) { | |
773 | output(o, 3, | |
55653a68 | 774 | _("Removing %s to make room for subdirectory\n"), |
ed0148a5 EN |
775 | df_path); |
776 | unlink(df_path); | |
777 | unsorted_string_list_delete_item(&o->df_conflict_file_set, | |
778 | i, 0); | |
779 | break; | |
780 | } | |
781 | } | |
782 | ||
783 | /* Make sure leading directories are created */ | |
9047ebbc MV |
784 | status = safe_create_leading_directories_const(path); |
785 | if (status) { | |
6003303a | 786 | if (status == SCLD_EXISTS) |
9047ebbc | 787 | /* something else exists */ |
bc9204d4 JS |
788 | return err(o, msg, path, _(": perhaps a D/F conflict?")); |
789 | return err(o, msg, path, ""); | |
9047ebbc MV |
790 | } |
791 | ||
60c91181 JH |
792 | /* |
793 | * Do not unlink a file in the work tree if we are not | |
794 | * tracking it. | |
795 | */ | |
796 | if (would_lose_untracked(path)) | |
bc9204d4 | 797 | return err(o, _("refusing to lose untracked file at '%s'"), |
60c91181 JH |
798 | path); |
799 | ||
9047ebbc MV |
800 | /* Successful unlink is good.. */ |
801 | if (!unlink(path)) | |
802 | return 0; | |
803 | /* .. and so is no existing file */ | |
804 | if (errno == ENOENT) | |
805 | return 0; | |
806 | /* .. but not some other error (who really cares what?) */ | |
bc9204d4 | 807 | return err(o, msg, path, _(": perhaps a D/F conflict?")); |
9047ebbc MV |
808 | } |
809 | ||
75456f96 JS |
810 | static int update_file_flags(struct merge_options *o, |
811 | const struct object_id *oid, | |
812 | unsigned mode, | |
813 | const char *path, | |
814 | int update_cache, | |
815 | int update_wd) | |
9047ebbc | 816 | { |
6003303a JS |
817 | int ret = 0; |
818 | ||
b7fa51da | 819 | if (o->call_depth) |
9047ebbc MV |
820 | update_wd = 0; |
821 | ||
822 | if (update_wd) { | |
823 | enum object_type type; | |
824 | void *buf; | |
825 | unsigned long size; | |
826 | ||
68d03e4a | 827 | if (S_ISGITLINK(mode)) { |
0c44c943 JH |
828 | /* |
829 | * We may later decide to recursively descend into | |
830 | * the submodule directory and update its index | |
831 | * and/or work tree, but we do not do that now. | |
832 | */ | |
68d03e4a | 833 | update_wd = 0; |
0c44c943 | 834 | goto update_index; |
68d03e4a | 835 | } |
9047ebbc | 836 | |
b4da9d62 | 837 | buf = read_sha1_file(oid->hash, &type, &size); |
9047ebbc | 838 | if (!buf) |
bc9204d4 | 839 | return err(o, _("cannot read object %s '%s'"), oid_to_hex(oid), path); |
6003303a | 840 | if (type != OBJ_BLOB) { |
bc9204d4 | 841 | ret = err(o, _("blob expected for %s '%s'"), oid_to_hex(oid), path); |
6003303a JS |
842 | goto free_buf; |
843 | } | |
9047ebbc | 844 | if (S_ISREG(mode)) { |
f285a2d7 | 845 | struct strbuf strbuf = STRBUF_INIT; |
9047ebbc MV |
846 | if (convert_to_working_tree(path, buf, size, &strbuf)) { |
847 | free(buf); | |
848 | size = strbuf.len; | |
849 | buf = strbuf_detach(&strbuf, NULL); | |
850 | } | |
851 | } | |
852 | ||
ed0148a5 | 853 | if (make_room_for_path(o, path) < 0) { |
9047ebbc | 854 | update_wd = 0; |
75456f96 | 855 | goto free_buf; |
9047ebbc MV |
856 | } |
857 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { | |
858 | int fd; | |
859 | if (mode & 0100) | |
860 | mode = 0777; | |
861 | else | |
862 | mode = 0666; | |
863 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); | |
6003303a | 864 | if (fd < 0) { |
bc9204d4 JS |
865 | ret = err(o, _("failed to open '%s': %s"), |
866 | path, strerror(errno)); | |
6003303a JS |
867 | goto free_buf; |
868 | } | |
f633ea2c | 869 | write_in_full(fd, buf, size); |
9047ebbc MV |
870 | close(fd); |
871 | } else if (S_ISLNK(mode)) { | |
872 | char *lnk = xmemdupz(buf, size); | |
873 | safe_create_leading_directories_const(path); | |
874 | unlink(path); | |
304dcf26 | 875 | if (symlink(lnk, path)) |
bc9204d4 JS |
876 | ret = err(o, _("failed to symlink '%s': %s"), |
877 | path, strerror(errno)); | |
9047ebbc MV |
878 | free(lnk); |
879 | } else | |
bc9204d4 JS |
880 | ret = err(o, |
881 | _("do not know what to do with %06o %s '%s'"), | |
882 | mode, oid_to_hex(oid), path); | |
75456f96 | 883 | free_buf: |
9047ebbc MV |
884 | free(buf); |
885 | } | |
886 | update_index: | |
6003303a | 887 | if (!ret && update_cache) |
bc9204d4 | 888 | add_cacheinfo(o, mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); |
6003303a | 889 | return ret; |
9047ebbc MV |
890 | } |
891 | ||
75456f96 JS |
892 | static int update_file(struct merge_options *o, |
893 | int clean, | |
894 | const struct object_id *oid, | |
895 | unsigned mode, | |
896 | const char *path) | |
9047ebbc | 897 | { |
75456f96 | 898 | return update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth); |
9047ebbc MV |
899 | } |
900 | ||
901 | /* Low level file merging, update and removal */ | |
902 | ||
9cba13ca | 903 | struct merge_file_info { |
9b561499 | 904 | struct object_id oid; |
9047ebbc MV |
905 | unsigned mode; |
906 | unsigned clean:1, | |
907 | merge:1; | |
908 | }; | |
909 | ||
b7fa51da MV |
910 | static int merge_3way(struct merge_options *o, |
911 | mmbuffer_t *result_buf, | |
0c059420 EN |
912 | const struct diff_filespec *one, |
913 | const struct diff_filespec *a, | |
914 | const struct diff_filespec *b, | |
9047ebbc MV |
915 | const char *branch1, |
916 | const char *branch2) | |
917 | { | |
918 | mmfile_t orig, src1, src2; | |
712516bc | 919 | struct ll_merge_options ll_opts = {0}; |
4c5868f4 | 920 | char *base_name, *name1, *name2; |
9047ebbc | 921 | int merge_status; |
8cc5b290 | 922 | |
712516bc | 923 | ll_opts.renormalize = o->renormalize; |
58a1ece4 | 924 | ll_opts.xdl_opts = o->xdl_opts; |
712516bc JN |
925 | |
926 | if (o->call_depth) { | |
927 | ll_opts.virtual_ancestor = 1; | |
928 | ll_opts.variant = 0; | |
929 | } else { | |
8cc5b290 AP |
930 | switch (o->recursive_variant) { |
931 | case MERGE_RECURSIVE_OURS: | |
712516bc | 932 | ll_opts.variant = XDL_MERGE_FAVOR_OURS; |
8cc5b290 AP |
933 | break; |
934 | case MERGE_RECURSIVE_THEIRS: | |
712516bc | 935 | ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; |
8cc5b290 AP |
936 | break; |
937 | default: | |
712516bc | 938 | ll_opts.variant = 0; |
8cc5b290 AP |
939 | break; |
940 | } | |
941 | } | |
9047ebbc | 942 | |
4c5868f4 JN |
943 | if (strcmp(a->path, b->path) || |
944 | (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) { | |
945 | base_name = o->ancestor == NULL ? NULL : | |
4e2d094d RJ |
946 | mkpathdup("%s:%s", o->ancestor, one->path); |
947 | name1 = mkpathdup("%s:%s", branch1, a->path); | |
948 | name2 = mkpathdup("%s:%s", branch2, b->path); | |
606475f3 | 949 | } else { |
4c5868f4 | 950 | base_name = o->ancestor == NULL ? NULL : |
4e2d094d RJ |
951 | mkpathdup("%s", o->ancestor); |
952 | name1 = mkpathdup("%s", branch1); | |
953 | name2 = mkpathdup("%s", branch2); | |
606475f3 | 954 | } |
9047ebbc | 955 | |
d449347d | 956 | read_mmblob(&orig, &one->oid); |
957 | read_mmblob(&src1, &a->oid); | |
958 | read_mmblob(&src2, &b->oid); | |
9047ebbc | 959 | |
4c5868f4 | 960 | merge_status = ll_merge(result_buf, a->path, &orig, base_name, |
712516bc | 961 | &src1, name1, &src2, name2, &ll_opts); |
9047ebbc | 962 | |
4e2d094d | 963 | free(base_name); |
9047ebbc MV |
964 | free(name1); |
965 | free(name2); | |
966 | free(orig.ptr); | |
967 | free(src1.ptr); | |
968 | free(src2.ptr); | |
969 | return merge_status; | |
970 | } | |
971 | ||
3c8a51e8 | 972 | static int merge_file_1(struct merge_options *o, |
6bdaead1 EN |
973 | const struct diff_filespec *one, |
974 | const struct diff_filespec *a, | |
975 | const struct diff_filespec *b, | |
976 | const char *branch1, | |
3c8a51e8 JS |
977 | const char *branch2, |
978 | struct merge_file_info *result) | |
9047ebbc | 979 | { |
3c8a51e8 JS |
980 | result->merge = 0; |
981 | result->clean = 1; | |
9047ebbc MV |
982 | |
983 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { | |
3c8a51e8 | 984 | result->clean = 0; |
9047ebbc | 985 | if (S_ISREG(a->mode)) { |
3c8a51e8 JS |
986 | result->mode = a->mode; |
987 | oidcpy(&result->oid, &a->oid); | |
9047ebbc | 988 | } else { |
3c8a51e8 JS |
989 | result->mode = b->mode; |
990 | oidcpy(&result->oid, &b->oid); | |
9047ebbc MV |
991 | } |
992 | } else { | |
b4da9d62 | 993 | if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid)) |
3c8a51e8 | 994 | result->merge = 1; |
9047ebbc MV |
995 | |
996 | /* | |
997 | * Merge modes | |
998 | */ | |
b7fa51da | 999 | if (a->mode == b->mode || a->mode == one->mode) |
3c8a51e8 | 1000 | result->mode = b->mode; |
9047ebbc | 1001 | else { |
3c8a51e8 | 1002 | result->mode = a->mode; |
b7fa51da | 1003 | if (b->mode != one->mode) { |
3c8a51e8 JS |
1004 | result->clean = 0; |
1005 | result->merge = 1; | |
9047ebbc MV |
1006 | } |
1007 | } | |
1008 | ||
b4da9d62 | 1009 | if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid)) |
3c8a51e8 | 1010 | oidcpy(&result->oid, &b->oid); |
b4da9d62 | 1011 | else if (oid_eq(&b->oid, &one->oid)) |
3c8a51e8 | 1012 | oidcpy(&result->oid, &a->oid); |
9047ebbc MV |
1013 | else if (S_ISREG(a->mode)) { |
1014 | mmbuffer_t result_buf; | |
6003303a | 1015 | int ret = 0, merge_status; |
9047ebbc | 1016 | |
b7fa51da | 1017 | merge_status = merge_3way(o, &result_buf, one, a, b, |
9047ebbc MV |
1018 | branch1, branch2); |
1019 | ||
1020 | if ((merge_status < 0) || !result_buf.ptr) | |
bc9204d4 | 1021 | ret = err(o, _("Failed to execute internal merge")); |
9047ebbc | 1022 | |
6003303a JS |
1023 | if (!ret && write_sha1_file(result_buf.ptr, result_buf.size, |
1024 | blob_type, result->oid.hash)) | |
bc9204d4 JS |
1025 | ret = err(o, _("Unable to add %s to database"), |
1026 | a->path); | |
9047ebbc MV |
1027 | |
1028 | free(result_buf.ptr); | |
6003303a JS |
1029 | if (ret) |
1030 | return ret; | |
3c8a51e8 | 1031 | result->clean = (merge_status == 0); |
9047ebbc | 1032 | } else if (S_ISGITLINK(a->mode)) { |
71f35d5c | 1033 | result->clean = merge_submodule(&result->oid, |
a0d12c44 | 1034 | one->path, |
71f35d5c | 1035 | &one->oid, |
1036 | &a->oid, | |
1037 | &b->oid, | |
80988783 | 1038 | !o->call_depth); |
9047ebbc | 1039 | } else if (S_ISLNK(a->mode)) { |
3c8a51e8 | 1040 | oidcpy(&result->oid, &a->oid); |
9047ebbc | 1041 | |
b4da9d62 | 1042 | if (!oid_eq(&a->oid, &b->oid)) |
3c8a51e8 | 1043 | result->clean = 0; |
ef1177d1 | 1044 | } else |
7e97e100 | 1045 | die("BUG: unsupported object type in the tree"); |
9047ebbc MV |
1046 | } |
1047 | ||
3c8a51e8 | 1048 | return 0; |
9047ebbc MV |
1049 | } |
1050 | ||
3c8a51e8 | 1051 | static int merge_file_special_markers(struct merge_options *o, |
dac47415 EN |
1052 | const struct diff_filespec *one, |
1053 | const struct diff_filespec *a, | |
1054 | const struct diff_filespec *b, | |
1055 | const char *branch1, | |
1056 | const char *filename1, | |
1057 | const char *branch2, | |
3c8a51e8 JS |
1058 | const char *filename2, |
1059 | struct merge_file_info *mfi) | |
dac47415 EN |
1060 | { |
1061 | char *side1 = NULL; | |
1062 | char *side2 = NULL; | |
3c8a51e8 | 1063 | int ret; |
dac47415 | 1064 | |
28310186 JK |
1065 | if (filename1) |
1066 | side1 = xstrfmt("%s:%s", branch1, filename1); | |
1067 | if (filename2) | |
1068 | side2 = xstrfmt("%s:%s", branch2, filename2); | |
dac47415 | 1069 | |
3c8a51e8 JS |
1070 | ret = merge_file_1(o, one, a, b, |
1071 | side1 ? side1 : branch1, | |
1072 | side2 ? side2 : branch2, mfi); | |
dac47415 EN |
1073 | free(side1); |
1074 | free(side2); | |
3c8a51e8 | 1075 | return ret; |
dac47415 EN |
1076 | } |
1077 | ||
3c8a51e8 | 1078 | static int merge_file_one(struct merge_options *o, |
6bdaead1 | 1079 | const char *path, |
b4da9d62 | 1080 | const struct object_id *o_oid, int o_mode, |
1081 | const struct object_id *a_oid, int a_mode, | |
1082 | const struct object_id *b_oid, int b_mode, | |
6bdaead1 | 1083 | const char *branch1, |
3c8a51e8 JS |
1084 | const char *branch2, |
1085 | struct merge_file_info *mfi) | |
6bdaead1 EN |
1086 | { |
1087 | struct diff_filespec one, a, b; | |
1088 | ||
1089 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 1090 | oidcpy(&one.oid, o_oid); |
6bdaead1 | 1091 | one.mode = o_mode; |
b4da9d62 | 1092 | oidcpy(&a.oid, a_oid); |
6bdaead1 | 1093 | a.mode = a_mode; |
b4da9d62 | 1094 | oidcpy(&b.oid, b_oid); |
6bdaead1 | 1095 | b.mode = b_mode; |
3c8a51e8 | 1096 | return merge_file_1(o, &one, &a, &b, branch1, branch2, mfi); |
6bdaead1 EN |
1097 | } |
1098 | ||
75456f96 | 1099 | static int handle_change_delete(struct merge_options *o, |
b26d87f2 | 1100 | const char *path, const char *old_path, |
b4da9d62 | 1101 | const struct object_id *o_oid, int o_mode, |
b26d87f2 MM |
1102 | const struct object_id *changed_oid, |
1103 | int changed_mode, | |
1104 | const char *change_branch, | |
1105 | const char *delete_branch, | |
b7033252 EN |
1106 | const char *change, const char *change_past) |
1107 | { | |
b26d87f2 MM |
1108 | char *alt_path = NULL; |
1109 | const char *update_path = path; | |
75456f96 | 1110 | int ret = 0; |
b26d87f2 | 1111 | |
5423d2e7 | 1112 | if (dir_in_way(path, !o->call_depth, 0)) { |
b26d87f2 | 1113 | update_path = alt_path = unique_path(o, path, change_branch); |
b7033252 EN |
1114 | } |
1115 | ||
1116 | if (o->call_depth) { | |
1117 | /* | |
1118 | * We cannot arbitrarily accept either a_sha or b_sha as | |
1119 | * correct; since there is no true "middle point" between | |
1120 | * them, simply reuse the base version for virtual merge base. | |
1121 | */ | |
75456f96 JS |
1122 | ret = remove_file_from_cache(path); |
1123 | if (!ret) | |
b26d87f2 | 1124 | ret = update_file(o, 0, o_oid, o_mode, update_path); |
b7033252 | 1125 | } else { |
b26d87f2 MM |
1126 | if (!alt_path) { |
1127 | if (!old_path) { | |
1128 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1129 | "and %s in %s. Version %s of %s left in tree."), | |
1130 | change, path, delete_branch, change_past, | |
1131 | change_branch, change_branch, path); | |
1132 | } else { | |
1133 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1134 | "and %s to %s in %s. Version %s of %s left in tree."), | |
1135 | change, old_path, delete_branch, change_past, path, | |
1136 | change_branch, change_branch, path); | |
1137 | } | |
55653a68 | 1138 | } else { |
b26d87f2 MM |
1139 | if (!old_path) { |
1140 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1141 | "and %s in %s. Version %s of %s left in tree at %s."), | |
1142 | change, path, delete_branch, change_past, | |
1143 | change_branch, change_branch, path, alt_path); | |
1144 | } else { | |
1145 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1146 | "and %s to %s in %s. Version %s of %s left in tree at %s."), | |
1147 | change, old_path, delete_branch, change_past, path, | |
1148 | change_branch, change_branch, path, alt_path); | |
1149 | } | |
55653a68 | 1150 | } |
35a74abf | 1151 | /* |
b26d87f2 MM |
1152 | * No need to call update_file() on path when change_branch == |
1153 | * o->branch1 && !alt_path, since that would needlessly touch | |
1154 | * path. We could call update_file_flags() with update_cache=0 | |
1155 | * and update_wd=0, but that's a no-op. | |
35a74abf | 1156 | */ |
b26d87f2 MM |
1157 | if (change_branch != o->branch1 || alt_path) |
1158 | ret = update_file(o, 0, changed_oid, changed_mode, update_path); | |
b7033252 | 1159 | } |
b26d87f2 | 1160 | free(alt_path); |
75456f96 JS |
1161 | |
1162 | return ret; | |
b7033252 EN |
1163 | } |
1164 | ||
75456f96 | 1165 | static int conflict_rename_delete(struct merge_options *o, |
6ef2cb00 EN |
1166 | struct diff_filepair *pair, |
1167 | const char *rename_branch, | |
b26d87f2 | 1168 | const char *delete_branch) |
9047ebbc | 1169 | { |
e03acb8b EN |
1170 | const struct diff_filespec *orig = pair->one; |
1171 | const struct diff_filespec *dest = pair->two; | |
6ef2cb00 | 1172 | |
75456f96 JS |
1173 | if (handle_change_delete(o, |
1174 | o->call_depth ? orig->path : dest->path, | |
b26d87f2 | 1175 | o->call_depth ? NULL : orig->path, |
75456f96 | 1176 | &orig->oid, orig->mode, |
b26d87f2 MM |
1177 | &dest->oid, dest->mode, |
1178 | rename_branch, delete_branch, | |
75456f96 JS |
1179 | _("rename"), _("renamed"))) |
1180 | return -1; | |
e03acb8b | 1181 | |
75456f96 JS |
1182 | if (o->call_depth) |
1183 | return remove_file_from_cache(dest->path); | |
1184 | else | |
bc9204d4 | 1185 | return update_stages(o, dest->path, NULL, |
75456f96 JS |
1186 | rename_branch == o->branch1 ? dest : NULL, |
1187 | rename_branch == o->branch1 ? NULL : dest); | |
6ef2cb00 EN |
1188 | } |
1189 | ||
1ac91b32 EN |
1190 | static struct diff_filespec *filespec_from_entry(struct diff_filespec *target, |
1191 | struct stage_data *entry, | |
1192 | int stage) | |
9047ebbc | 1193 | { |
b4da9d62 | 1194 | struct object_id *oid = &entry->stages[stage].oid; |
1ac91b32 | 1195 | unsigned mode = entry->stages[stage].mode; |
b4da9d62 | 1196 | if (mode == 0 || is_null_oid(oid)) |
1ac91b32 | 1197 | return NULL; |
b4da9d62 | 1198 | oidcpy(&target->oid, oid); |
1ac91b32 EN |
1199 | target->mode = mode; |
1200 | return target; | |
1201 | } | |
1202 | ||
75456f96 | 1203 | static int handle_file(struct merge_options *o, |
3672c971 EN |
1204 | struct diff_filespec *rename, |
1205 | int stage, | |
1206 | struct rename_conflict_info *ci) | |
1207 | { | |
1208 | char *dst_name = rename->path; | |
1209 | struct stage_data *dst_entry; | |
1210 | const char *cur_branch, *other_branch; | |
1211 | struct diff_filespec other; | |
1212 | struct diff_filespec *add; | |
75456f96 | 1213 | int ret; |
3672c971 EN |
1214 | |
1215 | if (stage == 2) { | |
1216 | dst_entry = ci->dst_entry1; | |
1217 | cur_branch = ci->branch1; | |
1218 | other_branch = ci->branch2; | |
1219 | } else { | |
1220 | dst_entry = ci->dst_entry2; | |
1221 | cur_branch = ci->branch2; | |
1222 | other_branch = ci->branch1; | |
9047ebbc | 1223 | } |
3672c971 EN |
1224 | |
1225 | add = filespec_from_entry(&other, dst_entry, stage ^ 1); | |
3672c971 EN |
1226 | if (add) { |
1227 | char *add_name = unique_path(o, rename->path, other_branch); | |
75456f96 JS |
1228 | if (update_file(o, 0, &add->oid, add->mode, add_name)) |
1229 | return -1; | |
3672c971 EN |
1230 | |
1231 | remove_file(o, 0, rename->path, 0); | |
1232 | dst_name = unique_path(o, rename->path, cur_branch); | |
1233 | } else { | |
5423d2e7 | 1234 | if (dir_in_way(rename->path, !o->call_depth, 0)) { |
3672c971 | 1235 | dst_name = unique_path(o, rename->path, cur_branch); |
55653a68 | 1236 | output(o, 1, _("%s is a directory in %s adding as %s instead"), |
3672c971 EN |
1237 | rename->path, other_branch, dst_name); |
1238 | } | |
9047ebbc | 1239 | } |
75456f96 JS |
1240 | if ((ret = update_file(o, 0, &rename->oid, rename->mode, dst_name))) |
1241 | ; /* fall through, do allow dst_name to be released */ | |
1242 | else if (stage == 2) | |
bc9204d4 | 1243 | ret = update_stages(o, rename->path, NULL, rename, add); |
f53d3977 | 1244 | else |
bc9204d4 | 1245 | ret = update_stages(o, rename->path, NULL, add, rename); |
3672c971 EN |
1246 | |
1247 | if (dst_name != rename->path) | |
1248 | free(dst_name); | |
75456f96 JS |
1249 | |
1250 | return ret; | |
3672c971 EN |
1251 | } |
1252 | ||
75456f96 | 1253 | static int conflict_rename_rename_1to2(struct merge_options *o, |
a99b7f22 | 1254 | struct rename_conflict_info *ci) |
9047ebbc | 1255 | { |
09c01f85 | 1256 | /* One file was renamed in both branches, but to different names. */ |
a99b7f22 EN |
1257 | struct diff_filespec *one = ci->pair1->one; |
1258 | struct diff_filespec *a = ci->pair1->two; | |
1259 | struct diff_filespec *b = ci->pair2->two; | |
4f66dade | 1260 | |
55653a68 | 1261 | output(o, 1, _("CONFLICT (rename/rename): " |
4f66dade | 1262 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
55653a68 | 1263 | "rename \"%s\"->\"%s\" in \"%s\"%s"), |
a99b7f22 EN |
1264 | one->path, a->path, ci->branch1, |
1265 | one->path, b->path, ci->branch2, | |
55653a68 | 1266 | o->call_depth ? _(" (left unresolved)") : ""); |
b7fa51da | 1267 | if (o->call_depth) { |
c52ff85d | 1268 | struct merge_file_info mfi; |
6d63070c EN |
1269 | struct diff_filespec other; |
1270 | struct diff_filespec *add; | |
3c8a51e8 | 1271 | if (merge_file_one(o, one->path, |
b4da9d62 | 1272 | &one->oid, one->mode, |
1273 | &a->oid, a->mode, | |
1274 | &b->oid, b->mode, | |
3c8a51e8 | 1275 | ci->branch1, ci->branch2, &mfi)) |
75456f96 JS |
1276 | return -1; |
1277 | ||
9047ebbc | 1278 | /* |
c52ff85d EN |
1279 | * FIXME: For rename/add-source conflicts (if we could detect |
1280 | * such), this is wrong. We should instead find a unique | |
1281 | * pathname and then either rename the add-source file to that | |
1282 | * unique path, or use that unique path instead of src here. | |
9047ebbc | 1283 | */ |
75456f96 JS |
1284 | if (update_file(o, 0, &mfi.oid, mfi.mode, one->path)) |
1285 | return -1; | |
07413c5a | 1286 | |
6d63070c EN |
1287 | /* |
1288 | * Above, we put the merged content at the merge-base's | |
1289 | * path. Now we usually need to delete both a->path and | |
1290 | * b->path. However, the rename on each side of the merge | |
1291 | * could also be involved in a rename/add conflict. In | |
1292 | * such cases, we should keep the added file around, | |
1293 | * resolving the conflict at that path in its favor. | |
1294 | */ | |
1295 | add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); | |
75456f96 JS |
1296 | if (add) { |
1297 | if (update_file(o, 0, &add->oid, add->mode, a->path)) | |
1298 | return -1; | |
1299 | } | |
6d63070c EN |
1300 | else |
1301 | remove_file_from_cache(a->path); | |
1302 | add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); | |
75456f96 JS |
1303 | if (add) { |
1304 | if (update_file(o, 0, &add->oid, add->mode, b->path)) | |
1305 | return -1; | |
1306 | } | |
6d63070c EN |
1307 | else |
1308 | remove_file_from_cache(b->path); | |
75456f96 JS |
1309 | } else if (handle_file(o, a, 2, ci) || handle_file(o, b, 3, ci)) |
1310 | return -1; | |
1311 | ||
1312 | return 0; | |
9047ebbc MV |
1313 | } |
1314 | ||
75456f96 | 1315 | static int conflict_rename_rename_2to1(struct merge_options *o, |
461f5041 | 1316 | struct rename_conflict_info *ci) |
9047ebbc | 1317 | { |
461f5041 EN |
1318 | /* Two files, a & b, were renamed to the same thing, c. */ |
1319 | struct diff_filespec *a = ci->pair1->one; | |
1320 | struct diff_filespec *b = ci->pair2->one; | |
1321 | struct diff_filespec *c1 = ci->pair1->two; | |
1322 | struct diff_filespec *c2 = ci->pair2->two; | |
1323 | char *path = c1->path; /* == c2->path */ | |
434b8525 EN |
1324 | struct merge_file_info mfi_c1; |
1325 | struct merge_file_info mfi_c2; | |
75456f96 | 1326 | int ret; |
461f5041 | 1327 | |
55653a68 | 1328 | output(o, 1, _("CONFLICT (rename/rename): " |
461f5041 | 1329 | "Rename %s->%s in %s. " |
55653a68 | 1330 | "Rename %s->%s in %s"), |
461f5041 EN |
1331 | a->path, c1->path, ci->branch1, |
1332 | b->path, c2->path, ci->branch2); | |
1333 | ||
8e1b62f1 EN |
1334 | remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path)); |
1335 | remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path)); | |
461f5041 | 1336 | |
3c8a51e8 JS |
1337 | if (merge_file_special_markers(o, a, c1, &ci->ren1_other, |
1338 | o->branch1, c1->path, | |
1339 | o->branch2, ci->ren1_other.path, &mfi_c1) || | |
1340 | merge_file_special_markers(o, b, &ci->ren2_other, c2, | |
1341 | o->branch1, ci->ren2_other.path, | |
1342 | o->branch2, c2->path, &mfi_c2)) | |
75456f96 | 1343 | return -1; |
434b8525 | 1344 | |
0a6b8712 | 1345 | if (o->call_depth) { |
434b8525 EN |
1346 | /* |
1347 | * If mfi_c1.clean && mfi_c2.clean, then it might make | |
1348 | * sense to do a two-way merge of those results. But, I | |
1349 | * think in all cases, it makes sense to have the virtual | |
1350 | * merge base just undo the renames; they can be detected | |
1351 | * again later for the non-recursive merge. | |
1352 | */ | |
1353 | remove_file(o, 0, path, 0); | |
75456f96 JS |
1354 | ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path); |
1355 | if (!ret) | |
1356 | ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, | |
1357 | b->path); | |
0a6b8712 | 1358 | } else { |
461f5041 EN |
1359 | char *new_path1 = unique_path(o, path, ci->branch1); |
1360 | char *new_path2 = unique_path(o, path, ci->branch2); | |
55653a68 | 1361 | output(o, 1, _("Renaming %s to %s and %s to %s instead"), |
461f5041 | 1362 | a->path, new_path1, b->path, new_path2); |
0a6b8712 | 1363 | remove_file(o, 0, path, 0); |
75456f96 JS |
1364 | ret = update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1); |
1365 | if (!ret) | |
1366 | ret = update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, | |
1367 | new_path2); | |
0a6b8712 EN |
1368 | free(new_path2); |
1369 | free(new_path1); | |
1370 | } | |
75456f96 JS |
1371 | |
1372 | return ret; | |
9047ebbc MV |
1373 | } |
1374 | ||
a706e8f6 | 1375 | /* |
3f646871 | 1376 | * Get the diff_filepairs changed between o_tree and tree. |
a706e8f6 | 1377 | */ |
3f646871 EN |
1378 | static struct diff_queue_struct *get_diffpairs(struct merge_options *o, |
1379 | struct tree *o_tree, | |
1380 | struct tree *tree) | |
a706e8f6 | 1381 | { |
3f646871 | 1382 | struct diff_queue_struct *ret; |
a706e8f6 EN |
1383 | struct diff_options opts; |
1384 | ||
a706e8f6 EN |
1385 | diff_setup(&opts); |
1386 | opts.flags.recursive = 1; | |
1387 | opts.flags.rename_empty = 0; | |
1388 | opts.detect_rename = DIFF_DETECT_RENAME; | |
1389 | opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : | |
1390 | o->diff_rename_limit >= 0 ? o->diff_rename_limit : | |
1391 | 1000; | |
1392 | opts.rename_score = o->rename_score; | |
1393 | opts.show_rename_progress = o->show_rename_progress; | |
1394 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
1395 | diff_setup_done(&opts); | |
1396 | diff_tree_oid(&o_tree->object.oid, &tree->object.oid, "", &opts); | |
1397 | diffcore_std(&opts); | |
1398 | if (opts.needed_rename_limit > o->needed_rename_limit) | |
1399 | o->needed_rename_limit = opts.needed_rename_limit; | |
3f646871 EN |
1400 | |
1401 | ret = xmalloc(sizeof(*ret)); | |
1402 | *ret = diff_queued_diff; | |
1403 | ||
1404 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
1405 | diff_queued_diff.nr = 0; | |
1406 | diff_queued_diff.queue = NULL; | |
1407 | diff_flush(&opts); | |
1408 | return ret; | |
1409 | } | |
1410 | ||
53e32d46 EN |
1411 | static int tree_has_path(struct tree *tree, const char *path) |
1412 | { | |
1413 | unsigned char hashy[GIT_MAX_RAWSZ]; | |
1414 | unsigned int mode_o; | |
1415 | ||
1416 | return !get_tree_entry(tree->object.oid.hash, path, | |
1417 | hashy, &mode_o); | |
1418 | } | |
1419 | ||
ea625cb0 EN |
1420 | /* |
1421 | * Return a new string that replaces the beginning portion (which matches | |
1422 | * entry->dir), with entry->new_dir. In perl-speak: | |
1423 | * new_path_name = (old_path =~ s/entry->dir/entry->new_dir/); | |
1424 | * NOTE: | |
1425 | * Caller must ensure that old_path starts with entry->dir + '/'. | |
1426 | */ | |
1427 | static char *apply_dir_rename(struct dir_rename_entry *entry, | |
1428 | const char *old_path) | |
1429 | { | |
1430 | struct strbuf new_path = STRBUF_INIT; | |
1431 | int oldlen, newlen; | |
1432 | ||
1433 | if (entry->non_unique_new_dir) | |
1434 | return NULL; | |
1435 | ||
1436 | oldlen = strlen(entry->dir); | |
1437 | newlen = entry->new_dir.len + (strlen(old_path) - oldlen) + 1; | |
1438 | strbuf_grow(&new_path, newlen); | |
1439 | strbuf_addbuf(&new_path, &entry->new_dir); | |
1440 | strbuf_addstr(&new_path, &old_path[oldlen]); | |
1441 | ||
1442 | return strbuf_detach(&new_path, NULL); | |
1443 | } | |
1444 | ||
8383408d EN |
1445 | static void get_renamed_dir_portion(const char *old_path, const char *new_path, |
1446 | char **old_dir, char **new_dir) | |
1447 | { | |
1448 | char *end_of_old, *end_of_new; | |
1449 | int old_len, new_len; | |
1450 | ||
1451 | *old_dir = NULL; | |
1452 | *new_dir = NULL; | |
1453 | ||
1454 | /* | |
1455 | * For | |
1456 | * "a/b/c/d/e/foo.c" -> "a/b/some/thing/else/e/foo.c" | |
1457 | * the "e/foo.c" part is the same, we just want to know that | |
1458 | * "a/b/c/d" was renamed to "a/b/some/thing/else" | |
1459 | * so, for this example, this function returns "a/b/c/d" in | |
1460 | * *old_dir and "a/b/some/thing/else" in *new_dir. | |
1461 | * | |
1462 | * Also, if the basename of the file changed, we don't care. We | |
1463 | * want to know which portion of the directory, if any, changed. | |
1464 | */ | |
1465 | end_of_old = strrchr(old_path, '/'); | |
1466 | end_of_new = strrchr(new_path, '/'); | |
1467 | ||
1468 | if (end_of_old == NULL || end_of_new == NULL) | |
1469 | return; | |
1470 | while (*--end_of_new == *--end_of_old && | |
1471 | end_of_old != old_path && | |
1472 | end_of_new != new_path) | |
1473 | ; /* Do nothing; all in the while loop */ | |
1474 | /* | |
1475 | * We've found the first non-matching character in the directory | |
1476 | * paths. That means the current directory we were comparing | |
1477 | * represents the rename. Move end_of_old and end_of_new back | |
1478 | * to the full directory name. | |
1479 | */ | |
1480 | if (*end_of_old == '/') | |
1481 | end_of_old++; | |
1482 | if (*end_of_old != '/') | |
1483 | end_of_new++; | |
1484 | end_of_old = strchr(end_of_old, '/'); | |
1485 | end_of_new = strchr(end_of_new, '/'); | |
1486 | ||
1487 | /* | |
1488 | * It may have been the case that old_path and new_path were the same | |
1489 | * directory all along. Don't claim a rename if they're the same. | |
1490 | */ | |
1491 | old_len = end_of_old - old_path; | |
1492 | new_len = end_of_new - new_path; | |
1493 | ||
1494 | if (old_len != new_len || strncmp(old_path, new_path, old_len)) { | |
1495 | *old_dir = xstrndup(old_path, old_len); | |
1496 | *new_dir = xstrndup(new_path, new_len); | |
1497 | } | |
1498 | } | |
1499 | ||
53e32d46 EN |
1500 | static void remove_hashmap_entries(struct hashmap *dir_renames, |
1501 | struct string_list *items_to_remove) | |
1502 | { | |
1503 | int i; | |
1504 | struct dir_rename_entry *entry; | |
1505 | ||
1506 | for (i = 0; i < items_to_remove->nr; i++) { | |
1507 | entry = items_to_remove->items[i].util; | |
1508 | hashmap_remove(dir_renames, entry, NULL); | |
1509 | } | |
1510 | string_list_clear(items_to_remove, 0); | |
1511 | } | |
1512 | ||
1513 | /* | |
1514 | * There are a couple things we want to do at the directory level: | |
1515 | * 1. Check for both sides renaming to the same thing, in order to avoid | |
1516 | * implicit renaming of files that should be left in place. (See | |
1517 | * testcase 6b in t6043 for details.) | |
1518 | * 2. Prune directory renames if there are still files left in the | |
1519 | * the original directory. These represent a partial directory rename, | |
1520 | * i.e. a rename where only some of the files within the directory | |
1521 | * were renamed elsewhere. (Technically, this could be done earlier | |
1522 | * in get_directory_renames(), except that would prevent us from | |
1523 | * doing the previous check and thus failing testcase 6b.) | |
1524 | * 3. Check for rename/rename(1to2) conflicts (at the directory level). | |
1525 | * In the future, we could potentially record this info as well and | |
1526 | * omit reporting rename/rename(1to2) conflicts for each path within | |
1527 | * the affected directories, thus cleaning up the merge output. | |
1528 | * NOTE: We do NOT check for rename/rename(2to1) conflicts at the | |
1529 | * directory level, because merging directories is fine. If it | |
1530 | * causes conflicts for files within those merged directories, then | |
1531 | * that should be detected at the individual path level. | |
1532 | */ | |
1533 | static void handle_directory_level_conflicts(struct merge_options *o, | |
1534 | struct hashmap *dir_re_head, | |
1535 | struct tree *head, | |
1536 | struct hashmap *dir_re_merge, | |
1537 | struct tree *merge) | |
1538 | { | |
1539 | struct hashmap_iter iter; | |
1540 | struct dir_rename_entry *head_ent; | |
1541 | struct dir_rename_entry *merge_ent; | |
1542 | ||
1543 | struct string_list remove_from_head = STRING_LIST_INIT_NODUP; | |
1544 | struct string_list remove_from_merge = STRING_LIST_INIT_NODUP; | |
1545 | ||
1546 | hashmap_iter_init(dir_re_head, &iter); | |
1547 | while ((head_ent = hashmap_iter_next(&iter))) { | |
1548 | merge_ent = dir_rename_find_entry(dir_re_merge, head_ent->dir); | |
1549 | if (merge_ent && | |
1550 | !head_ent->non_unique_new_dir && | |
1551 | !merge_ent->non_unique_new_dir && | |
1552 | !strbuf_cmp(&head_ent->new_dir, &merge_ent->new_dir)) { | |
1553 | /* 1. Renamed identically; remove it from both sides */ | |
1554 | string_list_append(&remove_from_head, | |
1555 | head_ent->dir)->util = head_ent; | |
1556 | strbuf_release(&head_ent->new_dir); | |
1557 | string_list_append(&remove_from_merge, | |
1558 | merge_ent->dir)->util = merge_ent; | |
1559 | strbuf_release(&merge_ent->new_dir); | |
1560 | } else if (tree_has_path(head, head_ent->dir)) { | |
1561 | /* 2. This wasn't a directory rename after all */ | |
1562 | string_list_append(&remove_from_head, | |
1563 | head_ent->dir)->util = head_ent; | |
1564 | strbuf_release(&head_ent->new_dir); | |
1565 | } | |
1566 | } | |
1567 | ||
1568 | remove_hashmap_entries(dir_re_head, &remove_from_head); | |
1569 | remove_hashmap_entries(dir_re_merge, &remove_from_merge); | |
1570 | ||
1571 | hashmap_iter_init(dir_re_merge, &iter); | |
1572 | while ((merge_ent = hashmap_iter_next(&iter))) { | |
1573 | head_ent = dir_rename_find_entry(dir_re_head, merge_ent->dir); | |
1574 | if (tree_has_path(merge, merge_ent->dir)) { | |
1575 | /* 2. This wasn't a directory rename after all */ | |
1576 | string_list_append(&remove_from_merge, | |
1577 | merge_ent->dir)->util = merge_ent; | |
1578 | } else if (head_ent && | |
1579 | !head_ent->non_unique_new_dir && | |
1580 | !merge_ent->non_unique_new_dir) { | |
1581 | /* 3. rename/rename(1to2) */ | |
1582 | /* | |
1583 | * We can assume it's not rename/rename(1to1) because | |
1584 | * that was case (1), already checked above. So we | |
1585 | * know that head_ent->new_dir and merge_ent->new_dir | |
1586 | * are different strings. | |
1587 | */ | |
1588 | output(o, 1, _("CONFLICT (rename/rename): " | |
1589 | "Rename directory %s->%s in %s. " | |
1590 | "Rename directory %s->%s in %s"), | |
1591 | head_ent->dir, head_ent->new_dir.buf, o->branch1, | |
1592 | head_ent->dir, merge_ent->new_dir.buf, o->branch2); | |
1593 | string_list_append(&remove_from_head, | |
1594 | head_ent->dir)->util = head_ent; | |
1595 | strbuf_release(&head_ent->new_dir); | |
1596 | string_list_append(&remove_from_merge, | |
1597 | merge_ent->dir)->util = merge_ent; | |
1598 | strbuf_release(&merge_ent->new_dir); | |
1599 | } | |
1600 | } | |
1601 | ||
1602 | remove_hashmap_entries(dir_re_head, &remove_from_head); | |
1603 | remove_hashmap_entries(dir_re_merge, &remove_from_merge); | |
1604 | } | |
1605 | ||
8383408d EN |
1606 | static struct hashmap *get_directory_renames(struct diff_queue_struct *pairs, |
1607 | struct tree *tree) | |
1608 | { | |
1609 | struct hashmap *dir_renames; | |
1610 | struct hashmap_iter iter; | |
1611 | struct dir_rename_entry *entry; | |
1612 | int i; | |
1613 | ||
1614 | /* | |
1615 | * Typically, we think of a directory rename as all files from a | |
1616 | * certain directory being moved to a target directory. However, | |
1617 | * what if someone first moved two files from the original | |
1618 | * directory in one commit, and then renamed the directory | |
1619 | * somewhere else in a later commit? At merge time, we just know | |
1620 | * that files from the original directory went to two different | |
1621 | * places, and that the bulk of them ended up in the same place. | |
1622 | * We want each directory rename to represent where the bulk of the | |
1623 | * files from that directory end up; this function exists to find | |
1624 | * where the bulk of the files went. | |
1625 | * | |
1626 | * The first loop below simply iterates through the list of file | |
1627 | * renames, finding out how often each directory rename pair | |
1628 | * possibility occurs. | |
1629 | */ | |
1630 | dir_renames = xmalloc(sizeof(struct hashmap)); | |
1631 | dir_rename_init(dir_renames); | |
1632 | for (i = 0; i < pairs->nr; ++i) { | |
1633 | struct string_list_item *item; | |
1634 | int *count; | |
1635 | struct diff_filepair *pair = pairs->queue[i]; | |
1636 | char *old_dir, *new_dir; | |
1637 | ||
1638 | /* File not part of directory rename if it wasn't renamed */ | |
1639 | if (pair->status != 'R') | |
1640 | continue; | |
1641 | ||
1642 | get_renamed_dir_portion(pair->one->path, pair->two->path, | |
1643 | &old_dir, &new_dir); | |
1644 | if (!old_dir) | |
1645 | /* Directory didn't change at all; ignore this one. */ | |
1646 | continue; | |
1647 | ||
1648 | entry = dir_rename_find_entry(dir_renames, old_dir); | |
1649 | if (!entry) { | |
1650 | entry = xmalloc(sizeof(struct dir_rename_entry)); | |
1651 | dir_rename_entry_init(entry, old_dir); | |
1652 | hashmap_put(dir_renames, entry); | |
1653 | } else { | |
1654 | free(old_dir); | |
1655 | } | |
1656 | item = string_list_lookup(&entry->possible_new_dirs, new_dir); | |
1657 | if (!item) { | |
1658 | item = string_list_insert(&entry->possible_new_dirs, | |
1659 | new_dir); | |
1660 | item->util = xcalloc(1, sizeof(int)); | |
1661 | } else { | |
1662 | free(new_dir); | |
1663 | } | |
1664 | count = item->util; | |
1665 | *count += 1; | |
1666 | } | |
1667 | ||
1668 | /* | |
1669 | * For each directory with files moved out of it, we find out which | |
1670 | * target directory received the most files so we can declare it to | |
1671 | * be the "winning" target location for the directory rename. This | |
1672 | * winner gets recorded in new_dir. If there is no winner | |
1673 | * (multiple target directories received the same number of files), | |
1674 | * we set non_unique_new_dir. Once we've determined the winner (or | |
1675 | * that there is no winner), we no longer need possible_new_dirs. | |
1676 | */ | |
1677 | hashmap_iter_init(dir_renames, &iter); | |
1678 | while ((entry = hashmap_iter_next(&iter))) { | |
1679 | int max = 0; | |
1680 | int bad_max = 0; | |
1681 | char *best = NULL; | |
1682 | ||
1683 | for (i = 0; i < entry->possible_new_dirs.nr; i++) { | |
1684 | int *count = entry->possible_new_dirs.items[i].util; | |
1685 | ||
1686 | if (*count == max) | |
1687 | bad_max = max; | |
1688 | else if (*count > max) { | |
1689 | max = *count; | |
1690 | best = entry->possible_new_dirs.items[i].string; | |
1691 | } | |
1692 | } | |
1693 | if (bad_max == max) | |
1694 | entry->non_unique_new_dir = 1; | |
1695 | else { | |
1696 | assert(entry->new_dir.len == 0); | |
1697 | strbuf_addstr(&entry->new_dir, best); | |
1698 | } | |
1699 | /* | |
1700 | * The relevant directory sub-portion of the original full | |
1701 | * filepaths were xstrndup'ed before inserting into | |
1702 | * possible_new_dirs, and instead of manually iterating the | |
1703 | * list and free'ing each, just lie and tell | |
1704 | * possible_new_dirs that it did the strdup'ing so that it | |
1705 | * will free them for us. | |
1706 | */ | |
1707 | entry->possible_new_dirs.strdup_strings = 1; | |
1708 | string_list_clear(&entry->possible_new_dirs, 1); | |
1709 | } | |
1710 | ||
1711 | return dir_renames; | |
1712 | } | |
1713 | ||
ea625cb0 EN |
1714 | static struct dir_rename_entry *check_dir_renamed(const char *path, |
1715 | struct hashmap *dir_renames) | |
1716 | { | |
1717 | char temp[PATH_MAX]; | |
1718 | char *end; | |
1719 | struct dir_rename_entry *entry; | |
1720 | ||
1721 | strcpy(temp, path); | |
1722 | while ((end = strrchr(temp, '/'))) { | |
1723 | *end = '\0'; | |
1724 | entry = dir_rename_find_entry(dir_renames, temp); | |
1725 | if (entry) | |
1726 | return entry; | |
1727 | } | |
1728 | return NULL; | |
1729 | } | |
1730 | ||
1731 | static void compute_collisions(struct hashmap *collisions, | |
1732 | struct hashmap *dir_renames, | |
1733 | struct diff_queue_struct *pairs) | |
1734 | { | |
1735 | int i; | |
1736 | ||
1737 | /* | |
1738 | * Multiple files can be mapped to the same path due to directory | |
1739 | * renames done by the other side of history. Since that other | |
1740 | * side of history could have merged multiple directories into one, | |
1741 | * if our side of history added the same file basename to each of | |
1742 | * those directories, then all N of them would get implicitly | |
1743 | * renamed by the directory rename detection into the same path, | |
1744 | * and we'd get an add/add/.../add conflict, and all those adds | |
1745 | * from *this* side of history. This is not representable in the | |
1746 | * index, and users aren't going to easily be able to make sense of | |
1747 | * it. So we need to provide a good warning about what's | |
1748 | * happening, and fall back to no-directory-rename detection | |
1749 | * behavior for those paths. | |
1750 | * | |
1751 | * See testcases 9e and all of section 5 from t6043 for examples. | |
1752 | */ | |
1753 | collision_init(collisions); | |
1754 | ||
1755 | for (i = 0; i < pairs->nr; ++i) { | |
1756 | struct dir_rename_entry *dir_rename_ent; | |
1757 | struct collision_entry *collision_ent; | |
1758 | char *new_path; | |
1759 | struct diff_filepair *pair = pairs->queue[i]; | |
1760 | ||
1761 | if (pair->status == 'D') | |
1762 | continue; | |
1763 | dir_rename_ent = check_dir_renamed(pair->two->path, | |
1764 | dir_renames); | |
1765 | if (!dir_rename_ent) | |
1766 | continue; | |
1767 | ||
1768 | new_path = apply_dir_rename(dir_rename_ent, pair->two->path); | |
1769 | if (!new_path) | |
1770 | /* | |
1771 | * dir_rename_ent->non_unique_new_path is true, which | |
1772 | * means there is no directory rename for us to use, | |
1773 | * which means it won't cause us any additional | |
1774 | * collisions. | |
1775 | */ | |
1776 | continue; | |
1777 | collision_ent = collision_find_entry(collisions, new_path); | |
1778 | if (!collision_ent) { | |
1779 | collision_ent = xcalloc(1, | |
1780 | sizeof(struct collision_entry)); | |
1781 | hashmap_entry_init(collision_ent, strhash(new_path)); | |
1782 | hashmap_put(collisions, collision_ent); | |
1783 | collision_ent->target_file = new_path; | |
1784 | } else { | |
1785 | free(new_path); | |
1786 | } | |
1787 | string_list_insert(&collision_ent->source_files, | |
1788 | pair->two->path); | |
1789 | } | |
1790 | } | |
1791 | ||
3f646871 EN |
1792 | /* |
1793 | * Get information of all renames which occurred in 'pairs', making use of | |
1794 | * any implicit directory renames inferred from the other side of history. | |
1795 | * We need the three trees in the merge ('o_tree', 'a_tree' and 'b_tree') | |
1796 | * to be able to associate the correct cache entries with the rename | |
1797 | * information; tree is always equal to either a_tree or b_tree. | |
1798 | */ | |
1799 | static struct string_list *get_renames(struct merge_options *o, | |
1800 | struct diff_queue_struct *pairs, | |
ea625cb0 | 1801 | struct hashmap *dir_renames, |
3f646871 EN |
1802 | struct tree *tree, |
1803 | struct tree *o_tree, | |
1804 | struct tree *a_tree, | |
1805 | struct tree *b_tree, | |
1806 | struct string_list *entries) | |
1807 | { | |
1808 | int i; | |
ea625cb0 EN |
1809 | struct hashmap collisions; |
1810 | struct hashmap_iter iter; | |
1811 | struct collision_entry *e; | |
3f646871 EN |
1812 | struct string_list *renames; |
1813 | ||
ea625cb0 | 1814 | compute_collisions(&collisions, dir_renames, pairs); |
3f646871 EN |
1815 | renames = xcalloc(1, sizeof(struct string_list)); |
1816 | ||
1817 | for (i = 0; i < pairs->nr; ++i) { | |
a706e8f6 EN |
1818 | struct string_list_item *item; |
1819 | struct rename *re; | |
3f646871 | 1820 | struct diff_filepair *pair = pairs->queue[i]; |
a706e8f6 EN |
1821 | |
1822 | if (pair->status != 'R') { | |
1823 | diff_free_filepair(pair); | |
1824 | continue; | |
1825 | } | |
1826 | re = xmalloc(sizeof(*re)); | |
1827 | re->processed = 0; | |
1828 | re->pair = pair; | |
1829 | item = string_list_lookup(entries, re->pair->one->path); | |
1830 | if (!item) | |
1831 | re->src_entry = insert_stage_data(re->pair->one->path, | |
1832 | o_tree, a_tree, b_tree, entries); | |
1833 | else | |
1834 | re->src_entry = item->util; | |
1835 | ||
1836 | item = string_list_lookup(entries, re->pair->two->path); | |
1837 | if (!item) | |
1838 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
1839 | o_tree, a_tree, b_tree, entries); | |
1840 | else | |
1841 | re->dst_entry = item->util; | |
1842 | item = string_list_insert(renames, pair->one->path); | |
1843 | item->util = re; | |
1844 | } | |
ea625cb0 EN |
1845 | |
1846 | hashmap_iter_init(&collisions, &iter); | |
1847 | while ((e = hashmap_iter_next(&iter))) { | |
1848 | free(e->target_file); | |
1849 | string_list_clear(&e->source_files, 0); | |
1850 | } | |
1851 | hashmap_free(&collisions, 1); | |
a706e8f6 EN |
1852 | return renames; |
1853 | } | |
1854 | ||
8a2fce18 MV |
1855 | static int process_renames(struct merge_options *o, |
1856 | struct string_list *a_renames, | |
1857 | struct string_list *b_renames) | |
9047ebbc MV |
1858 | { |
1859 | int clean_merge = 1, i, j; | |
183113a5 TF |
1860 | struct string_list a_by_dst = STRING_LIST_INIT_NODUP; |
1861 | struct string_list b_by_dst = STRING_LIST_INIT_NODUP; | |
9047ebbc MV |
1862 | const struct rename *sre; |
1863 | ||
1864 | for (i = 0; i < a_renames->nr; i++) { | |
1865 | sre = a_renames->items[i].util; | |
78a395d3 | 1866 | string_list_insert(&a_by_dst, sre->pair->two->path)->util |
0a6b8712 | 1867 | = (void *)sre; |
9047ebbc MV |
1868 | } |
1869 | for (i = 0; i < b_renames->nr; i++) { | |
1870 | sre = b_renames->items[i].util; | |
78a395d3 | 1871 | string_list_insert(&b_by_dst, sre->pair->two->path)->util |
0a6b8712 | 1872 | = (void *)sre; |
9047ebbc MV |
1873 | } |
1874 | ||
1875 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { | |
8e24cbae | 1876 | struct string_list *renames1, *renames2Dst; |
9047ebbc MV |
1877 | struct rename *ren1 = NULL, *ren2 = NULL; |
1878 | const char *branch1, *branch2; | |
1879 | const char *ren1_src, *ren1_dst; | |
461f5041 | 1880 | struct string_list_item *lookup; |
9047ebbc MV |
1881 | |
1882 | if (i >= a_renames->nr) { | |
9047ebbc MV |
1883 | ren2 = b_renames->items[j++].util; |
1884 | } else if (j >= b_renames->nr) { | |
9047ebbc MV |
1885 | ren1 = a_renames->items[i++].util; |
1886 | } else { | |
8e24cbae BK |
1887 | int compare = strcmp(a_renames->items[i].string, |
1888 | b_renames->items[j].string); | |
9047ebbc MV |
1889 | if (compare <= 0) |
1890 | ren1 = a_renames->items[i++].util; | |
1891 | if (compare >= 0) | |
1892 | ren2 = b_renames->items[j++].util; | |
1893 | } | |
1894 | ||
1895 | /* TODO: refactor, so that 1/2 are not needed */ | |
1896 | if (ren1) { | |
1897 | renames1 = a_renames; | |
9047ebbc | 1898 | renames2Dst = &b_by_dst; |
8a2fce18 MV |
1899 | branch1 = o->branch1; |
1900 | branch2 = o->branch2; | |
9047ebbc | 1901 | } else { |
9047ebbc | 1902 | renames1 = b_renames; |
9047ebbc | 1903 | renames2Dst = &a_by_dst; |
8a2fce18 MV |
1904 | branch1 = o->branch2; |
1905 | branch2 = o->branch1; | |
35d803bc | 1906 | SWAP(ren2, ren1); |
9047ebbc | 1907 | } |
9047ebbc | 1908 | |
9047ebbc MV |
1909 | if (ren1->processed) |
1910 | continue; | |
1911 | ren1->processed = 1; | |
9047ebbc | 1912 | ren1->dst_entry->processed = 1; |
7769a75e EN |
1913 | /* BUG: We should only mark src_entry as processed if we |
1914 | * are not dealing with a rename + add-source case. | |
1915 | */ | |
9047ebbc | 1916 | ren1->src_entry->processed = 1; |
9047ebbc MV |
1917 | |
1918 | ren1_src = ren1->pair->one->path; | |
1919 | ren1_dst = ren1->pair->two->path; | |
1920 | ||
1921 | if (ren2) { | |
461f5041 | 1922 | /* One file renamed on both sides */ |
9047ebbc MV |
1923 | const char *ren2_src = ren2->pair->one->path; |
1924 | const char *ren2_dst = ren2->pair->two->path; | |
4f66dade | 1925 | enum rename_type rename_type; |
9047ebbc | 1926 | if (strcmp(ren1_src, ren2_src) != 0) |
ef1177d1 | 1927 | die("BUG: ren1_src != ren2_src"); |
9047ebbc MV |
1928 | ren2->dst_entry->processed = 1; |
1929 | ren2->processed = 1; | |
1930 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
4f66dade | 1931 | rename_type = RENAME_ONE_FILE_TO_TWO; |
461f5041 | 1932 | clean_merge = 0; |
9047ebbc | 1933 | } else { |
4f66dade | 1934 | rename_type = RENAME_ONE_FILE_TO_ONE; |
7769a75e EN |
1935 | /* BUG: We should only remove ren1_src in |
1936 | * the base stage (think of rename + | |
1937 | * add-source cases). | |
1938 | */ | |
b7fa51da | 1939 | remove_file(o, 1, ren1_src, 1); |
b8ddf164 EN |
1940 | update_entry(ren1->dst_entry, |
1941 | ren1->pair->one, | |
1942 | ren1->pair->two, | |
1943 | ren2->pair->two); | |
9047ebbc | 1944 | } |
4f66dade EN |
1945 | setup_rename_conflict_info(rename_type, |
1946 | ren1->pair, | |
1947 | ren2->pair, | |
1948 | branch1, | |
1949 | branch2, | |
1950 | ren1->dst_entry, | |
232c635f EN |
1951 | ren2->dst_entry, |
1952 | o, | |
1953 | NULL, | |
1954 | NULL); | |
461f5041 EN |
1955 | } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) { |
1956 | /* Two different files renamed to the same thing */ | |
1957 | char *ren2_dst; | |
1958 | ren2 = lookup->util; | |
1959 | ren2_dst = ren2->pair->two->path; | |
1960 | if (strcmp(ren1_dst, ren2_dst) != 0) | |
ef1177d1 | 1961 | die("BUG: ren1_dst != ren2_dst"); |
461f5041 EN |
1962 | |
1963 | clean_merge = 0; | |
1964 | ren2->processed = 1; | |
1965 | /* | |
1966 | * BUG: We should only mark src_entry as processed | |
1967 | * if we are not dealing with a rename + add-source | |
1968 | * case. | |
1969 | */ | |
1970 | ren2->src_entry->processed = 1; | |
1971 | ||
1972 | setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE, | |
1973 | ren1->pair, | |
1974 | ren2->pair, | |
1975 | branch1, | |
1976 | branch2, | |
1977 | ren1->dst_entry, | |
232c635f EN |
1978 | ren2->dst_entry, |
1979 | o, | |
1980 | ren1->src_entry, | |
1981 | ren2->src_entry); | |
1982 | ||
9047ebbc MV |
1983 | } else { |
1984 | /* Renamed in 1, maybe changed in 2 */ | |
9047ebbc MV |
1985 | /* we only use sha1 and mode of these */ |
1986 | struct diff_filespec src_other, dst_other; | |
41d70bd6 | 1987 | int try_merge; |
9047ebbc | 1988 | |
41d70bd6 EN |
1989 | /* |
1990 | * unpack_trees loads entries from common-commit | |
1991 | * into stage 1, from head-commit into stage 2, and | |
1992 | * from merge-commit into stage 3. We keep track | |
1993 | * of which side corresponds to the rename. | |
1994 | */ | |
1995 | int renamed_stage = a_renames == renames1 ? 2 : 3; | |
1996 | int other_stage = a_renames == renames1 ? 3 : 2; | |
9047ebbc | 1997 | |
7769a75e EN |
1998 | /* BUG: We should only remove ren1_src in the base |
1999 | * stage and in other_stage (think of rename + | |
2000 | * add-source case). | |
2001 | */ | |
531357a4 EN |
2002 | remove_file(o, 1, ren1_src, |
2003 | renamed_stage == 2 || !was_tracked(ren1_src)); | |
9047ebbc | 2004 | |
fd429e98 | 2005 | oidcpy(&src_other.oid, |
2006 | &ren1->src_entry->stages[other_stage].oid); | |
41d70bd6 | 2007 | src_other.mode = ren1->src_entry->stages[other_stage].mode; |
fd429e98 | 2008 | oidcpy(&dst_other.oid, |
2009 | &ren1->dst_entry->stages[other_stage].oid); | |
41d70bd6 | 2010 | dst_other.mode = ren1->dst_entry->stages[other_stage].mode; |
9047ebbc MV |
2011 | try_merge = 0; |
2012 | ||
b4da9d62 | 2013 | if (oid_eq(&src_other.oid, &null_oid)) { |
4f66dade EN |
2014 | setup_rename_conflict_info(RENAME_DELETE, |
2015 | ren1->pair, | |
2016 | NULL, | |
2017 | branch1, | |
2018 | branch2, | |
2019 | ren1->dst_entry, | |
232c635f EN |
2020 | NULL, |
2021 | o, | |
2022 | NULL, | |
4f66dade | 2023 | NULL); |
d5af5105 | 2024 | } else if ((dst_other.mode == ren1->pair->two->mode) && |
b4da9d62 | 2025 | oid_eq(&dst_other.oid, &ren1->pair->two->oid)) { |
35a74abf EN |
2026 | /* |
2027 | * Added file on the other side identical to | |
2028 | * the file being renamed: clean merge. | |
2029 | * Also, there is no need to overwrite the | |
2030 | * file already in the working copy, so call | |
2031 | * update_file_flags() instead of | |
2032 | * update_file(). | |
2033 | */ | |
75456f96 JS |
2034 | if (update_file_flags(o, |
2035 | &ren1->pair->two->oid, | |
2036 | ren1->pair->two->mode, | |
2037 | ren1_dst, | |
2038 | 1, /* update_cache */ | |
2039 | 0 /* update_wd */)) | |
2040 | clean_merge = -1; | |
b4da9d62 | 2041 | } else if (!oid_eq(&dst_other.oid, &null_oid)) { |
9047ebbc MV |
2042 | clean_merge = 0; |
2043 | try_merge = 1; | |
55653a68 JX |
2044 | output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. " |
2045 | "%s added in %s"), | |
9047ebbc MV |
2046 | ren1_src, ren1_dst, branch1, |
2047 | ren1_dst, branch2); | |
c94736a2 JH |
2048 | if (o->call_depth) { |
2049 | struct merge_file_info mfi; | |
3c8a51e8 JS |
2050 | if (merge_file_one(o, ren1_dst, &null_oid, 0, |
2051 | &ren1->pair->two->oid, | |
2052 | ren1->pair->two->mode, | |
2053 | &dst_other.oid, | |
2054 | dst_other.mode, | |
75456f96 JS |
2055 | branch1, branch2, &mfi)) { |
2056 | clean_merge = -1; | |
2057 | goto cleanup_and_return; | |
2058 | } | |
55653a68 | 2059 | output(o, 1, _("Adding merged %s"), ren1_dst); |
75456f96 JS |
2060 | if (update_file(o, 0, &mfi.oid, |
2061 | mfi.mode, ren1_dst)) | |
2062 | clean_merge = -1; | |
2a669c34 | 2063 | try_merge = 0; |
c94736a2 | 2064 | } else { |
3d6b8e88 | 2065 | char *new_path = unique_path(o, ren1_dst, branch2); |
55653a68 | 2066 | output(o, 1, _("Adding as %s instead"), new_path); |
75456f96 JS |
2067 | if (update_file(o, 0, &dst_other.oid, |
2068 | dst_other.mode, new_path)) | |
2069 | clean_merge = -1; | |
3d6b8e88 | 2070 | free(new_path); |
c94736a2 | 2071 | } |
9047ebbc MV |
2072 | } else |
2073 | try_merge = 1; | |
2074 | ||
75456f96 JS |
2075 | if (clean_merge < 0) |
2076 | goto cleanup_and_return; | |
9047ebbc | 2077 | if (try_merge) { |
8a2fce18 | 2078 | struct diff_filespec *one, *a, *b; |
9047ebbc MV |
2079 | src_other.path = (char *)ren1_src; |
2080 | ||
8a2fce18 | 2081 | one = ren1->pair->one; |
9047ebbc MV |
2082 | if (a_renames == renames1) { |
2083 | a = ren1->pair->two; | |
2084 | b = &src_other; | |
2085 | } else { | |
2086 | b = ren1->pair->two; | |
2087 | a = &src_other; | |
2088 | } | |
b8ddf164 | 2089 | update_entry(ren1->dst_entry, one, a, b); |
4f66dade EN |
2090 | setup_rename_conflict_info(RENAME_NORMAL, |
2091 | ren1->pair, | |
2092 | NULL, | |
2093 | branch1, | |
2094 | NULL, | |
2095 | ren1->dst_entry, | |
232c635f EN |
2096 | NULL, |
2097 | o, | |
2098 | NULL, | |
4f66dade | 2099 | NULL); |
9047ebbc MV |
2100 | } |
2101 | } | |
2102 | } | |
75456f96 | 2103 | cleanup_and_return: |
9047ebbc MV |
2104 | string_list_clear(&a_by_dst, 0); |
2105 | string_list_clear(&b_by_dst, 0); | |
2106 | ||
2107 | return clean_merge; | |
2108 | } | |
2109 | ||
2dd6f8aa EN |
2110 | struct rename_info { |
2111 | struct string_list *head_renames; | |
2112 | struct string_list *merge_renames; | |
2113 | }; | |
2114 | ||
8383408d EN |
2115 | static void initial_cleanup_rename(struct diff_queue_struct *pairs, |
2116 | struct hashmap *dir_renames) | |
84a548de | 2117 | { |
8383408d EN |
2118 | struct hashmap_iter iter; |
2119 | struct dir_rename_entry *e; | |
2120 | ||
2121 | hashmap_iter_init(dir_renames, &iter); | |
2122 | while ((e = hashmap_iter_next(&iter))) { | |
2123 | free(e->dir); | |
2124 | strbuf_release(&e->new_dir); | |
2125 | /* possible_new_dirs already cleared in get_directory_renames */ | |
2126 | } | |
2127 | hashmap_free(dir_renames, 1); | |
2128 | free(dir_renames); | |
2129 | ||
84a548de EN |
2130 | free(pairs->queue); |
2131 | free(pairs); | |
2132 | } | |
2133 | ||
2dd6f8aa EN |
2134 | static int handle_renames(struct merge_options *o, |
2135 | struct tree *common, | |
2136 | struct tree *head, | |
2137 | struct tree *merge, | |
2138 | struct string_list *entries, | |
2139 | struct rename_info *ri) | |
2140 | { | |
3f646871 | 2141 | struct diff_queue_struct *head_pairs, *merge_pairs; |
8383408d | 2142 | struct hashmap *dir_re_head, *dir_re_merge; |
3f646871 EN |
2143 | int clean; |
2144 | ||
e7f04a3a EN |
2145 | ri->head_renames = NULL; |
2146 | ri->merge_renames = NULL; | |
2147 | ||
2148 | if (!o->detect_rename) | |
2149 | return 1; | |
2150 | ||
3f646871 EN |
2151 | head_pairs = get_diffpairs(o, common, head); |
2152 | merge_pairs = get_diffpairs(o, common, merge); | |
2153 | ||
8383408d EN |
2154 | dir_re_head = get_directory_renames(head_pairs, head); |
2155 | dir_re_merge = get_directory_renames(merge_pairs, merge); | |
2156 | ||
53e32d46 EN |
2157 | handle_directory_level_conflicts(o, |
2158 | dir_re_head, head, | |
2159 | dir_re_merge, merge); | |
2160 | ||
ea625cb0 EN |
2161 | ri->head_renames = get_renames(o, head_pairs, |
2162 | dir_re_merge, head, | |
2163 | common, head, merge, entries); | |
2164 | ri->merge_renames = get_renames(o, merge_pairs, | |
2165 | dir_re_head, merge, | |
3f646871 EN |
2166 | common, head, merge, entries); |
2167 | clean = process_renames(o, ri->head_renames, ri->merge_renames); | |
2168 | ||
2169 | /* | |
2170 | * Some cleanup is deferred until cleanup_renames() because the | |
2171 | * data structures are still needed and referenced in | |
2172 | * process_entry(). But there are a few things we can free now. | |
2173 | */ | |
8383408d EN |
2174 | initial_cleanup_rename(head_pairs, dir_re_head); |
2175 | initial_cleanup_rename(merge_pairs, dir_re_merge); | |
3f646871 EN |
2176 | |
2177 | return clean; | |
2dd6f8aa EN |
2178 | } |
2179 | ||
84a548de | 2180 | static void final_cleanup_rename(struct string_list *rename) |
2dd6f8aa | 2181 | { |
9622f8af EN |
2182 | const struct rename *re; |
2183 | int i; | |
2dd6f8aa | 2184 | |
e7f04a3a EN |
2185 | if (rename == NULL) |
2186 | return; | |
2187 | ||
9622f8af EN |
2188 | for (i = 0; i < rename->nr; i++) { |
2189 | re = rename->items[i].util; | |
2190 | diff_free_filepair(re->pair); | |
2191 | } | |
2192 | string_list_clear(rename, 1); | |
2193 | free(rename); | |
2194 | } | |
2195 | ||
84a548de | 2196 | static void final_cleanup_renames(struct rename_info *re_info) |
9622f8af | 2197 | { |
84a548de EN |
2198 | final_cleanup_rename(re_info->head_renames); |
2199 | final_cleanup_rename(re_info->merge_renames); | |
2dd6f8aa EN |
2200 | } |
2201 | ||
b4da9d62 | 2202 | static struct object_id *stage_oid(const struct object_id *oid, unsigned mode) |
9047ebbc | 2203 | { |
b4da9d62 | 2204 | return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid; |
9047ebbc MV |
2205 | } |
2206 | ||
bc9204d4 JS |
2207 | static int read_oid_strbuf(struct merge_options *o, |
2208 | const struct object_id *oid, struct strbuf *dst) | |
331a1838 EB |
2209 | { |
2210 | void *buf; | |
2211 | enum object_type type; | |
2212 | unsigned long size; | |
b4da9d62 | 2213 | buf = read_sha1_file(oid->hash, &type, &size); |
331a1838 | 2214 | if (!buf) |
bc9204d4 | 2215 | return err(o, _("cannot read object %s"), oid_to_hex(oid)); |
331a1838 EB |
2216 | if (type != OBJ_BLOB) { |
2217 | free(buf); | |
bc9204d4 | 2218 | return err(o, _("object %s is not a blob"), oid_to_hex(oid)); |
331a1838 EB |
2219 | } |
2220 | strbuf_attach(dst, buf, size, size + 1); | |
2221 | return 0; | |
2222 | } | |
2223 | ||
bc9204d4 JS |
2224 | static int blob_unchanged(struct merge_options *opt, |
2225 | const struct object_id *o_oid, | |
72fac66b | 2226 | unsigned o_mode, |
b4da9d62 | 2227 | const struct object_id *a_oid, |
72fac66b | 2228 | unsigned a_mode, |
3e7589b7 | 2229 | int renormalize, const char *path) |
331a1838 EB |
2230 | { |
2231 | struct strbuf o = STRBUF_INIT; | |
2232 | struct strbuf a = STRBUF_INIT; | |
2233 | int ret = 0; /* assume changed for safety */ | |
2234 | ||
72fac66b JK |
2235 | if (a_mode != o_mode) |
2236 | return 0; | |
b4da9d62 | 2237 | if (oid_eq(o_oid, a_oid)) |
331a1838 | 2238 | return 1; |
3e7589b7 | 2239 | if (!renormalize) |
331a1838 EB |
2240 | return 0; |
2241 | ||
b4da9d62 | 2242 | assert(o_oid && a_oid); |
bc9204d4 | 2243 | if (read_oid_strbuf(opt, o_oid, &o) || read_oid_strbuf(opt, a_oid, &a)) |
331a1838 EB |
2244 | goto error_return; |
2245 | /* | |
2246 | * Note: binary | is used so that both renormalizations are | |
2247 | * performed. Comparison can be skipped if both files are | |
2248 | * unchanged since their sha1s have already been compared. | |
2249 | */ | |
a33e0b2a BW |
2250 | if (renormalize_buffer(&the_index, path, o.buf, o.len, &o) | |
2251 | renormalize_buffer(&the_index, path, a.buf, a.len, &a)) | |
331a1838 EB |
2252 | ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); |
2253 | ||
2254 | error_return: | |
2255 | strbuf_release(&o); | |
2256 | strbuf_release(&a); | |
2257 | return ret; | |
2258 | } | |
2259 | ||
75456f96 | 2260 | static int handle_modify_delete(struct merge_options *o, |
5e3ce663 | 2261 | const char *path, |
b4da9d62 | 2262 | struct object_id *o_oid, int o_mode, |
2263 | struct object_id *a_oid, int a_mode, | |
2264 | struct object_id *b_oid, int b_mode) | |
5e3ce663 | 2265 | { |
b26d87f2 MM |
2266 | const char *modify_branch, *delete_branch; |
2267 | struct object_id *changed_oid; | |
2268 | int changed_mode; | |
2269 | ||
2270 | if (a_oid) { | |
2271 | modify_branch = o->branch1; | |
2272 | delete_branch = o->branch2; | |
2273 | changed_oid = a_oid; | |
2274 | changed_mode = a_mode; | |
2275 | } else { | |
2276 | modify_branch = o->branch2; | |
2277 | delete_branch = o->branch1; | |
2278 | changed_oid = b_oid; | |
2279 | changed_mode = b_mode; | |
2280 | } | |
2281 | ||
75456f96 | 2282 | return handle_change_delete(o, |
b26d87f2 | 2283 | path, NULL, |
75456f96 | 2284 | o_oid, o_mode, |
b26d87f2 MM |
2285 | changed_oid, changed_mode, |
2286 | modify_branch, delete_branch, | |
75456f96 | 2287 | _("modify"), _("modified")); |
5e3ce663 EN |
2288 | } |
2289 | ||
0c4918d1 EN |
2290 | static int merge_content(struct merge_options *o, |
2291 | const char *path, | |
b4da9d62 | 2292 | struct object_id *o_oid, int o_mode, |
2293 | struct object_id *a_oid, int a_mode, | |
2294 | struct object_id *b_oid, int b_mode, | |
4f66dade | 2295 | struct rename_conflict_info *rename_conflict_info) |
0c4918d1 | 2296 | { |
55653a68 | 2297 | const char *reason = _("content"); |
5b448b85 | 2298 | const char *path1 = NULL, *path2 = NULL; |
0c4918d1 EN |
2299 | struct merge_file_info mfi; |
2300 | struct diff_filespec one, a, b; | |
4ab9a157 | 2301 | unsigned df_conflict_remains = 0; |
0c4918d1 | 2302 | |
b4da9d62 | 2303 | if (!o_oid) { |
55653a68 | 2304 | reason = _("add/add"); |
b4da9d62 | 2305 | o_oid = (struct object_id *)&null_oid; |
0c4918d1 EN |
2306 | } |
2307 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 2308 | oidcpy(&one.oid, o_oid); |
0c4918d1 | 2309 | one.mode = o_mode; |
b4da9d62 | 2310 | oidcpy(&a.oid, a_oid); |
0c4918d1 | 2311 | a.mode = a_mode; |
b4da9d62 | 2312 | oidcpy(&b.oid, b_oid); |
0c4918d1 EN |
2313 | b.mode = b_mode; |
2314 | ||
3c217c07 | 2315 | if (rename_conflict_info) { |
3c217c07 EN |
2316 | struct diff_filepair *pair1 = rename_conflict_info->pair1; |
2317 | ||
2318 | path1 = (o->branch1 == rename_conflict_info->branch1) ? | |
2319 | pair1->two->path : pair1->one->path; | |
2320 | /* If rename_conflict_info->pair2 != NULL, we are in | |
2321 | * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a | |
2322 | * normal rename. | |
2323 | */ | |
2324 | path2 = (rename_conflict_info->pair2 || | |
2325 | o->branch2 == rename_conflict_info->branch1) ? | |
2326 | pair1->two->path : pair1->one->path; | |
3c217c07 | 2327 | |
5423d2e7 DT |
2328 | if (dir_in_way(path, !o->call_depth, |
2329 | S_ISGITLINK(pair1->two->mode))) | |
3c217c07 | 2330 | df_conflict_remains = 1; |
4ab9a157 | 2331 | } |
3c8a51e8 JS |
2332 | if (merge_file_special_markers(o, &one, &a, &b, |
2333 | o->branch1, path1, | |
2334 | o->branch2, path2, &mfi)) | |
2335 | return -1; | |
4ab9a157 EN |
2336 | |
2337 | if (mfi.clean && !df_conflict_remains && | |
b4da9d62 | 2338 | oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) { |
5b448b85 | 2339 | int path_renamed_outside_HEAD; |
55653a68 | 2340 | output(o, 3, _("Skipped %s (merged same as existing)"), path); |
5b448b85 EN |
2341 | /* |
2342 | * The content merge resulted in the same file contents we | |
2343 | * already had. We can return early if those file contents | |
2344 | * are recorded at the correct path (which may not be true | |
2345 | * if the merge involves a rename). | |
2346 | */ | |
2347 | path_renamed_outside_HEAD = !path2 || !strcmp(path, path2); | |
2348 | if (!path_renamed_outside_HEAD) { | |
bc9204d4 | 2349 | add_cacheinfo(o, mfi.mode, &mfi.oid, path, |
d45b7f40 | 2350 | 0, (!o->call_depth), 0); |
5b448b85 EN |
2351 | return mfi.clean; |
2352 | } | |
2353 | } else | |
55653a68 | 2354 | output(o, 2, _("Auto-merging %s"), path); |
0c4918d1 EN |
2355 | |
2356 | if (!mfi.clean) { | |
2357 | if (S_ISGITLINK(mfi.mode)) | |
55653a68 JX |
2358 | reason = _("submodule"); |
2359 | output(o, 1, _("CONFLICT (%s): Merge conflict in %s"), | |
0c4918d1 | 2360 | reason, path); |
4f66dade | 2361 | if (rename_conflict_info && !df_conflict_remains) |
bc9204d4 | 2362 | if (update_stages(o, path, &one, &a, &b)) |
75456f96 | 2363 | return -1; |
0c4918d1 EN |
2364 | } |
2365 | ||
4ab9a157 | 2366 | if (df_conflict_remains) { |
3d6b8e88 | 2367 | char *new_path; |
51931bf0 EN |
2368 | if (o->call_depth) { |
2369 | remove_file_from_cache(path); | |
2370 | } else { | |
75456f96 | 2371 | if (!mfi.clean) { |
bc9204d4 | 2372 | if (update_stages(o, path, &one, &a, &b)) |
75456f96 JS |
2373 | return -1; |
2374 | } else { | |
51931bf0 EN |
2375 | int file_from_stage2 = was_tracked(path); |
2376 | struct diff_filespec merged; | |
9b561499 | 2377 | oidcpy(&merged.oid, &mfi.oid); |
51931bf0 EN |
2378 | merged.mode = mfi.mode; |
2379 | ||
bc9204d4 | 2380 | if (update_stages(o, path, NULL, |
75456f96 JS |
2381 | file_from_stage2 ? &merged : NULL, |
2382 | file_from_stage2 ? NULL : &merged)) | |
2383 | return -1; | |
51931bf0 EN |
2384 | } |
2385 | ||
2386 | } | |
4f66dade | 2387 | new_path = unique_path(o, path, rename_conflict_info->branch1); |
55653a68 | 2388 | output(o, 1, _("Adding as %s instead"), new_path); |
75456f96 JS |
2389 | if (update_file(o, 0, &mfi.oid, mfi.mode, new_path)) { |
2390 | free(new_path); | |
2391 | return -1; | |
2392 | } | |
3d6b8e88 | 2393 | free(new_path); |
51931bf0 | 2394 | mfi.clean = 0; |
75456f96 JS |
2395 | } else if (update_file(o, mfi.clean, &mfi.oid, mfi.mode, path)) |
2396 | return -1; | |
0c4918d1 | 2397 | return mfi.clean; |
0c4918d1 EN |
2398 | } |
2399 | ||
9047ebbc | 2400 | /* Per entry merge function */ |
8a2fce18 MV |
2401 | static int process_entry(struct merge_options *o, |
2402 | const char *path, struct stage_data *entry) | |
9047ebbc | 2403 | { |
9047ebbc | 2404 | int clean_merge = 1; |
1bc0ab7c | 2405 | int normalize = o->renormalize; |
9047ebbc MV |
2406 | unsigned o_mode = entry->stages[1].mode; |
2407 | unsigned a_mode = entry->stages[2].mode; | |
2408 | unsigned b_mode = entry->stages[3].mode; | |
b4da9d62 | 2409 | struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode); |
2410 | struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode); | |
2411 | struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode); | |
9047ebbc | 2412 | |
37348937 | 2413 | entry->processed = 1; |
4f66dade EN |
2414 | if (entry->rename_conflict_info) { |
2415 | struct rename_conflict_info *conflict_info = entry->rename_conflict_info; | |
07413c5a | 2416 | switch (conflict_info->rename_type) { |
882fd11a | 2417 | case RENAME_NORMAL: |
4f66dade | 2418 | case RENAME_ONE_FILE_TO_ONE: |
882fd11a | 2419 | clean_merge = merge_content(o, path, |
b4da9d62 | 2420 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, |
4f66dade | 2421 | conflict_info); |
882fd11a | 2422 | break; |
3b130adf EN |
2423 | case RENAME_DELETE: |
2424 | clean_merge = 0; | |
75456f96 JS |
2425 | if (conflict_rename_delete(o, |
2426 | conflict_info->pair1, | |
2427 | conflict_info->branch1, | |
2428 | conflict_info->branch2)) | |
2429 | clean_merge = -1; | |
3b130adf | 2430 | break; |
07413c5a | 2431 | case RENAME_ONE_FILE_TO_TWO: |
07413c5a | 2432 | clean_merge = 0; |
75456f96 JS |
2433 | if (conflict_rename_rename_1to2(o, conflict_info)) |
2434 | clean_merge = -1; | |
07413c5a | 2435 | break; |
461f5041 EN |
2436 | case RENAME_TWO_FILES_TO_ONE: |
2437 | clean_merge = 0; | |
75456f96 JS |
2438 | if (conflict_rename_rename_2to1(o, conflict_info)) |
2439 | clean_merge = -1; | |
07413c5a EN |
2440 | break; |
2441 | default: | |
2442 | entry->processed = 0; | |
2443 | break; | |
2444 | } | |
b4da9d62 | 2445 | } else if (o_oid && (!a_oid || !b_oid)) { |
edd2faf5 | 2446 | /* Case A: Deleted in one */ |
b4da9d62 | 2447 | if ((!a_oid && !b_oid) || |
bc9204d4 JS |
2448 | (!b_oid && blob_unchanged(o, o_oid, o_mode, a_oid, a_mode, normalize, path)) || |
2449 | (!a_oid && blob_unchanged(o, o_oid, o_mode, b_oid, b_mode, normalize, path))) { | |
edd2faf5 EN |
2450 | /* Deleted in both or deleted in one and |
2451 | * unchanged in the other */ | |
b4da9d62 | 2452 | if (a_oid) |
55653a68 | 2453 | output(o, 2, _("Removing %s"), path); |
edd2faf5 | 2454 | /* do not touch working file if it did not exist */ |
b4da9d62 | 2455 | remove_file(o, 1, path, !a_oid); |
edd2faf5 EN |
2456 | } else { |
2457 | /* Modify/delete; deleted side may have put a directory in the way */ | |
edd2faf5 | 2458 | clean_merge = 0; |
75456f96 JS |
2459 | if (handle_modify_delete(o, path, o_oid, o_mode, |
2460 | a_oid, a_mode, b_oid, b_mode)) | |
2461 | clean_merge = -1; | |
3d6b8e88 | 2462 | } |
b4da9d62 | 2463 | } else if ((!o_oid && a_oid && !b_oid) || |
2464 | (!o_oid && !a_oid && b_oid)) { | |
edd2faf5 EN |
2465 | /* Case B: Added in one. */ |
2466 | /* [nothing|directory] -> ([nothing|directory], file) */ | |
2467 | ||
9c0bbb50 EN |
2468 | const char *add_branch; |
2469 | const char *other_branch; | |
2470 | unsigned mode; | |
b4da9d62 | 2471 | const struct object_id *oid; |
9c0bbb50 | 2472 | const char *conf; |
37348937 | 2473 | |
b4da9d62 | 2474 | if (a_oid) { |
9c0bbb50 EN |
2475 | add_branch = o->branch1; |
2476 | other_branch = o->branch2; | |
2477 | mode = a_mode; | |
b4da9d62 | 2478 | oid = a_oid; |
55653a68 | 2479 | conf = _("file/directory"); |
9c0bbb50 EN |
2480 | } else { |
2481 | add_branch = o->branch2; | |
2482 | other_branch = o->branch1; | |
2483 | mode = b_mode; | |
b4da9d62 | 2484 | oid = b_oid; |
55653a68 | 2485 | conf = _("directory/file"); |
9c0bbb50 | 2486 | } |
c641ca67 EN |
2487 | if (dir_in_way(path, |
2488 | !o->call_depth && !S_ISGITLINK(a_mode), | |
2489 | 0)) { | |
3d6b8e88 | 2490 | char *new_path = unique_path(o, path, add_branch); |
9c0bbb50 | 2491 | clean_merge = 0; |
55653a68 JX |
2492 | output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " |
2493 | "Adding %s as %s"), | |
9c0bbb50 | 2494 | conf, path, other_branch, path, new_path); |
75456f96 JS |
2495 | if (update_file(o, 0, oid, mode, new_path)) |
2496 | clean_merge = -1; | |
2497 | else if (o->call_depth) | |
7b1c610f | 2498 | remove_file_from_cache(path); |
3d6b8e88 | 2499 | free(new_path); |
9c0bbb50 | 2500 | } else { |
55653a68 | 2501 | output(o, 2, _("Adding %s"), path); |
35a74abf | 2502 | /* do not overwrite file if already present */ |
75456f96 JS |
2503 | if (update_file_flags(o, oid, mode, path, 1, !a_oid)) |
2504 | clean_merge = -1; | |
9c0bbb50 | 2505 | } |
b4da9d62 | 2506 | } else if (a_oid && b_oid) { |
edd2faf5 EN |
2507 | /* Case C: Added in both (check for same permissions) and */ |
2508 | /* case D: Modified in both, but differently. */ | |
4f66dade | 2509 | clean_merge = merge_content(o, path, |
b4da9d62 | 2510 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, |
edd2faf5 | 2511 | NULL); |
b4da9d62 | 2512 | } else if (!o_oid && !a_oid && !b_oid) { |
edd2faf5 EN |
2513 | /* |
2514 | * this entry was deleted altogether. a_mode == 0 means | |
2515 | * we had that path and want to actively remove it. | |
2516 | */ | |
2517 | remove_file(o, 1, path, !a_mode); | |
2518 | } else | |
7e97e100 | 2519 | die("BUG: fatal merge failure, shouldn't happen."); |
37348937 EN |
2520 | |
2521 | return clean_merge; | |
2522 | } | |
2523 | ||
8a2fce18 MV |
2524 | int merge_trees(struct merge_options *o, |
2525 | struct tree *head, | |
9047ebbc MV |
2526 | struct tree *merge, |
2527 | struct tree *common, | |
9047ebbc MV |
2528 | struct tree **result) |
2529 | { | |
2530 | int code, clean; | |
2531 | ||
85e51b78 JH |
2532 | if (o->subtree_shift) { |
2533 | merge = shift_tree_object(head, merge, o->subtree_shift); | |
2534 | common = shift_tree_object(head, common, o->subtree_shift); | |
9047ebbc MV |
2535 | } |
2536 | ||
b4da9d62 | 2537 | if (oid_eq(&common->object.oid, &merge->object.oid)) { |
65170c07 EN |
2538 | struct strbuf sb = STRBUF_INIT; |
2539 | ||
f309e8e7 | 2540 | if (!o->call_depth && index_has_changes(&sb)) { |
65170c07 EN |
2541 | err(o, _("Dirty index: cannot merge (dirty: %s)"), |
2542 | sb.buf); | |
2543 | return 0; | |
2544 | } | |
7560f547 | 2545 | output(o, 0, _("Already up to date!")); |
9047ebbc MV |
2546 | *result = head; |
2547 | return 1; | |
2548 | } | |
2549 | ||
b7fa51da | 2550 | code = git_merge_trees(o->call_depth, common, head, merge); |
9047ebbc | 2551 | |
fadd069d JH |
2552 | if (code != 0) { |
2553 | if (show(o, 4) || o->call_depth) | |
bc9204d4 | 2554 | err(o, _("merging of trees %s and %s failed"), |
f2fd0760 | 2555 | oid_to_hex(&head->object.oid), |
2556 | oid_to_hex(&merge->object.oid)); | |
6003303a | 2557 | return -1; |
fadd069d | 2558 | } |
9047ebbc MV |
2559 | |
2560 | if (unmerged_cache()) { | |
2dd6f8aa EN |
2561 | struct string_list *entries; |
2562 | struct rename_info re_info; | |
9047ebbc | 2563 | int i; |
fc65b00d KW |
2564 | /* |
2565 | * Only need the hashmap while processing entries, so | |
2566 | * initialize it here and free it when we are done running | |
2567 | * through the entries. Keeping it in the merge_options as | |
2568 | * opposed to decaring a local hashmap is for convenience | |
2569 | * so that we don't have to pass it to around. | |
2570 | */ | |
2571 | hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512); | |
696ee23c MV |
2572 | get_files_dirs(o, head); |
2573 | get_files_dirs(o, merge); | |
9047ebbc MV |
2574 | |
2575 | entries = get_unmerged(); | |
2dd6f8aa EN |
2576 | clean = handle_renames(o, common, head, merge, entries, |
2577 | &re_info); | |
6c8647da | 2578 | record_df_conflict_files(o, entries); |
75456f96 | 2579 | if (clean < 0) |
e336bdc5 | 2580 | goto cleanup; |
edd2faf5 | 2581 | for (i = entries->nr-1; 0 <= i; i--) { |
9047ebbc MV |
2582 | const char *path = entries->items[i].string; |
2583 | struct stage_data *e = entries->items[i].util; | |
75456f96 JS |
2584 | if (!e->processed) { |
2585 | int ret = process_entry(o, path, e); | |
2586 | if (!ret) | |
2587 | clean = 0; | |
e336bdc5 KW |
2588 | else if (ret < 0) { |
2589 | clean = ret; | |
2590 | goto cleanup; | |
2591 | } | |
75456f96 | 2592 | } |
9047ebbc | 2593 | } |
7edba4c4 JH |
2594 | for (i = 0; i < entries->nr; i++) { |
2595 | struct stage_data *e = entries->items[i].util; | |
2596 | if (!e->processed) | |
7e97e100 | 2597 | die("BUG: unprocessed path??? %s", |
7edba4c4 JH |
2598 | entries->items[i].string); |
2599 | } | |
9047ebbc | 2600 | |
e336bdc5 | 2601 | cleanup: |
84a548de | 2602 | final_cleanup_renames(&re_info); |
2dd6f8aa | 2603 | |
9047ebbc | 2604 | string_list_clear(entries, 1); |
2dd6f8aa | 2605 | free(entries); |
9047ebbc | 2606 | |
fc65b00d KW |
2607 | hashmap_free(&o->current_file_dir_set, 1); |
2608 | ||
e336bdc5 KW |
2609 | if (clean < 0) |
2610 | return clean; | |
9047ebbc MV |
2611 | } |
2612 | else | |
2613 | clean = 1; | |
2614 | ||
fbc87eb5 JS |
2615 | if (o->call_depth && !(*result = write_tree_from_memory(o))) |
2616 | return -1; | |
9047ebbc MV |
2617 | |
2618 | return clean; | |
2619 | } | |
2620 | ||
2621 | static struct commit_list *reverse_commit_list(struct commit_list *list) | |
2622 | { | |
2623 | struct commit_list *next = NULL, *current, *backup; | |
2624 | for (current = list; current; current = backup) { | |
2625 | backup = current->next; | |
2626 | current->next = next; | |
2627 | next = current; | |
2628 | } | |
2629 | return next; | |
2630 | } | |
2631 | ||
2632 | /* | |
2633 | * Merge the commits h1 and h2, return the resulting virtual | |
2634 | * commit object and a flag indicating the cleanness of the merge. | |
2635 | */ | |
8a2fce18 MV |
2636 | int merge_recursive(struct merge_options *o, |
2637 | struct commit *h1, | |
9047ebbc | 2638 | struct commit *h2, |
9047ebbc MV |
2639 | struct commit_list *ca, |
2640 | struct commit **result) | |
2641 | { | |
2642 | struct commit_list *iter; | |
2643 | struct commit *merged_common_ancestors; | |
2644 | struct tree *mrtree = mrtree; | |
2645 | int clean; | |
2646 | ||
8a2fce18 | 2647 | if (show(o, 4)) { |
55653a68 | 2648 | output(o, 4, _("Merging:")); |
5033639c MV |
2649 | output_commit_title(o, h1); |
2650 | output_commit_title(o, h2); | |
9047ebbc MV |
2651 | } |
2652 | ||
2653 | if (!ca) { | |
2ce406cc | 2654 | ca = get_merge_bases(h1, h2); |
9047ebbc MV |
2655 | ca = reverse_commit_list(ca); |
2656 | } | |
2657 | ||
8a2fce18 | 2658 | if (show(o, 5)) { |
e0453cd8 RT |
2659 | unsigned cnt = commit_list_count(ca); |
2660 | ||
2661 | output(o, 5, Q_("found %u common ancestor:", | |
2662 | "found %u common ancestors:", cnt), cnt); | |
9047ebbc | 2663 | for (iter = ca; iter; iter = iter->next) |
5033639c | 2664 | output_commit_title(o, iter->item); |
9047ebbc MV |
2665 | } |
2666 | ||
2667 | merged_common_ancestors = pop_commit(&ca); | |
2668 | if (merged_common_ancestors == NULL) { | |
03f622c8 JN |
2669 | /* if there is no common ancestor, use an empty tree */ |
2670 | struct tree *tree; | |
9047ebbc | 2671 | |
eb0ccfd7 | 2672 | tree = lookup_tree(the_hash_algo->empty_tree); |
9047ebbc MV |
2673 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); |
2674 | } | |
2675 | ||
2676 | for (iter = ca; iter; iter = iter->next) { | |
8a2fce18 | 2677 | const char *saved_b1, *saved_b2; |
5033639c | 2678 | o->call_depth++; |
9047ebbc MV |
2679 | /* |
2680 | * When the merge fails, the result contains files | |
2681 | * with conflict markers. The cleanness flag is | |
de8946de JS |
2682 | * ignored (unless indicating an error), it was never |
2683 | * actually used, as result of merge_trees has always | |
2684 | * overwritten it: the committed "conflicts" were | |
2685 | * already resolved. | |
9047ebbc MV |
2686 | */ |
2687 | discard_cache(); | |
8a2fce18 MV |
2688 | saved_b1 = o->branch1; |
2689 | saved_b2 = o->branch2; | |
2690 | o->branch1 = "Temporary merge branch 1"; | |
2691 | o->branch2 = "Temporary merge branch 2"; | |
de8946de JS |
2692 | if (merge_recursive(o, merged_common_ancestors, iter->item, |
2693 | NULL, &merged_common_ancestors) < 0) | |
2694 | return -1; | |
8a2fce18 MV |
2695 | o->branch1 = saved_b1; |
2696 | o->branch2 = saved_b2; | |
5033639c | 2697 | o->call_depth--; |
9047ebbc MV |
2698 | |
2699 | if (!merged_common_ancestors) | |
bc9204d4 | 2700 | return err(o, _("merge returned no commit")); |
9047ebbc MV |
2701 | } |
2702 | ||
2703 | discard_cache(); | |
b7fa51da | 2704 | if (!o->call_depth) |
9047ebbc | 2705 | read_cache(); |
9047ebbc | 2706 | |
7ca56aa0 | 2707 | o->ancestor = "merged common ancestors"; |
8a2fce18 MV |
2708 | clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree, |
2709 | &mrtree); | |
6999bc70 JS |
2710 | if (clean < 0) { |
2711 | flush_output(o); | |
de8946de | 2712 | return clean; |
6999bc70 | 2713 | } |
9047ebbc | 2714 | |
b7fa51da | 2715 | if (o->call_depth) { |
9047ebbc MV |
2716 | *result = make_virtual_commit(mrtree, "merged tree"); |
2717 | commit_list_insert(h1, &(*result)->parents); | |
2718 | commit_list_insert(h2, &(*result)->parents->next); | |
2719 | } | |
c7d84924 | 2720 | flush_output(o); |
548009c0 JS |
2721 | if (!o->call_depth && o->buffer_output < 2) |
2722 | strbuf_release(&o->obuf); | |
f31027c9 JH |
2723 | if (show(o, 2)) |
2724 | diff_warn_rename_limit("merge.renamelimit", | |
2725 | o->needed_rename_limit, 0); | |
9047ebbc MV |
2726 | return clean; |
2727 | } | |
2728 | ||
4e8161a8 | 2729 | static struct commit *get_ref(const struct object_id *oid, const char *name) |
73118f89 SB |
2730 | { |
2731 | struct object *object; | |
2732 | ||
c251c83d | 2733 | object = deref_tag(parse_object(oid), name, strlen(name)); |
73118f89 SB |
2734 | if (!object) |
2735 | return NULL; | |
2736 | if (object->type == OBJ_TREE) | |
2737 | return make_virtual_commit((struct tree*)object, name); | |
2738 | if (object->type != OBJ_COMMIT) | |
2739 | return NULL; | |
2740 | if (parse_commit((struct commit *)object)) | |
2741 | return NULL; | |
2742 | return (struct commit *)object; | |
2743 | } | |
2744 | ||
8a2fce18 | 2745 | int merge_recursive_generic(struct merge_options *o, |
4e8161a8 | 2746 | const struct object_id *head, |
2747 | const struct object_id *merge, | |
8a2fce18 | 2748 | int num_base_list, |
4e8161a8 | 2749 | const struct object_id **base_list, |
8a2fce18 | 2750 | struct commit **result) |
73118f89 | 2751 | { |
03b86647 | 2752 | int clean; |
837e34eb | 2753 | struct lock_file lock = LOCK_INIT; |
8a2fce18 MV |
2754 | struct commit *head_commit = get_ref(head, o->branch1); |
2755 | struct commit *next_commit = get_ref(merge, o->branch2); | |
73118f89 SB |
2756 | struct commit_list *ca = NULL; |
2757 | ||
2758 | if (base_list) { | |
2759 | int i; | |
8a2fce18 | 2760 | for (i = 0; i < num_base_list; ++i) { |
73118f89 | 2761 | struct commit *base; |
4e8161a8 | 2762 | if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i])))) |
bc9204d4 | 2763 | return err(o, _("Could not parse object '%s'"), |
4e8161a8 | 2764 | oid_to_hex(base_list[i])); |
73118f89 SB |
2765 | commit_list_insert(base, &ca); |
2766 | } | |
2767 | } | |
2768 | ||
837e34eb | 2769 | hold_locked_index(&lock, LOCK_DIE_ON_ERROR); |
8a2fce18 MV |
2770 | clean = merge_recursive(o, head_commit, next_commit, ca, |
2771 | result); | |
de8946de JS |
2772 | if (clean < 0) |
2773 | return clean; | |
2774 | ||
73118f89 | 2775 | if (active_cache_changed && |
837e34eb | 2776 | write_locked_index(&the_index, &lock, COMMIT_LOCK)) |
bc9204d4 | 2777 | return err(o, _("Unable to write index.")); |
73118f89 SB |
2778 | |
2779 | return clean ? 0 : 1; | |
2780 | } | |
2781 | ||
0e7bcb1b | 2782 | static void merge_recursive_config(struct merge_options *o) |
9047ebbc | 2783 | { |
0e7bcb1b TA |
2784 | git_config_get_int("merge.verbosity", &o->verbosity); |
2785 | git_config_get_int("diff.renamelimit", &o->diff_rename_limit); | |
2786 | git_config_get_int("merge.renamelimit", &o->merge_rename_limit); | |
2787 | git_config(git_xmerge_config, NULL); | |
9047ebbc MV |
2788 | } |
2789 | ||
8a2fce18 | 2790 | void init_merge_options(struct merge_options *o) |
9047ebbc | 2791 | { |
80486220 | 2792 | const char *merge_verbosity; |
8a2fce18 MV |
2793 | memset(o, 0, sizeof(struct merge_options)); |
2794 | o->verbosity = 2; | |
2795 | o->buffer_output = 1; | |
2796 | o->diff_rename_limit = -1; | |
2797 | o->merge_rename_limit = -1; | |
7610fa57 | 2798 | o->renormalize = 0; |
d2b11eca | 2799 | o->detect_rename = 1; |
0e7bcb1b | 2800 | merge_recursive_config(o); |
80486220 AO |
2801 | merge_verbosity = getenv("GIT_MERGE_VERBOSITY"); |
2802 | if (merge_verbosity) | |
2803 | o->verbosity = strtol(merge_verbosity, NULL, 10); | |
8a2fce18 MV |
2804 | if (o->verbosity >= 5) |
2805 | o->buffer_output = 0; | |
c7d84924 | 2806 | strbuf_init(&o->obuf, 0); |
f93d7c6f | 2807 | string_list_init(&o->df_conflict_file_set, 1); |
9047ebbc | 2808 | } |
635a7bb1 JN |
2809 | |
2810 | int parse_merge_opt(struct merge_options *o, const char *s) | |
2811 | { | |
95b567c7 JK |
2812 | const char *arg; |
2813 | ||
635a7bb1 JN |
2814 | if (!s || !*s) |
2815 | return -1; | |
2816 | if (!strcmp(s, "ours")) | |
2817 | o->recursive_variant = MERGE_RECURSIVE_OURS; | |
2818 | else if (!strcmp(s, "theirs")) | |
2819 | o->recursive_variant = MERGE_RECURSIVE_THEIRS; | |
2820 | else if (!strcmp(s, "subtree")) | |
2821 | o->subtree_shift = ""; | |
95b567c7 JK |
2822 | else if (skip_prefix(s, "subtree=", &arg)) |
2823 | o->subtree_shift = arg; | |
58a1ece4 | 2824 | else if (!strcmp(s, "patience")) |
307ab20b | 2825 | o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); |
8c912eea | 2826 | else if (!strcmp(s, "histogram")) |
307ab20b | 2827 | o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); |
95b567c7 JK |
2828 | else if (skip_prefix(s, "diff-algorithm=", &arg)) { |
2829 | long value = parse_algorithm_value(arg); | |
07924d4d MP |
2830 | if (value < 0) |
2831 | return -1; | |
2832 | /* clear out previous settings */ | |
2833 | DIFF_XDL_CLR(o, NEED_MINIMAL); | |
2834 | o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; | |
2835 | o->xdl_opts |= value; | |
2836 | } | |
4e5dd044 | 2837 | else if (!strcmp(s, "ignore-space-change")) |
c2d4b4cd | 2838 | DIFF_XDL_SET(o, IGNORE_WHITESPACE_CHANGE); |
4e5dd044 | 2839 | else if (!strcmp(s, "ignore-all-space")) |
c2d4b4cd | 2840 | DIFF_XDL_SET(o, IGNORE_WHITESPACE); |
4e5dd044 | 2841 | else if (!strcmp(s, "ignore-space-at-eol")) |
c2d4b4cd | 2842 | DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL); |
e9282f02 JH |
2843 | else if (!strcmp(s, "ignore-cr-at-eol")) |
2844 | DIFF_XDL_SET(o, IGNORE_CR_AT_EOL); | |
635a7bb1 JN |
2845 | else if (!strcmp(s, "renormalize")) |
2846 | o->renormalize = 1; | |
2847 | else if (!strcmp(s, "no-renormalize")) | |
2848 | o->renormalize = 0; | |
d2b11eca FGA |
2849 | else if (!strcmp(s, "no-renames")) |
2850 | o->detect_rename = 0; | |
87892f60 | 2851 | else if (!strcmp(s, "find-renames")) { |
1b47ad16 | 2852 | o->detect_rename = 1; |
87892f60 FGA |
2853 | o->rename_score = 0; |
2854 | } | |
1b47ad16 FGA |
2855 | else if (skip_prefix(s, "find-renames=", &arg) || |
2856 | skip_prefix(s, "rename-threshold=", &arg)) { | |
95b567c7 | 2857 | if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0) |
10ae7526 | 2858 | return -1; |
d2b11eca | 2859 | o->detect_rename = 1; |
10ae7526 | 2860 | } |
635a7bb1 JN |
2861 | else |
2862 | return -1; | |
2863 | return 0; | |
2864 | } |