]>
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" | |
1c4b6604 | 7 | #include "advice.h" |
697cc8ef | 8 | #include "lockfile.h" |
9047ebbc MV |
9 | #include "cache-tree.h" |
10 | #include "commit.h" | |
11 | #include "blob.h" | |
12 | #include "builtin.h" | |
13 | #include "tree-walk.h" | |
14 | #include "diff.h" | |
15 | #include "diffcore.h" | |
16 | #include "tag.h" | |
17 | #include "unpack-trees.h" | |
18 | #include "string-list.h" | |
19 | #include "xdiff-interface.h" | |
20 | #include "ll-merge.h" | |
9047ebbc MV |
21 | #include "attr.h" |
22 | #include "merge-recursive.h" | |
9800c0df | 23 | #include "dir.h" |
68d03e4a | 24 | #include "submodule.h" |
9047ebbc | 25 | |
85e51b78 JH |
26 | static struct tree *shift_tree_object(struct tree *one, struct tree *two, |
27 | const char *subtree_shift) | |
9047ebbc | 28 | { |
f2fd0760 | 29 | struct object_id shifted; |
9047ebbc | 30 | |
85e51b78 | 31 | if (!*subtree_shift) { |
82db3d44 | 32 | shift_tree(&one->object.oid, &two->object.oid, &shifted, 0); |
85e51b78 | 33 | } else { |
82db3d44 | 34 | shift_tree_by(&one->object.oid, &two->object.oid, &shifted, |
85e51b78 JH |
35 | subtree_shift); |
36 | } | |
f2fd0760 | 37 | if (!oidcmp(&two->object.oid, &shifted)) |
9047ebbc | 38 | return two; |
f2fd0760 | 39 | return lookup_tree(shifted.hash); |
9047ebbc MV |
40 | } |
41 | ||
2af202be | 42 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) |
9047ebbc | 43 | { |
10322a0a | 44 | struct commit *commit = alloc_commit_node(); |
ae8e4c9c JH |
45 | struct merge_remote_desc *desc = xmalloc(sizeof(*desc)); |
46 | ||
47 | desc->name = comment; | |
48 | desc->obj = (struct object *)commit; | |
9047ebbc | 49 | commit->tree = tree; |
ae8e4c9c | 50 | commit->util = desc; |
9047ebbc MV |
51 | commit->object.parsed = 1; |
52 | return commit; | |
53 | } | |
54 | ||
55 | /* | |
56 | * Since we use get_tree_entry(), which does not put the read object into | |
57 | * the object pool, we cannot rely on a == b. | |
58 | */ | |
b4da9d62 | 59 | static int oid_eq(const struct object_id *a, const struct object_id *b) |
9047ebbc MV |
60 | { |
61 | if (!a && !b) | |
62 | return 2; | |
b4da9d62 | 63 | return a && b && oidcmp(a, b) == 0; |
9047ebbc MV |
64 | } |
65 | ||
25c39363 EN |
66 | enum rename_type { |
67 | RENAME_NORMAL = 0, | |
68 | RENAME_DELETE, | |
4f66dade | 69 | RENAME_ONE_FILE_TO_ONE, |
461f5041 EN |
70 | RENAME_ONE_FILE_TO_TWO, |
71 | RENAME_TWO_FILES_TO_ONE | |
25c39363 EN |
72 | }; |
73 | ||
4f66dade | 74 | struct rename_conflict_info { |
25c39363 EN |
75 | enum rename_type rename_type; |
76 | struct diff_filepair *pair1; | |
77 | struct diff_filepair *pair2; | |
78 | const char *branch1; | |
79 | const char *branch2; | |
80 | struct stage_data *dst_entry1; | |
81 | struct stage_data *dst_entry2; | |
232c635f EN |
82 | struct diff_filespec ren1_other; |
83 | struct diff_filespec ren2_other; | |
25c39363 EN |
84 | }; |
85 | ||
9047ebbc MV |
86 | /* |
87 | * Since we want to write the index eventually, we cannot reuse the index | |
88 | * for these (temporary) data. | |
89 | */ | |
9cba13ca JN |
90 | struct stage_data { |
91 | struct { | |
9047ebbc | 92 | unsigned mode; |
fd429e98 | 93 | struct object_id oid; |
9047ebbc | 94 | } stages[4]; |
4f66dade | 95 | struct rename_conflict_info *rename_conflict_info; |
9047ebbc MV |
96 | unsigned processed:1; |
97 | }; | |
98 | ||
4f66dade EN |
99 | static inline void setup_rename_conflict_info(enum rename_type rename_type, |
100 | struct diff_filepair *pair1, | |
101 | struct diff_filepair *pair2, | |
102 | const char *branch1, | |
103 | const char *branch2, | |
104 | struct stage_data *dst_entry1, | |
232c635f EN |
105 | struct stage_data *dst_entry2, |
106 | struct merge_options *o, | |
107 | struct stage_data *src_entry1, | |
108 | struct stage_data *src_entry2) | |
25c39363 | 109 | { |
4f66dade | 110 | struct rename_conflict_info *ci = xcalloc(1, sizeof(struct rename_conflict_info)); |
25c39363 EN |
111 | ci->rename_type = rename_type; |
112 | ci->pair1 = pair1; | |
113 | ci->branch1 = branch1; | |
114 | ci->branch2 = branch2; | |
115 | ||
116 | ci->dst_entry1 = dst_entry1; | |
4f66dade | 117 | dst_entry1->rename_conflict_info = ci; |
25c39363 EN |
118 | dst_entry1->processed = 0; |
119 | ||
120 | assert(!pair2 == !dst_entry2); | |
121 | if (dst_entry2) { | |
122 | ci->dst_entry2 = dst_entry2; | |
123 | ci->pair2 = pair2; | |
4f66dade | 124 | dst_entry2->rename_conflict_info = ci; |
25c39363 | 125 | } |
232c635f EN |
126 | |
127 | if (rename_type == RENAME_TWO_FILES_TO_ONE) { | |
128 | /* | |
129 | * For each rename, there could have been | |
130 | * modifications on the side of history where that | |
131 | * file was not renamed. | |
132 | */ | |
133 | int ostage1 = o->branch1 == branch1 ? 3 : 2; | |
134 | int ostage2 = ostage1 ^ 1; | |
135 | ||
136 | ci->ren1_other.path = pair1->one->path; | |
fd429e98 | 137 | oidcpy(&ci->ren1_other.oid, &src_entry1->stages[ostage1].oid); |
232c635f EN |
138 | ci->ren1_other.mode = src_entry1->stages[ostage1].mode; |
139 | ||
140 | ci->ren2_other.path = pair2->one->path; | |
fd429e98 | 141 | oidcpy(&ci->ren2_other.oid, &src_entry2->stages[ostage2].oid); |
232c635f | 142 | ci->ren2_other.mode = src_entry2->stages[ostage2].mode; |
25c39363 EN |
143 | } |
144 | } | |
145 | ||
8a2fce18 | 146 | static int show(struct merge_options *o, int v) |
9047ebbc | 147 | { |
5033639c | 148 | return (!o->call_depth && o->verbosity >= v) || o->verbosity >= 5; |
9047ebbc MV |
149 | } |
150 | ||
c7d84924 | 151 | static void flush_output(struct merge_options *o) |
9047ebbc | 152 | { |
c7d84924 MV |
153 | if (o->obuf.len) { |
154 | fputs(o->obuf.buf, stdout); | |
155 | strbuf_reset(&o->obuf); | |
9047ebbc MV |
156 | } |
157 | } | |
158 | ||
28bea9e5 | 159 | __attribute__((format (printf, 3, 4))) |
8a2fce18 | 160 | static void output(struct merge_options *o, int v, const char *fmt, ...) |
9047ebbc | 161 | { |
9047ebbc MV |
162 | va_list ap; |
163 | ||
8a2fce18 | 164 | if (!show(o, v)) |
9047ebbc MV |
165 | return; |
166 | ||
415792ed | 167 | strbuf_addchars(&o->obuf, ' ', o->call_depth * 2); |
9047ebbc MV |
168 | |
169 | va_start(ap, fmt); | |
ebeb6090 | 170 | strbuf_vaddf(&o->obuf, fmt, ap); |
9047ebbc MV |
171 | va_end(ap); |
172 | ||
294b2680 | 173 | strbuf_addch(&o->obuf, '\n'); |
8a2fce18 | 174 | if (!o->buffer_output) |
c7d84924 | 175 | flush_output(o); |
9047ebbc MV |
176 | } |
177 | ||
5033639c | 178 | static void output_commit_title(struct merge_options *o, struct commit *commit) |
9047ebbc MV |
179 | { |
180 | int i; | |
c7d84924 | 181 | flush_output(o); |
5033639c | 182 | for (i = o->call_depth; i--;) |
9047ebbc MV |
183 | fputs(" ", stdout); |
184 | if (commit->util) | |
ae8e4c9c | 185 | printf("virtual %s\n", merge_remote_util(commit)->name); |
9047ebbc | 186 | else { |
ed1c9977 | 187 | printf("%s ", find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV)); |
9047ebbc | 188 | if (parse_commit(commit) != 0) |
55653a68 | 189 | printf(_("(bad commit)\n")); |
9047ebbc | 190 | else { |
49b7120e | 191 | const char *title; |
8597ea3a | 192 | const char *msg = get_commit_buffer(commit, NULL); |
bc6b8fc1 | 193 | int len = find_commit_subject(msg, &title); |
49b7120e CC |
194 | if (len) |
195 | printf("%.*s\n", len, title); | |
bc6b8fc1 | 196 | unuse_commit_buffer(commit, msg); |
9047ebbc MV |
197 | } |
198 | } | |
199 | } | |
200 | ||
b4da9d62 | 201 | static int add_cacheinfo(unsigned int mode, const struct object_id *oid, |
9047ebbc MV |
202 | const char *path, int stage, int refresh, int options) |
203 | { | |
204 | struct cache_entry *ce; | |
b4da9d62 | 205 | ce = make_cache_entry(mode, oid ? oid->hash : null_sha1, path, stage, |
6e2068ae BK |
206 | (refresh ? (CE_MATCH_REFRESH | |
207 | CE_MATCH_IGNORE_MISSING) : 0 )); | |
9047ebbc | 208 | if (!ce) |
55653a68 | 209 | return error(_("addinfo_cache failed for path '%s'"), path); |
9047ebbc MV |
210 | return add_cache_entry(ce, options); |
211 | } | |
212 | ||
9047ebbc MV |
213 | static void init_tree_desc_from_tree(struct tree_desc *desc, struct tree *tree) |
214 | { | |
215 | parse_tree(tree); | |
216 | init_tree_desc(desc, tree->buffer, tree->size); | |
217 | } | |
218 | ||
219 | static int git_merge_trees(int index_only, | |
220 | struct tree *common, | |
221 | struct tree *head, | |
222 | struct tree *merge) | |
223 | { | |
224 | int rc; | |
225 | struct tree_desc t[3]; | |
226 | struct unpack_trees_options opts; | |
227 | ||
228 | memset(&opts, 0, sizeof(opts)); | |
229 | if (index_only) | |
230 | opts.index_only = 1; | |
231 | else | |
232 | opts.update = 1; | |
233 | opts.merge = 1; | |
234 | opts.head_idx = 2; | |
235 | opts.fn = threeway_merge; | |
236 | opts.src_index = &the_index; | |
237 | opts.dst_index = &the_index; | |
e294030f | 238 | setup_unpack_trees_porcelain(&opts, "merge"); |
9047ebbc MV |
239 | |
240 | init_tree_desc_from_tree(t+0, common); | |
241 | init_tree_desc_from_tree(t+1, head); | |
242 | init_tree_desc_from_tree(t+2, merge); | |
243 | ||
244 | rc = unpack_trees(3, t, &opts); | |
245 | cache_tree_free(&active_cache_tree); | |
246 | return rc; | |
247 | } | |
248 | ||
8a2fce18 | 249 | struct tree *write_tree_from_memory(struct merge_options *o) |
9047ebbc MV |
250 | { |
251 | struct tree *result = NULL; | |
252 | ||
253 | if (unmerged_cache()) { | |
254 | int i; | |
19c6a4f8 | 255 | fprintf(stderr, "BUG: There are unmerged index entries:\n"); |
9047ebbc | 256 | for (i = 0; i < active_nr; i++) { |
9c5e6c80 | 257 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc | 258 | if (ce_stage(ce)) |
c43ba42e | 259 | fprintf(stderr, "BUG: %d %.*s\n", ce_stage(ce), |
19c6a4f8 | 260 | (int)ce_namelen(ce), ce->name); |
9047ebbc | 261 | } |
19c6a4f8 | 262 | die("Bug in merge-recursive.c"); |
9047ebbc MV |
263 | } |
264 | ||
265 | if (!active_cache_tree) | |
266 | active_cache_tree = cache_tree(); | |
267 | ||
268 | if (!cache_tree_fully_valid(active_cache_tree) && | |
d0cfc3e8 | 269 | cache_tree_update(&the_index, 0) < 0) |
55653a68 | 270 | die(_("error building trees")); |
9047ebbc MV |
271 | |
272 | result = lookup_tree(active_cache_tree->sha1); | |
273 | ||
274 | return result; | |
275 | } | |
276 | ||
277 | static int save_files_dirs(const unsigned char *sha1, | |
6a0b0b6d | 278 | struct strbuf *base, const char *path, |
9047ebbc MV |
279 | unsigned int mode, int stage, void *context) |
280 | { | |
6a0b0b6d | 281 | int baselen = base->len; |
696ee23c MV |
282 | struct merge_options *o = context; |
283 | ||
6a0b0b6d | 284 | strbuf_addstr(base, path); |
9047ebbc MV |
285 | |
286 | if (S_ISDIR(mode)) | |
6a0b0b6d | 287 | string_list_insert(&o->current_directory_set, base->buf); |
9047ebbc | 288 | else |
6a0b0b6d | 289 | string_list_insert(&o->current_file_set, base->buf); |
9047ebbc | 290 | |
6a0b0b6d | 291 | strbuf_setlen(base, baselen); |
d3bee161 | 292 | return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0); |
9047ebbc MV |
293 | } |
294 | ||
696ee23c | 295 | static int get_files_dirs(struct merge_options *o, struct tree *tree) |
9047ebbc MV |
296 | { |
297 | int n; | |
f0096c06 | 298 | struct pathspec match_all; |
9a087274 | 299 | memset(&match_all, 0, sizeof(match_all)); |
f0096c06 | 300 | if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o)) |
9047ebbc | 301 | return 0; |
696ee23c | 302 | n = o->current_file_set.nr + o->current_directory_set.nr; |
9047ebbc MV |
303 | return n; |
304 | } | |
305 | ||
306 | /* | |
307 | * Returns an index_entry instance which doesn't have to correspond to | |
308 | * a real cache entry in Git's index. | |
309 | */ | |
310 | static struct stage_data *insert_stage_data(const char *path, | |
311 | struct tree *o, struct tree *a, struct tree *b, | |
312 | struct string_list *entries) | |
313 | { | |
314 | struct string_list_item *item; | |
315 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); | |
ed1c9977 | 316 | get_tree_entry(o->object.oid.hash, path, |
fd429e98 | 317 | e->stages[1].oid.hash, &e->stages[1].mode); |
ed1c9977 | 318 | get_tree_entry(a->object.oid.hash, path, |
fd429e98 | 319 | e->stages[2].oid.hash, &e->stages[2].mode); |
ed1c9977 | 320 | get_tree_entry(b->object.oid.hash, path, |
fd429e98 | 321 | e->stages[3].oid.hash, &e->stages[3].mode); |
78a395d3 | 322 | item = string_list_insert(entries, path); |
9047ebbc MV |
323 | item->util = e; |
324 | return e; | |
325 | } | |
326 | ||
327 | /* | |
328 | * Create a dictionary mapping file names to stage_data objects. The | |
329 | * dictionary contains one entry for every path with a non-zero stage entry. | |
330 | */ | |
331 | static struct string_list *get_unmerged(void) | |
332 | { | |
333 | struct string_list *unmerged = xcalloc(1, sizeof(struct string_list)); | |
334 | int i; | |
335 | ||
336 | unmerged->strdup_strings = 1; | |
337 | ||
338 | for (i = 0; i < active_nr; i++) { | |
339 | struct string_list_item *item; | |
340 | struct stage_data *e; | |
9c5e6c80 | 341 | const struct cache_entry *ce = active_cache[i]; |
9047ebbc MV |
342 | if (!ce_stage(ce)) |
343 | continue; | |
344 | ||
e8c8b713 | 345 | item = string_list_lookup(unmerged, ce->name); |
9047ebbc | 346 | if (!item) { |
78a395d3 | 347 | item = string_list_insert(unmerged, ce->name); |
9047ebbc MV |
348 | item->util = xcalloc(1, sizeof(struct stage_data)); |
349 | } | |
350 | e = item->util; | |
351 | e->stages[ce_stage(ce)].mode = ce->ce_mode; | |
fd429e98 | 352 | hashcpy(e->stages[ce_stage(ce)].oid.hash, ce->sha1); |
9047ebbc MV |
353 | } |
354 | ||
355 | return unmerged; | |
356 | } | |
357 | ||
f0fd4d05 | 358 | static int string_list_df_name_compare(const void *a, const void *b) |
ef02b317 | 359 | { |
f0fd4d05 EN |
360 | const struct string_list_item *one = a; |
361 | const struct string_list_item *two = b; | |
362 | int onelen = strlen(one->string); | |
363 | int twolen = strlen(two->string); | |
364 | /* | |
365 | * Here we only care that entries for D/F conflicts are | |
366 | * adjacent, in particular with the file of the D/F conflict | |
367 | * appearing before files below the corresponding directory. | |
368 | * The order of the rest of the list is irrelevant for us. | |
ef02b317 | 369 | * |
f0fd4d05 EN |
370 | * To achieve this, we sort with df_name_compare and provide |
371 | * the mode S_IFDIR so that D/F conflicts will sort correctly. | |
372 | * We use the mode S_IFDIR for everything else for simplicity, | |
373 | * since in other cases any changes in their order due to | |
374 | * sorting cause no problems for us. | |
375 | */ | |
376 | int cmp = df_name_compare(one->string, onelen, S_IFDIR, | |
377 | two->string, twolen, S_IFDIR); | |
378 | /* | |
379 | * Now that 'foo' and 'foo/bar' compare equal, we have to make sure | |
380 | * that 'foo' comes before 'foo/bar'. | |
ef02b317 | 381 | */ |
f0fd4d05 EN |
382 | if (cmp) |
383 | return cmp; | |
384 | return onelen - twolen; | |
385 | } | |
386 | ||
70cc3d36 EN |
387 | static void record_df_conflict_files(struct merge_options *o, |
388 | struct string_list *entries) | |
ef02b317 | 389 | { |
70cc3d36 | 390 | /* If there is a D/F conflict and the file for such a conflict |
f7d650c0 | 391 | * currently exist in the working tree, we want to allow it to be |
edd2faf5 EN |
392 | * removed to make room for the corresponding directory if needed. |
393 | * The files underneath the directories of such D/F conflicts will | |
394 | * be processed before the corresponding file involved in the D/F | |
395 | * conflict. If the D/F directory ends up being removed by the | |
396 | * merge, then we won't have to touch the D/F file. If the D/F | |
397 | * directory needs to be written to the working copy, then the D/F | |
398 | * file will simply be removed (in make_room_for_path()) to make | |
399 | * room for the necessary paths. Note that if both the directory | |
400 | * and the file need to be present, then the D/F file will be | |
401 | * reinstated with a new unique name at the time it is processed. | |
ef02b317 | 402 | */ |
f701aae0 | 403 | struct string_list df_sorted_entries; |
ef02b317 | 404 | const char *last_file = NULL; |
c8516500 | 405 | int last_len = 0; |
ef02b317 EN |
406 | int i; |
407 | ||
0b30e812 EN |
408 | /* |
409 | * If we're merging merge-bases, we don't want to bother with | |
410 | * any working directory changes. | |
411 | */ | |
412 | if (o->call_depth) | |
413 | return; | |
414 | ||
f0fd4d05 | 415 | /* Ensure D/F conflicts are adjacent in the entries list. */ |
f701aae0 | 416 | memset(&df_sorted_entries, 0, sizeof(struct string_list)); |
ef02b317 | 417 | for (i = 0; i < entries->nr; i++) { |
f701aae0 EN |
418 | struct string_list_item *next = &entries->items[i]; |
419 | string_list_append(&df_sorted_entries, next->string)->util = | |
420 | next->util; | |
421 | } | |
422 | qsort(df_sorted_entries.items, entries->nr, sizeof(*entries->items), | |
f0fd4d05 EN |
423 | string_list_df_name_compare); |
424 | ||
70cc3d36 | 425 | string_list_clear(&o->df_conflict_file_set, 1); |
f701aae0 EN |
426 | for (i = 0; i < df_sorted_entries.nr; i++) { |
427 | const char *path = df_sorted_entries.items[i].string; | |
ef02b317 | 428 | int len = strlen(path); |
f701aae0 | 429 | struct stage_data *e = df_sorted_entries.items[i].util; |
ef02b317 EN |
430 | |
431 | /* | |
432 | * Check if last_file & path correspond to a D/F conflict; | |
433 | * i.e. whether path is last_file+'/'+<something>. | |
70cc3d36 EN |
434 | * If so, record that it's okay to remove last_file to make |
435 | * room for path and friends if needed. | |
ef02b317 EN |
436 | */ |
437 | if (last_file && | |
438 | len > last_len && | |
439 | memcmp(path, last_file, last_len) == 0 && | |
440 | path[last_len] == '/') { | |
70cc3d36 | 441 | string_list_insert(&o->df_conflict_file_set, last_file); |
ef02b317 EN |
442 | } |
443 | ||
444 | /* | |
445 | * Determine whether path could exist as a file in the | |
446 | * working directory as a possible D/F conflict. This | |
447 | * will only occur when it exists in stage 2 as a | |
448 | * file. | |
449 | */ | |
450 | if (S_ISREG(e->stages[2].mode) || S_ISLNK(e->stages[2].mode)) { | |
451 | last_file = path; | |
452 | last_len = len; | |
ef02b317 EN |
453 | } else { |
454 | last_file = NULL; | |
455 | } | |
456 | } | |
f701aae0 | 457 | string_list_clear(&df_sorted_entries, 0); |
ef02b317 EN |
458 | } |
459 | ||
9cba13ca | 460 | struct rename { |
9047ebbc MV |
461 | struct diff_filepair *pair; |
462 | struct stage_data *src_entry; | |
463 | struct stage_data *dst_entry; | |
464 | unsigned processed:1; | |
465 | }; | |
466 | ||
467 | /* | |
468 | * Get information of all renames which occurred between 'o_tree' and | |
469 | * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and | |
470 | * 'b_tree') to be able to associate the correct cache entries with | |
471 | * the rename information. 'tree' is always equal to either a_tree or b_tree. | |
472 | */ | |
8a2fce18 MV |
473 | static struct string_list *get_renames(struct merge_options *o, |
474 | struct tree *tree, | |
475 | struct tree *o_tree, | |
476 | struct tree *a_tree, | |
477 | struct tree *b_tree, | |
478 | struct string_list *entries) | |
9047ebbc MV |
479 | { |
480 | int i; | |
481 | struct string_list *renames; | |
482 | struct diff_options opts; | |
483 | ||
484 | renames = xcalloc(1, sizeof(struct string_list)); | |
d2b11eca FGA |
485 | if (!o->detect_rename) |
486 | return renames; | |
487 | ||
9047ebbc MV |
488 | diff_setup(&opts); |
489 | DIFF_OPT_SET(&opts, RECURSIVE); | |
4f7cb99a | 490 | DIFF_OPT_CLR(&opts, RENAME_EMPTY); |
9047ebbc | 491 | opts.detect_rename = DIFF_DETECT_RENAME; |
8a2fce18 MV |
492 | opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit : |
493 | o->diff_rename_limit >= 0 ? o->diff_rename_limit : | |
92c57e5c | 494 | 1000; |
10ae7526 | 495 | opts.rename_score = o->rename_score; |
99bfc669 | 496 | opts.show_rename_progress = o->show_rename_progress; |
9047ebbc | 497 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; |
28452655 | 498 | diff_setup_done(&opts); |
ed1c9977 | 499 | diff_tree_sha1(o_tree->object.oid.hash, tree->object.oid.hash, "", &opts); |
9047ebbc | 500 | diffcore_std(&opts); |
bf0ab10f JK |
501 | if (opts.needed_rename_limit > o->needed_rename_limit) |
502 | o->needed_rename_limit = opts.needed_rename_limit; | |
9047ebbc MV |
503 | for (i = 0; i < diff_queued_diff.nr; ++i) { |
504 | struct string_list_item *item; | |
505 | struct rename *re; | |
506 | struct diff_filepair *pair = diff_queued_diff.queue[i]; | |
507 | if (pair->status != 'R') { | |
508 | diff_free_filepair(pair); | |
509 | continue; | |
510 | } | |
511 | re = xmalloc(sizeof(*re)); | |
512 | re->processed = 0; | |
513 | re->pair = pair; | |
e8c8b713 | 514 | item = string_list_lookup(entries, re->pair->one->path); |
9047ebbc MV |
515 | if (!item) |
516 | re->src_entry = insert_stage_data(re->pair->one->path, | |
517 | o_tree, a_tree, b_tree, entries); | |
518 | else | |
519 | re->src_entry = item->util; | |
520 | ||
e8c8b713 | 521 | item = string_list_lookup(entries, re->pair->two->path); |
9047ebbc MV |
522 | if (!item) |
523 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
524 | o_tree, a_tree, b_tree, entries); | |
525 | else | |
526 | re->dst_entry = item->util; | |
78a395d3 | 527 | item = string_list_insert(renames, pair->one->path); |
9047ebbc MV |
528 | item->util = re; |
529 | } | |
530 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
531 | diff_queued_diff.nr = 0; | |
532 | diff_flush(&opts); | |
533 | return renames; | |
534 | } | |
535 | ||
650467cf EN |
536 | static int update_stages(const char *path, const struct diff_filespec *o, |
537 | const struct diff_filespec *a, | |
538 | const struct diff_filespec *b) | |
9047ebbc | 539 | { |
f53d3977 EN |
540 | |
541 | /* | |
542 | * NOTE: It is usually a bad idea to call update_stages on a path | |
543 | * before calling update_file on that same path, since it can | |
544 | * sometimes lead to spurious "refusing to lose untracked file..." | |
545 | * messages from update_file (via make_room_for path via | |
546 | * would_lose_untracked). Instead, reverse the order of the calls | |
547 | * (executing update_file first and then update_stages). | |
548 | */ | |
650467cf EN |
549 | int clear = 1; |
550 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_SKIP_DFCHECK; | |
9047ebbc MV |
551 | if (clear) |
552 | if (remove_file_from_cache(path)) | |
553 | return -1; | |
554 | if (o) | |
b4da9d62 | 555 | if (add_cacheinfo(o->mode, &o->oid, path, 1, 0, options)) |
9047ebbc MV |
556 | return -1; |
557 | if (a) | |
b4da9d62 | 558 | if (add_cacheinfo(a->mode, &a->oid, path, 2, 0, options)) |
9047ebbc MV |
559 | return -1; |
560 | if (b) | |
b4da9d62 | 561 | if (add_cacheinfo(b->mode, &b->oid, path, 3, 0, options)) |
9047ebbc MV |
562 | return -1; |
563 | return 0; | |
564 | } | |
565 | ||
b8ddf164 EN |
566 | static void update_entry(struct stage_data *entry, |
567 | struct diff_filespec *o, | |
568 | struct diff_filespec *a, | |
569 | struct diff_filespec *b) | |
2ff739f9 | 570 | { |
2ff739f9 EN |
571 | entry->processed = 0; |
572 | entry->stages[1].mode = o->mode; | |
573 | entry->stages[2].mode = a->mode; | |
574 | entry->stages[3].mode = b->mode; | |
fd429e98 | 575 | oidcpy(&entry->stages[1].oid, &o->oid); |
576 | oidcpy(&entry->stages[2].oid, &a->oid); | |
577 | oidcpy(&entry->stages[3].oid, &b->oid); | |
2ff739f9 EN |
578 | } |
579 | ||
b7fa51da MV |
580 | static int remove_file(struct merge_options *o, int clean, |
581 | const char *path, int no_wd) | |
9047ebbc | 582 | { |
b7fa51da MV |
583 | int update_cache = o->call_depth || clean; |
584 | int update_working_directory = !o->call_depth && !no_wd; | |
9047ebbc MV |
585 | |
586 | if (update_cache) { | |
587 | if (remove_file_from_cache(path)) | |
588 | return -1; | |
589 | } | |
590 | if (update_working_directory) { | |
ae352c7f DT |
591 | if (ignore_case) { |
592 | struct cache_entry *ce; | |
593 | ce = cache_file_exists(path, strlen(path), ignore_case); | |
594 | if (ce && ce_stage(ce) == 0) | |
595 | return 0; | |
596 | } | |
25755e84 | 597 | if (remove_path(path)) |
9047ebbc | 598 | return -1; |
9047ebbc MV |
599 | } |
600 | return 0; | |
601 | } | |
602 | ||
45bc131d JK |
603 | /* add a string to a strbuf, but converting "/" to "_" */ |
604 | static void add_flattened_path(struct strbuf *out, const char *s) | |
605 | { | |
606 | size_t i = out->len; | |
607 | strbuf_addstr(out, s); | |
608 | for (; i < out->len; i++) | |
609 | if (out->buf[i] == '/') | |
610 | out->buf[i] = '_'; | |
611 | } | |
612 | ||
696ee23c | 613 | static char *unique_path(struct merge_options *o, const char *path, const char *branch) |
9047ebbc | 614 | { |
45bc131d | 615 | struct strbuf newpath = STRBUF_INIT; |
9047ebbc | 616 | int suffix = 0; |
45bc131d JK |
617 | size_t base_len; |
618 | ||
619 | strbuf_addf(&newpath, "%s~", path); | |
620 | add_flattened_path(&newpath, branch); | |
621 | ||
622 | base_len = newpath.len; | |
623 | while (string_list_has_string(&o->current_file_set, newpath.buf) || | |
624 | string_list_has_string(&o->current_directory_set, newpath.buf) || | |
8e1b62f1 | 625 | (!o->call_depth && file_exists(newpath.buf))) { |
45bc131d JK |
626 | strbuf_setlen(&newpath, base_len); |
627 | strbuf_addf(&newpath, "_%d", suffix++); | |
628 | } | |
629 | ||
630 | string_list_insert(&o->current_file_set, newpath.buf); | |
631 | return strbuf_detach(&newpath, NULL); | |
9047ebbc MV |
632 | } |
633 | ||
f2507b4e EN |
634 | static int dir_in_way(const char *path, int check_working_copy) |
635 | { | |
b4600fbe JK |
636 | int pos; |
637 | struct strbuf dirpath = STRBUF_INIT; | |
f2507b4e EN |
638 | struct stat st; |
639 | ||
b4600fbe JK |
640 | strbuf_addstr(&dirpath, path); |
641 | strbuf_addch(&dirpath, '/'); | |
f2507b4e | 642 | |
b4600fbe | 643 | pos = cache_name_pos(dirpath.buf, dirpath.len); |
f2507b4e EN |
644 | |
645 | if (pos < 0) | |
646 | pos = -1 - pos; | |
647 | if (pos < active_nr && | |
b4600fbe JK |
648 | !strncmp(dirpath.buf, active_cache[pos]->name, dirpath.len)) { |
649 | strbuf_release(&dirpath); | |
f2507b4e EN |
650 | return 1; |
651 | } | |
652 | ||
b4600fbe | 653 | strbuf_release(&dirpath); |
f2507b4e EN |
654 | return check_working_copy && !lstat(path, &st) && S_ISDIR(st.st_mode); |
655 | } | |
656 | ||
aacb82de | 657 | static int was_tracked(const char *path) |
60c91181 JH |
658 | { |
659 | int pos = cache_name_pos(path, strlen(path)); | |
660 | ||
661 | if (pos < 0) | |
662 | pos = -1 - pos; | |
663 | while (pos < active_nr && | |
664 | !strcmp(path, active_cache[pos]->name)) { | |
665 | /* | |
666 | * If stage #0, it is definitely tracked. | |
667 | * If it has stage #2 then it was tracked | |
668 | * before this merge started. All other | |
669 | * cases the path was not tracked. | |
670 | */ | |
671 | switch (ce_stage(active_cache[pos])) { | |
672 | case 0: | |
673 | case 2: | |
aacb82de | 674 | return 1; |
60c91181 JH |
675 | } |
676 | pos++; | |
677 | } | |
aacb82de | 678 | return 0; |
60c91181 JH |
679 | } |
680 | ||
aacb82de | 681 | static int would_lose_untracked(const char *path) |
9047ebbc | 682 | { |
aacb82de | 683 | return !was_tracked(path) && file_exists(path); |
60c91181 JH |
684 | } |
685 | ||
ed0148a5 | 686 | static int make_room_for_path(struct merge_options *o, const char *path) |
9047ebbc | 687 | { |
ed0148a5 | 688 | int status, i; |
55653a68 | 689 | const char *msg = _("failed to create path '%s'%s"); |
9047ebbc | 690 | |
ed0148a5 EN |
691 | /* Unlink any D/F conflict files that are in the way */ |
692 | for (i = 0; i < o->df_conflict_file_set.nr; i++) { | |
693 | const char *df_path = o->df_conflict_file_set.items[i].string; | |
694 | size_t pathlen = strlen(path); | |
695 | size_t df_pathlen = strlen(df_path); | |
696 | if (df_pathlen < pathlen && | |
697 | path[df_pathlen] == '/' && | |
698 | strncmp(path, df_path, df_pathlen) == 0) { | |
699 | output(o, 3, | |
55653a68 | 700 | _("Removing %s to make room for subdirectory\n"), |
ed0148a5 EN |
701 | df_path); |
702 | unlink(df_path); | |
703 | unsorted_string_list_delete_item(&o->df_conflict_file_set, | |
704 | i, 0); | |
705 | break; | |
706 | } | |
707 | } | |
708 | ||
709 | /* Make sure leading directories are created */ | |
9047ebbc MV |
710 | status = safe_create_leading_directories_const(path); |
711 | if (status) { | |
0be0521b | 712 | if (status == SCLD_EXISTS) { |
9047ebbc | 713 | /* something else exists */ |
55653a68 | 714 | error(msg, path, _(": perhaps a D/F conflict?")); |
9047ebbc MV |
715 | return -1; |
716 | } | |
717 | die(msg, path, ""); | |
718 | } | |
719 | ||
60c91181 JH |
720 | /* |
721 | * Do not unlink a file in the work tree if we are not | |
722 | * tracking it. | |
723 | */ | |
724 | if (would_lose_untracked(path)) | |
55653a68 | 725 | return error(_("refusing to lose untracked file at '%s'"), |
60c91181 JH |
726 | path); |
727 | ||
9047ebbc MV |
728 | /* Successful unlink is good.. */ |
729 | if (!unlink(path)) | |
730 | return 0; | |
731 | /* .. and so is no existing file */ | |
732 | if (errno == ENOENT) | |
733 | return 0; | |
734 | /* .. but not some other error (who really cares what?) */ | |
55653a68 | 735 | return error(msg, path, _(": perhaps a D/F conflict?")); |
9047ebbc MV |
736 | } |
737 | ||
b7fa51da | 738 | static void update_file_flags(struct merge_options *o, |
b4da9d62 | 739 | const struct object_id *oid, |
9047ebbc MV |
740 | unsigned mode, |
741 | const char *path, | |
742 | int update_cache, | |
743 | int update_wd) | |
744 | { | |
b7fa51da | 745 | if (o->call_depth) |
9047ebbc MV |
746 | update_wd = 0; |
747 | ||
748 | if (update_wd) { | |
749 | enum object_type type; | |
750 | void *buf; | |
751 | unsigned long size; | |
752 | ||
68d03e4a | 753 | if (S_ISGITLINK(mode)) { |
0c44c943 JH |
754 | /* |
755 | * We may later decide to recursively descend into | |
756 | * the submodule directory and update its index | |
757 | * and/or work tree, but we do not do that now. | |
758 | */ | |
68d03e4a | 759 | update_wd = 0; |
0c44c943 | 760 | goto update_index; |
68d03e4a | 761 | } |
9047ebbc | 762 | |
b4da9d62 | 763 | buf = read_sha1_file(oid->hash, &type, &size); |
9047ebbc | 764 | if (!buf) |
b4da9d62 | 765 | die(_("cannot read object %s '%s'"), oid_to_hex(oid), path); |
9047ebbc | 766 | if (type != OBJ_BLOB) |
b4da9d62 | 767 | die(_("blob expected for %s '%s'"), oid_to_hex(oid), path); |
9047ebbc | 768 | if (S_ISREG(mode)) { |
f285a2d7 | 769 | struct strbuf strbuf = STRBUF_INIT; |
9047ebbc MV |
770 | if (convert_to_working_tree(path, buf, size, &strbuf)) { |
771 | free(buf); | |
772 | size = strbuf.len; | |
773 | buf = strbuf_detach(&strbuf, NULL); | |
774 | } | |
775 | } | |
776 | ||
ed0148a5 | 777 | if (make_room_for_path(o, path) < 0) { |
9047ebbc MV |
778 | update_wd = 0; |
779 | free(buf); | |
780 | goto update_index; | |
781 | } | |
782 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { | |
783 | int fd; | |
784 | if (mode & 0100) | |
785 | mode = 0777; | |
786 | else | |
787 | mode = 0666; | |
788 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); | |
789 | if (fd < 0) | |
55653a68 | 790 | die_errno(_("failed to open '%s'"), path); |
f633ea2c | 791 | write_in_full(fd, buf, size); |
9047ebbc MV |
792 | close(fd); |
793 | } else if (S_ISLNK(mode)) { | |
794 | char *lnk = xmemdupz(buf, size); | |
795 | safe_create_leading_directories_const(path); | |
796 | unlink(path); | |
304dcf26 | 797 | if (symlink(lnk, path)) |
55653a68 | 798 | die_errno(_("failed to symlink '%s'"), path); |
9047ebbc MV |
799 | free(lnk); |
800 | } else | |
55653a68 | 801 | die(_("do not know what to do with %06o %s '%s'"), |
b4da9d62 | 802 | mode, oid_to_hex(oid), path); |
9047ebbc MV |
803 | free(buf); |
804 | } | |
805 | update_index: | |
806 | if (update_cache) | |
b4da9d62 | 807 | add_cacheinfo(mode, oid, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); |
9047ebbc MV |
808 | } |
809 | ||
b7fa51da MV |
810 | static void update_file(struct merge_options *o, |
811 | int clean, | |
b4da9d62 | 812 | const struct object_id *oid, |
9047ebbc MV |
813 | unsigned mode, |
814 | const char *path) | |
815 | { | |
b4da9d62 | 816 | update_file_flags(o, oid, mode, path, o->call_depth || clean, !o->call_depth); |
9047ebbc MV |
817 | } |
818 | ||
819 | /* Low level file merging, update and removal */ | |
820 | ||
9cba13ca | 821 | struct merge_file_info { |
9b561499 | 822 | struct object_id oid; |
9047ebbc MV |
823 | unsigned mode; |
824 | unsigned clean:1, | |
825 | merge:1; | |
826 | }; | |
827 | ||
b7fa51da MV |
828 | static int merge_3way(struct merge_options *o, |
829 | mmbuffer_t *result_buf, | |
0c059420 EN |
830 | const struct diff_filespec *one, |
831 | const struct diff_filespec *a, | |
832 | const struct diff_filespec *b, | |
9047ebbc MV |
833 | const char *branch1, |
834 | const char *branch2) | |
835 | { | |
836 | mmfile_t orig, src1, src2; | |
712516bc | 837 | struct ll_merge_options ll_opts = {0}; |
4c5868f4 | 838 | char *base_name, *name1, *name2; |
9047ebbc | 839 | int merge_status; |
8cc5b290 | 840 | |
712516bc | 841 | ll_opts.renormalize = o->renormalize; |
58a1ece4 | 842 | ll_opts.xdl_opts = o->xdl_opts; |
712516bc JN |
843 | |
844 | if (o->call_depth) { | |
845 | ll_opts.virtual_ancestor = 1; | |
846 | ll_opts.variant = 0; | |
847 | } else { | |
8cc5b290 AP |
848 | switch (o->recursive_variant) { |
849 | case MERGE_RECURSIVE_OURS: | |
712516bc | 850 | ll_opts.variant = XDL_MERGE_FAVOR_OURS; |
8cc5b290 AP |
851 | break; |
852 | case MERGE_RECURSIVE_THEIRS: | |
712516bc | 853 | ll_opts.variant = XDL_MERGE_FAVOR_THEIRS; |
8cc5b290 AP |
854 | break; |
855 | default: | |
712516bc | 856 | ll_opts.variant = 0; |
8cc5b290 AP |
857 | break; |
858 | } | |
859 | } | |
9047ebbc | 860 | |
4c5868f4 JN |
861 | if (strcmp(a->path, b->path) || |
862 | (o->ancestor != NULL && strcmp(a->path, one->path) != 0)) { | |
863 | base_name = o->ancestor == NULL ? NULL : | |
4e2d094d RJ |
864 | mkpathdup("%s:%s", o->ancestor, one->path); |
865 | name1 = mkpathdup("%s:%s", branch1, a->path); | |
866 | name2 = mkpathdup("%s:%s", branch2, b->path); | |
606475f3 | 867 | } else { |
4c5868f4 | 868 | base_name = o->ancestor == NULL ? NULL : |
4e2d094d RJ |
869 | mkpathdup("%s", o->ancestor); |
870 | name1 = mkpathdup("%s", branch1); | |
871 | name2 = mkpathdup("%s", branch2); | |
606475f3 | 872 | } |
9047ebbc | 873 | |
a0d12c44 | 874 | read_mmblob(&orig, one->oid.hash); |
875 | read_mmblob(&src1, a->oid.hash); | |
876 | read_mmblob(&src2, b->oid.hash); | |
9047ebbc | 877 | |
4c5868f4 | 878 | merge_status = ll_merge(result_buf, a->path, &orig, base_name, |
712516bc | 879 | &src1, name1, &src2, name2, &ll_opts); |
9047ebbc | 880 | |
4e2d094d | 881 | free(base_name); |
9047ebbc MV |
882 | free(name1); |
883 | free(name2); | |
884 | free(orig.ptr); | |
885 | free(src1.ptr); | |
886 | free(src2.ptr); | |
887 | return merge_status; | |
888 | } | |
889 | ||
6bdaead1 EN |
890 | static struct merge_file_info merge_file_1(struct merge_options *o, |
891 | const struct diff_filespec *one, | |
892 | const struct diff_filespec *a, | |
893 | const struct diff_filespec *b, | |
894 | const char *branch1, | |
895 | const char *branch2) | |
9047ebbc MV |
896 | { |
897 | struct merge_file_info result; | |
898 | result.merge = 0; | |
899 | result.clean = 1; | |
900 | ||
901 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { | |
902 | result.clean = 0; | |
903 | if (S_ISREG(a->mode)) { | |
904 | result.mode = a->mode; | |
9b561499 | 905 | oidcpy(&result.oid, &a->oid); |
9047ebbc MV |
906 | } else { |
907 | result.mode = b->mode; | |
9b561499 | 908 | oidcpy(&result.oid, &b->oid); |
9047ebbc MV |
909 | } |
910 | } else { | |
b4da9d62 | 911 | if (!oid_eq(&a->oid, &one->oid) && !oid_eq(&b->oid, &one->oid)) |
9047ebbc MV |
912 | result.merge = 1; |
913 | ||
914 | /* | |
915 | * Merge modes | |
916 | */ | |
b7fa51da | 917 | if (a->mode == b->mode || a->mode == one->mode) |
9047ebbc MV |
918 | result.mode = b->mode; |
919 | else { | |
920 | result.mode = a->mode; | |
b7fa51da | 921 | if (b->mode != one->mode) { |
9047ebbc MV |
922 | result.clean = 0; |
923 | result.merge = 1; | |
924 | } | |
925 | } | |
926 | ||
b4da9d62 | 927 | if (oid_eq(&a->oid, &b->oid) || oid_eq(&a->oid, &one->oid)) |
9b561499 | 928 | oidcpy(&result.oid, &b->oid); |
b4da9d62 | 929 | else if (oid_eq(&b->oid, &one->oid)) |
9b561499 | 930 | oidcpy(&result.oid, &a->oid); |
9047ebbc MV |
931 | else if (S_ISREG(a->mode)) { |
932 | mmbuffer_t result_buf; | |
933 | int merge_status; | |
934 | ||
b7fa51da | 935 | merge_status = merge_3way(o, &result_buf, one, a, b, |
9047ebbc MV |
936 | branch1, branch2); |
937 | ||
938 | if ((merge_status < 0) || !result_buf.ptr) | |
55653a68 | 939 | die(_("Failed to execute internal merge")); |
9047ebbc MV |
940 | |
941 | if (write_sha1_file(result_buf.ptr, result_buf.size, | |
9b561499 | 942 | blob_type, result.oid.hash)) |
55653a68 | 943 | die(_("Unable to add %s to database"), |
9047ebbc MV |
944 | a->path); |
945 | ||
946 | free(result_buf.ptr); | |
947 | result.clean = (merge_status == 0); | |
948 | } else if (S_ISGITLINK(a->mode)) { | |
9b561499 | 949 | result.clean = merge_submodule(result.oid.hash, |
a0d12c44 | 950 | one->path, |
951 | one->oid.hash, | |
952 | a->oid.hash, | |
953 | b->oid.hash, | |
80988783 | 954 | !o->call_depth); |
9047ebbc | 955 | } else if (S_ISLNK(a->mode)) { |
9b561499 | 956 | oidcpy(&result.oid, &a->oid); |
9047ebbc | 957 | |
b4da9d62 | 958 | if (!oid_eq(&a->oid, &b->oid)) |
9047ebbc MV |
959 | result.clean = 0; |
960 | } else { | |
55653a68 | 961 | die(_("unsupported object type in the tree")); |
9047ebbc MV |
962 | } |
963 | } | |
964 | ||
965 | return result; | |
966 | } | |
967 | ||
dac47415 EN |
968 | static struct merge_file_info |
969 | merge_file_special_markers(struct merge_options *o, | |
970 | const struct diff_filespec *one, | |
971 | const struct diff_filespec *a, | |
972 | const struct diff_filespec *b, | |
973 | const char *branch1, | |
974 | const char *filename1, | |
975 | const char *branch2, | |
976 | const char *filename2) | |
977 | { | |
978 | char *side1 = NULL; | |
979 | char *side2 = NULL; | |
980 | struct merge_file_info mfi; | |
981 | ||
28310186 JK |
982 | if (filename1) |
983 | side1 = xstrfmt("%s:%s", branch1, filename1); | |
984 | if (filename2) | |
985 | side2 = xstrfmt("%s:%s", branch2, filename2); | |
dac47415 EN |
986 | |
987 | mfi = merge_file_1(o, one, a, b, | |
988 | side1 ? side1 : branch1, side2 ? side2 : branch2); | |
989 | free(side1); | |
990 | free(side2); | |
991 | return mfi; | |
992 | } | |
993 | ||
fa2364ec | 994 | static struct merge_file_info merge_file_one(struct merge_options *o, |
6bdaead1 | 995 | const char *path, |
b4da9d62 | 996 | const struct object_id *o_oid, int o_mode, |
997 | const struct object_id *a_oid, int a_mode, | |
998 | const struct object_id *b_oid, int b_mode, | |
6bdaead1 EN |
999 | const char *branch1, |
1000 | const char *branch2) | |
1001 | { | |
1002 | struct diff_filespec one, a, b; | |
1003 | ||
1004 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 1005 | oidcpy(&one.oid, o_oid); |
6bdaead1 | 1006 | one.mode = o_mode; |
b4da9d62 | 1007 | oidcpy(&a.oid, a_oid); |
6bdaead1 | 1008 | a.mode = a_mode; |
b4da9d62 | 1009 | oidcpy(&b.oid, b_oid); |
6bdaead1 EN |
1010 | b.mode = b_mode; |
1011 | return merge_file_1(o, &one, &a, &b, branch1, branch2); | |
1012 | } | |
1013 | ||
b7033252 EN |
1014 | static void handle_change_delete(struct merge_options *o, |
1015 | const char *path, | |
b4da9d62 | 1016 | const struct object_id *o_oid, int o_mode, |
1017 | const struct object_id *a_oid, int a_mode, | |
1018 | const struct object_id *b_oid, int b_mode, | |
b7033252 EN |
1019 | const char *change, const char *change_past) |
1020 | { | |
1021 | char *renamed = NULL; | |
1022 | if (dir_in_way(path, !o->call_depth)) { | |
b4da9d62 | 1023 | renamed = unique_path(o, path, a_oid ? o->branch1 : o->branch2); |
b7033252 EN |
1024 | } |
1025 | ||
1026 | if (o->call_depth) { | |
1027 | /* | |
1028 | * We cannot arbitrarily accept either a_sha or b_sha as | |
1029 | * correct; since there is no true "middle point" between | |
1030 | * them, simply reuse the base version for virtual merge base. | |
1031 | */ | |
1032 | remove_file_from_cache(path); | |
b4da9d62 | 1033 | update_file(o, 0, o_oid, o_mode, renamed ? renamed : path); |
1034 | } else if (!a_oid) { | |
55653a68 JX |
1035 | if (!renamed) { |
1036 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1037 | "and %s in %s. Version %s of %s left in tree."), | |
1038 | change, path, o->branch1, change_past, | |
1039 | o->branch2, o->branch2, path); | |
b4da9d62 | 1040 | update_file(o, 0, b_oid, b_mode, path); |
55653a68 JX |
1041 | } else { |
1042 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1043 | "and %s in %s. Version %s of %s left in tree at %s."), | |
1044 | change, path, o->branch1, change_past, | |
1045 | o->branch2, o->branch2, path, renamed); | |
b4da9d62 | 1046 | update_file(o, 0, b_oid, b_mode, renamed); |
55653a68 | 1047 | } |
b7033252 | 1048 | } else { |
55653a68 JX |
1049 | if (!renamed) { |
1050 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1051 | "and %s in %s. Version %s of %s left in tree."), | |
1052 | change, path, o->branch2, change_past, | |
1053 | o->branch1, o->branch1, path); | |
1054 | } else { | |
1055 | output(o, 1, _("CONFLICT (%s/delete): %s deleted in %s " | |
1056 | "and %s in %s. Version %s of %s left in tree at %s."), | |
1057 | change, path, o->branch2, change_past, | |
1058 | o->branch1, o->branch1, path, renamed); | |
b4da9d62 | 1059 | update_file(o, 0, a_oid, a_mode, renamed); |
55653a68 | 1060 | } |
35a74abf EN |
1061 | /* |
1062 | * No need to call update_file() on path when !renamed, since | |
1063 | * that would needlessly touch path. We could call | |
1064 | * update_file_flags() with update_cache=0 and update_wd=0, | |
1065 | * but that's a no-op. | |
1066 | */ | |
b7033252 EN |
1067 | } |
1068 | free(renamed); | |
1069 | } | |
1070 | ||
6ef2cb00 EN |
1071 | static void conflict_rename_delete(struct merge_options *o, |
1072 | struct diff_filepair *pair, | |
1073 | const char *rename_branch, | |
1074 | const char *other_branch) | |
9047ebbc | 1075 | { |
e03acb8b EN |
1076 | const struct diff_filespec *orig = pair->one; |
1077 | const struct diff_filespec *dest = pair->two; | |
b4da9d62 | 1078 | const struct object_id *a_oid = NULL; |
1079 | const struct object_id *b_oid = NULL; | |
e03acb8b EN |
1080 | int a_mode = 0; |
1081 | int b_mode = 0; | |
1082 | ||
1083 | if (rename_branch == o->branch1) { | |
b4da9d62 | 1084 | a_oid = &dest->oid; |
e03acb8b EN |
1085 | a_mode = dest->mode; |
1086 | } else { | |
b4da9d62 | 1087 | b_oid = &dest->oid; |
e03acb8b EN |
1088 | b_mode = dest->mode; |
1089 | } | |
6ef2cb00 | 1090 | |
f53d3977 EN |
1091 | handle_change_delete(o, |
1092 | o->call_depth ? orig->path : dest->path, | |
b4da9d62 | 1093 | &orig->oid, orig->mode, |
1094 | a_oid, a_mode, | |
1095 | b_oid, b_mode, | |
55653a68 | 1096 | _("rename"), _("renamed")); |
f53d3977 | 1097 | |
e03acb8b EN |
1098 | if (o->call_depth) { |
1099 | remove_file_from_cache(dest->path); | |
e03acb8b | 1100 | } else { |
e03acb8b EN |
1101 | update_stages(dest->path, NULL, |
1102 | rename_branch == o->branch1 ? dest : NULL, | |
1103 | rename_branch == o->branch1 ? NULL : dest); | |
a0de2f6b | 1104 | } |
e03acb8b | 1105 | |
6ef2cb00 EN |
1106 | } |
1107 | ||
1ac91b32 EN |
1108 | static struct diff_filespec *filespec_from_entry(struct diff_filespec *target, |
1109 | struct stage_data *entry, | |
1110 | int stage) | |
9047ebbc | 1111 | { |
b4da9d62 | 1112 | struct object_id *oid = &entry->stages[stage].oid; |
1ac91b32 | 1113 | unsigned mode = entry->stages[stage].mode; |
b4da9d62 | 1114 | if (mode == 0 || is_null_oid(oid)) |
1ac91b32 | 1115 | return NULL; |
b4da9d62 | 1116 | oidcpy(&target->oid, oid); |
1ac91b32 EN |
1117 | target->mode = mode; |
1118 | return target; | |
1119 | } | |
1120 | ||
3672c971 EN |
1121 | static void handle_file(struct merge_options *o, |
1122 | struct diff_filespec *rename, | |
1123 | int stage, | |
1124 | struct rename_conflict_info *ci) | |
1125 | { | |
1126 | char *dst_name = rename->path; | |
1127 | struct stage_data *dst_entry; | |
1128 | const char *cur_branch, *other_branch; | |
1129 | struct diff_filespec other; | |
1130 | struct diff_filespec *add; | |
1131 | ||
1132 | if (stage == 2) { | |
1133 | dst_entry = ci->dst_entry1; | |
1134 | cur_branch = ci->branch1; | |
1135 | other_branch = ci->branch2; | |
1136 | } else { | |
1137 | dst_entry = ci->dst_entry2; | |
1138 | cur_branch = ci->branch2; | |
1139 | other_branch = ci->branch1; | |
9047ebbc | 1140 | } |
3672c971 EN |
1141 | |
1142 | add = filespec_from_entry(&other, dst_entry, stage ^ 1); | |
3672c971 EN |
1143 | if (add) { |
1144 | char *add_name = unique_path(o, rename->path, other_branch); | |
b4da9d62 | 1145 | update_file(o, 0, &add->oid, add->mode, add_name); |
3672c971 EN |
1146 | |
1147 | remove_file(o, 0, rename->path, 0); | |
1148 | dst_name = unique_path(o, rename->path, cur_branch); | |
1149 | } else { | |
1150 | if (dir_in_way(rename->path, !o->call_depth)) { | |
1151 | dst_name = unique_path(o, rename->path, cur_branch); | |
55653a68 | 1152 | output(o, 1, _("%s is a directory in %s adding as %s instead"), |
3672c971 EN |
1153 | rename->path, other_branch, dst_name); |
1154 | } | |
9047ebbc | 1155 | } |
b4da9d62 | 1156 | update_file(o, 0, &rename->oid, rename->mode, dst_name); |
f53d3977 EN |
1157 | if (stage == 2) |
1158 | update_stages(rename->path, NULL, rename, add); | |
1159 | else | |
1160 | update_stages(rename->path, NULL, add, rename); | |
3672c971 EN |
1161 | |
1162 | if (dst_name != rename->path) | |
1163 | free(dst_name); | |
1164 | } | |
1165 | ||
09c01f85 | 1166 | static void conflict_rename_rename_1to2(struct merge_options *o, |
a99b7f22 | 1167 | struct rename_conflict_info *ci) |
9047ebbc | 1168 | { |
09c01f85 | 1169 | /* One file was renamed in both branches, but to different names. */ |
a99b7f22 EN |
1170 | struct diff_filespec *one = ci->pair1->one; |
1171 | struct diff_filespec *a = ci->pair1->two; | |
1172 | struct diff_filespec *b = ci->pair2->two; | |
4f66dade | 1173 | |
55653a68 | 1174 | output(o, 1, _("CONFLICT (rename/rename): " |
4f66dade | 1175 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
55653a68 | 1176 | "rename \"%s\"->\"%s\" in \"%s\"%s"), |
a99b7f22 EN |
1177 | one->path, a->path, ci->branch1, |
1178 | one->path, b->path, ci->branch2, | |
55653a68 | 1179 | o->call_depth ? _(" (left unresolved)") : ""); |
b7fa51da | 1180 | if (o->call_depth) { |
c52ff85d | 1181 | struct merge_file_info mfi; |
6d63070c EN |
1182 | struct diff_filespec other; |
1183 | struct diff_filespec *add; | |
fa2364ec | 1184 | mfi = merge_file_one(o, one->path, |
b4da9d62 | 1185 | &one->oid, one->mode, |
1186 | &a->oid, a->mode, | |
1187 | &b->oid, b->mode, | |
a99b7f22 | 1188 | ci->branch1, ci->branch2); |
9047ebbc | 1189 | /* |
c52ff85d EN |
1190 | * FIXME: For rename/add-source conflicts (if we could detect |
1191 | * such), this is wrong. We should instead find a unique | |
1192 | * pathname and then either rename the add-source file to that | |
1193 | * unique path, or use that unique path instead of src here. | |
9047ebbc | 1194 | */ |
b4da9d62 | 1195 | update_file(o, 0, &mfi.oid, mfi.mode, one->path); |
07413c5a | 1196 | |
6d63070c EN |
1197 | /* |
1198 | * Above, we put the merged content at the merge-base's | |
1199 | * path. Now we usually need to delete both a->path and | |
1200 | * b->path. However, the rename on each side of the merge | |
1201 | * could also be involved in a rename/add conflict. In | |
1202 | * such cases, we should keep the added file around, | |
1203 | * resolving the conflict at that path in its favor. | |
1204 | */ | |
1205 | add = filespec_from_entry(&other, ci->dst_entry1, 2 ^ 1); | |
1206 | if (add) | |
b4da9d62 | 1207 | update_file(o, 0, &add->oid, add->mode, a->path); |
6d63070c EN |
1208 | else |
1209 | remove_file_from_cache(a->path); | |
1210 | add = filespec_from_entry(&other, ci->dst_entry2, 3 ^ 1); | |
1211 | if (add) | |
b4da9d62 | 1212 | update_file(o, 0, &add->oid, add->mode, b->path); |
6d63070c EN |
1213 | else |
1214 | remove_file_from_cache(b->path); | |
9047ebbc | 1215 | } else { |
3672c971 EN |
1216 | handle_file(o, a, 2, ci); |
1217 | handle_file(o, b, 3, ci); | |
9047ebbc | 1218 | } |
9047ebbc MV |
1219 | } |
1220 | ||
09c01f85 | 1221 | static void conflict_rename_rename_2to1(struct merge_options *o, |
461f5041 | 1222 | struct rename_conflict_info *ci) |
9047ebbc | 1223 | { |
461f5041 EN |
1224 | /* Two files, a & b, were renamed to the same thing, c. */ |
1225 | struct diff_filespec *a = ci->pair1->one; | |
1226 | struct diff_filespec *b = ci->pair2->one; | |
1227 | struct diff_filespec *c1 = ci->pair1->two; | |
1228 | struct diff_filespec *c2 = ci->pair2->two; | |
1229 | char *path = c1->path; /* == c2->path */ | |
434b8525 EN |
1230 | struct merge_file_info mfi_c1; |
1231 | struct merge_file_info mfi_c2; | |
461f5041 | 1232 | |
55653a68 | 1233 | output(o, 1, _("CONFLICT (rename/rename): " |
461f5041 | 1234 | "Rename %s->%s in %s. " |
55653a68 | 1235 | "Rename %s->%s in %s"), |
461f5041 EN |
1236 | a->path, c1->path, ci->branch1, |
1237 | b->path, c2->path, ci->branch2); | |
1238 | ||
8e1b62f1 EN |
1239 | remove_file(o, 1, a->path, o->call_depth || would_lose_untracked(a->path)); |
1240 | remove_file(o, 1, b->path, o->call_depth || would_lose_untracked(b->path)); | |
461f5041 | 1241 | |
434b8525 EN |
1242 | mfi_c1 = merge_file_special_markers(o, a, c1, &ci->ren1_other, |
1243 | o->branch1, c1->path, | |
1244 | o->branch2, ci->ren1_other.path); | |
1245 | mfi_c2 = merge_file_special_markers(o, b, &ci->ren2_other, c2, | |
1246 | o->branch1, ci->ren2_other.path, | |
1247 | o->branch2, c2->path); | |
1248 | ||
0a6b8712 | 1249 | if (o->call_depth) { |
434b8525 EN |
1250 | /* |
1251 | * If mfi_c1.clean && mfi_c2.clean, then it might make | |
1252 | * sense to do a two-way merge of those results. But, I | |
1253 | * think in all cases, it makes sense to have the virtual | |
1254 | * merge base just undo the renames; they can be detected | |
1255 | * again later for the non-recursive merge. | |
1256 | */ | |
1257 | remove_file(o, 0, path, 0); | |
b4da9d62 | 1258 | update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, a->path); |
1259 | update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, b->path); | |
0a6b8712 | 1260 | } else { |
461f5041 EN |
1261 | char *new_path1 = unique_path(o, path, ci->branch1); |
1262 | char *new_path2 = unique_path(o, path, ci->branch2); | |
55653a68 | 1263 | output(o, 1, _("Renaming %s to %s and %s to %s instead"), |
461f5041 | 1264 | a->path, new_path1, b->path, new_path2); |
0a6b8712 | 1265 | remove_file(o, 0, path, 0); |
b4da9d62 | 1266 | update_file(o, 0, &mfi_c1.oid, mfi_c1.mode, new_path1); |
1267 | update_file(o, 0, &mfi_c2.oid, mfi_c2.mode, new_path2); | |
0a6b8712 EN |
1268 | free(new_path2); |
1269 | free(new_path1); | |
1270 | } | |
9047ebbc MV |
1271 | } |
1272 | ||
8a2fce18 MV |
1273 | static int process_renames(struct merge_options *o, |
1274 | struct string_list *a_renames, | |
1275 | struct string_list *b_renames) | |
9047ebbc MV |
1276 | { |
1277 | int clean_merge = 1, i, j; | |
183113a5 TF |
1278 | struct string_list a_by_dst = STRING_LIST_INIT_NODUP; |
1279 | struct string_list b_by_dst = STRING_LIST_INIT_NODUP; | |
9047ebbc MV |
1280 | const struct rename *sre; |
1281 | ||
1282 | for (i = 0; i < a_renames->nr; i++) { | |
1283 | sre = a_renames->items[i].util; | |
78a395d3 | 1284 | string_list_insert(&a_by_dst, sre->pair->two->path)->util |
0a6b8712 | 1285 | = (void *)sre; |
9047ebbc MV |
1286 | } |
1287 | for (i = 0; i < b_renames->nr; i++) { | |
1288 | sre = b_renames->items[i].util; | |
78a395d3 | 1289 | string_list_insert(&b_by_dst, sre->pair->two->path)->util |
0a6b8712 | 1290 | = (void *)sre; |
9047ebbc MV |
1291 | } |
1292 | ||
1293 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { | |
8e24cbae | 1294 | struct string_list *renames1, *renames2Dst; |
9047ebbc MV |
1295 | struct rename *ren1 = NULL, *ren2 = NULL; |
1296 | const char *branch1, *branch2; | |
1297 | const char *ren1_src, *ren1_dst; | |
461f5041 | 1298 | struct string_list_item *lookup; |
9047ebbc MV |
1299 | |
1300 | if (i >= a_renames->nr) { | |
9047ebbc MV |
1301 | ren2 = b_renames->items[j++].util; |
1302 | } else if (j >= b_renames->nr) { | |
9047ebbc MV |
1303 | ren1 = a_renames->items[i++].util; |
1304 | } else { | |
8e24cbae BK |
1305 | int compare = strcmp(a_renames->items[i].string, |
1306 | b_renames->items[j].string); | |
9047ebbc MV |
1307 | if (compare <= 0) |
1308 | ren1 = a_renames->items[i++].util; | |
1309 | if (compare >= 0) | |
1310 | ren2 = b_renames->items[j++].util; | |
1311 | } | |
1312 | ||
1313 | /* TODO: refactor, so that 1/2 are not needed */ | |
1314 | if (ren1) { | |
1315 | renames1 = a_renames; | |
9047ebbc | 1316 | renames2Dst = &b_by_dst; |
8a2fce18 MV |
1317 | branch1 = o->branch1; |
1318 | branch2 = o->branch2; | |
9047ebbc MV |
1319 | } else { |
1320 | struct rename *tmp; | |
1321 | renames1 = b_renames; | |
9047ebbc | 1322 | renames2Dst = &a_by_dst; |
8a2fce18 MV |
1323 | branch1 = o->branch2; |
1324 | branch2 = o->branch1; | |
9047ebbc MV |
1325 | tmp = ren2; |
1326 | ren2 = ren1; | |
1327 | ren1 = tmp; | |
1328 | } | |
9047ebbc | 1329 | |
9047ebbc MV |
1330 | if (ren1->processed) |
1331 | continue; | |
1332 | ren1->processed = 1; | |
9047ebbc | 1333 | ren1->dst_entry->processed = 1; |
7769a75e EN |
1334 | /* BUG: We should only mark src_entry as processed if we |
1335 | * are not dealing with a rename + add-source case. | |
1336 | */ | |
9047ebbc | 1337 | ren1->src_entry->processed = 1; |
9047ebbc MV |
1338 | |
1339 | ren1_src = ren1->pair->one->path; | |
1340 | ren1_dst = ren1->pair->two->path; | |
1341 | ||
1342 | if (ren2) { | |
461f5041 | 1343 | /* One file renamed on both sides */ |
9047ebbc MV |
1344 | const char *ren2_src = ren2->pair->one->path; |
1345 | const char *ren2_dst = ren2->pair->two->path; | |
4f66dade | 1346 | enum rename_type rename_type; |
9047ebbc | 1347 | if (strcmp(ren1_src, ren2_src) != 0) |
461f5041 | 1348 | die("ren1_src != ren2_src"); |
9047ebbc MV |
1349 | ren2->dst_entry->processed = 1; |
1350 | ren2->processed = 1; | |
1351 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
4f66dade | 1352 | rename_type = RENAME_ONE_FILE_TO_TWO; |
461f5041 | 1353 | clean_merge = 0; |
9047ebbc | 1354 | } else { |
4f66dade | 1355 | rename_type = RENAME_ONE_FILE_TO_ONE; |
7769a75e EN |
1356 | /* BUG: We should only remove ren1_src in |
1357 | * the base stage (think of rename + | |
1358 | * add-source cases). | |
1359 | */ | |
b7fa51da | 1360 | remove_file(o, 1, ren1_src, 1); |
b8ddf164 EN |
1361 | update_entry(ren1->dst_entry, |
1362 | ren1->pair->one, | |
1363 | ren1->pair->two, | |
1364 | ren2->pair->two); | |
9047ebbc | 1365 | } |
4f66dade EN |
1366 | setup_rename_conflict_info(rename_type, |
1367 | ren1->pair, | |
1368 | ren2->pair, | |
1369 | branch1, | |
1370 | branch2, | |
1371 | ren1->dst_entry, | |
232c635f EN |
1372 | ren2->dst_entry, |
1373 | o, | |
1374 | NULL, | |
1375 | NULL); | |
461f5041 EN |
1376 | } else if ((lookup = string_list_lookup(renames2Dst, ren1_dst))) { |
1377 | /* Two different files renamed to the same thing */ | |
1378 | char *ren2_dst; | |
1379 | ren2 = lookup->util; | |
1380 | ren2_dst = ren2->pair->two->path; | |
1381 | if (strcmp(ren1_dst, ren2_dst) != 0) | |
1382 | die("ren1_dst != ren2_dst"); | |
1383 | ||
1384 | clean_merge = 0; | |
1385 | ren2->processed = 1; | |
1386 | /* | |
1387 | * BUG: We should only mark src_entry as processed | |
1388 | * if we are not dealing with a rename + add-source | |
1389 | * case. | |
1390 | */ | |
1391 | ren2->src_entry->processed = 1; | |
1392 | ||
1393 | setup_rename_conflict_info(RENAME_TWO_FILES_TO_ONE, | |
1394 | ren1->pair, | |
1395 | ren2->pair, | |
1396 | branch1, | |
1397 | branch2, | |
1398 | ren1->dst_entry, | |
232c635f EN |
1399 | ren2->dst_entry, |
1400 | o, | |
1401 | ren1->src_entry, | |
1402 | ren2->src_entry); | |
1403 | ||
9047ebbc MV |
1404 | } else { |
1405 | /* Renamed in 1, maybe changed in 2 */ | |
9047ebbc MV |
1406 | /* we only use sha1 and mode of these */ |
1407 | struct diff_filespec src_other, dst_other; | |
41d70bd6 | 1408 | int try_merge; |
9047ebbc | 1409 | |
41d70bd6 EN |
1410 | /* |
1411 | * unpack_trees loads entries from common-commit | |
1412 | * into stage 1, from head-commit into stage 2, and | |
1413 | * from merge-commit into stage 3. We keep track | |
1414 | * of which side corresponds to the rename. | |
1415 | */ | |
1416 | int renamed_stage = a_renames == renames1 ? 2 : 3; | |
1417 | int other_stage = a_renames == renames1 ? 3 : 2; | |
9047ebbc | 1418 | |
7769a75e EN |
1419 | /* BUG: We should only remove ren1_src in the base |
1420 | * stage and in other_stage (think of rename + | |
1421 | * add-source case). | |
1422 | */ | |
531357a4 EN |
1423 | remove_file(o, 1, ren1_src, |
1424 | renamed_stage == 2 || !was_tracked(ren1_src)); | |
9047ebbc | 1425 | |
fd429e98 | 1426 | oidcpy(&src_other.oid, |
1427 | &ren1->src_entry->stages[other_stage].oid); | |
41d70bd6 | 1428 | src_other.mode = ren1->src_entry->stages[other_stage].mode; |
fd429e98 | 1429 | oidcpy(&dst_other.oid, |
1430 | &ren1->dst_entry->stages[other_stage].oid); | |
41d70bd6 | 1431 | dst_other.mode = ren1->dst_entry->stages[other_stage].mode; |
9047ebbc MV |
1432 | try_merge = 0; |
1433 | ||
b4da9d62 | 1434 | if (oid_eq(&src_other.oid, &null_oid)) { |
4f66dade EN |
1435 | setup_rename_conflict_info(RENAME_DELETE, |
1436 | ren1->pair, | |
1437 | NULL, | |
1438 | branch1, | |
1439 | branch2, | |
1440 | ren1->dst_entry, | |
232c635f EN |
1441 | NULL, |
1442 | o, | |
1443 | NULL, | |
4f66dade | 1444 | NULL); |
d5af5105 | 1445 | } else if ((dst_other.mode == ren1->pair->two->mode) && |
b4da9d62 | 1446 | oid_eq(&dst_other.oid, &ren1->pair->two->oid)) { |
35a74abf EN |
1447 | /* |
1448 | * Added file on the other side identical to | |
1449 | * the file being renamed: clean merge. | |
1450 | * Also, there is no need to overwrite the | |
1451 | * file already in the working copy, so call | |
1452 | * update_file_flags() instead of | |
1453 | * update_file(). | |
1454 | */ | |
1455 | update_file_flags(o, | |
b4da9d62 | 1456 | &ren1->pair->two->oid, |
35a74abf EN |
1457 | ren1->pair->two->mode, |
1458 | ren1_dst, | |
1459 | 1, /* update_cache */ | |
1460 | 0 /* update_wd */); | |
b4da9d62 | 1461 | } else if (!oid_eq(&dst_other.oid, &null_oid)) { |
9047ebbc MV |
1462 | clean_merge = 0; |
1463 | try_merge = 1; | |
55653a68 JX |
1464 | output(o, 1, _("CONFLICT (rename/add): Rename %s->%s in %s. " |
1465 | "%s added in %s"), | |
9047ebbc MV |
1466 | ren1_src, ren1_dst, branch1, |
1467 | ren1_dst, branch2); | |
c94736a2 JH |
1468 | if (o->call_depth) { |
1469 | struct merge_file_info mfi; | |
b4da9d62 | 1470 | mfi = merge_file_one(o, ren1_dst, &null_oid, 0, |
1471 | &ren1->pair->two->oid, | |
a0d12c44 | 1472 | ren1->pair->two->mode, |
b4da9d62 | 1473 | &dst_other.oid, |
a0d12c44 | 1474 | dst_other.mode, |
6bdaead1 | 1475 | branch1, branch2); |
55653a68 | 1476 | output(o, 1, _("Adding merged %s"), ren1_dst); |
b4da9d62 | 1477 | update_file(o, 0, &mfi.oid, |
9b561499 | 1478 | mfi.mode, ren1_dst); |
2a669c34 | 1479 | try_merge = 0; |
c94736a2 | 1480 | } else { |
3d6b8e88 | 1481 | char *new_path = unique_path(o, ren1_dst, branch2); |
55653a68 | 1482 | output(o, 1, _("Adding as %s instead"), new_path); |
b4da9d62 | 1483 | update_file(o, 0, &dst_other.oid, |
a0d12c44 | 1484 | dst_other.mode, new_path); |
3d6b8e88 | 1485 | free(new_path); |
c94736a2 | 1486 | } |
9047ebbc MV |
1487 | } else |
1488 | try_merge = 1; | |
1489 | ||
1490 | if (try_merge) { | |
8a2fce18 | 1491 | struct diff_filespec *one, *a, *b; |
9047ebbc MV |
1492 | src_other.path = (char *)ren1_src; |
1493 | ||
8a2fce18 | 1494 | one = ren1->pair->one; |
9047ebbc MV |
1495 | if (a_renames == renames1) { |
1496 | a = ren1->pair->two; | |
1497 | b = &src_other; | |
1498 | } else { | |
1499 | b = ren1->pair->two; | |
1500 | a = &src_other; | |
1501 | } | |
b8ddf164 | 1502 | update_entry(ren1->dst_entry, one, a, b); |
4f66dade EN |
1503 | setup_rename_conflict_info(RENAME_NORMAL, |
1504 | ren1->pair, | |
1505 | NULL, | |
1506 | branch1, | |
1507 | NULL, | |
1508 | ren1->dst_entry, | |
232c635f EN |
1509 | NULL, |
1510 | o, | |
1511 | NULL, | |
4f66dade | 1512 | NULL); |
9047ebbc MV |
1513 | } |
1514 | } | |
1515 | } | |
1516 | string_list_clear(&a_by_dst, 0); | |
1517 | string_list_clear(&b_by_dst, 0); | |
1518 | ||
1519 | return clean_merge; | |
1520 | } | |
1521 | ||
b4da9d62 | 1522 | static struct object_id *stage_oid(const struct object_id *oid, unsigned mode) |
9047ebbc | 1523 | { |
b4da9d62 | 1524 | return (is_null_oid(oid) || mode == 0) ? NULL: (struct object_id *)oid; |
9047ebbc MV |
1525 | } |
1526 | ||
b4da9d62 | 1527 | static int read_oid_strbuf(const struct object_id *oid, struct strbuf *dst) |
331a1838 EB |
1528 | { |
1529 | void *buf; | |
1530 | enum object_type type; | |
1531 | unsigned long size; | |
b4da9d62 | 1532 | buf = read_sha1_file(oid->hash, &type, &size); |
331a1838 | 1533 | if (!buf) |
b4da9d62 | 1534 | return error(_("cannot read object %s"), oid_to_hex(oid)); |
331a1838 EB |
1535 | if (type != OBJ_BLOB) { |
1536 | free(buf); | |
b4da9d62 | 1537 | return error(_("object %s is not a blob"), oid_to_hex(oid)); |
331a1838 EB |
1538 | } |
1539 | strbuf_attach(dst, buf, size, size + 1); | |
1540 | return 0; | |
1541 | } | |
1542 | ||
b4da9d62 | 1543 | static int blob_unchanged(const struct object_id *o_oid, |
72fac66b | 1544 | unsigned o_mode, |
b4da9d62 | 1545 | const struct object_id *a_oid, |
72fac66b | 1546 | unsigned a_mode, |
3e7589b7 | 1547 | int renormalize, const char *path) |
331a1838 EB |
1548 | { |
1549 | struct strbuf o = STRBUF_INIT; | |
1550 | struct strbuf a = STRBUF_INIT; | |
1551 | int ret = 0; /* assume changed for safety */ | |
1552 | ||
72fac66b JK |
1553 | if (a_mode != o_mode) |
1554 | return 0; | |
b4da9d62 | 1555 | if (oid_eq(o_oid, a_oid)) |
331a1838 | 1556 | return 1; |
3e7589b7 | 1557 | if (!renormalize) |
331a1838 EB |
1558 | return 0; |
1559 | ||
b4da9d62 | 1560 | assert(o_oid && a_oid); |
1561 | if (read_oid_strbuf(o_oid, &o) || read_oid_strbuf(a_oid, &a)) | |
331a1838 EB |
1562 | goto error_return; |
1563 | /* | |
1564 | * Note: binary | is used so that both renormalizations are | |
1565 | * performed. Comparison can be skipped if both files are | |
1566 | * unchanged since their sha1s have already been compared. | |
1567 | */ | |
1568 | if (renormalize_buffer(path, o.buf, o.len, &o) | | |
422af49c | 1569 | renormalize_buffer(path, a.buf, a.len, &a)) |
331a1838 EB |
1570 | ret = (o.len == a.len && !memcmp(o.buf, a.buf, o.len)); |
1571 | ||
1572 | error_return: | |
1573 | strbuf_release(&o); | |
1574 | strbuf_release(&a); | |
1575 | return ret; | |
1576 | } | |
1577 | ||
b7033252 | 1578 | static void handle_modify_delete(struct merge_options *o, |
5e3ce663 | 1579 | const char *path, |
b4da9d62 | 1580 | struct object_id *o_oid, int o_mode, |
1581 | struct object_id *a_oid, int a_mode, | |
1582 | struct object_id *b_oid, int b_mode) | |
5e3ce663 | 1583 | { |
b7033252 EN |
1584 | handle_change_delete(o, |
1585 | path, | |
b4da9d62 | 1586 | o_oid, o_mode, |
1587 | a_oid, a_mode, | |
1588 | b_oid, b_mode, | |
55653a68 | 1589 | _("modify"), _("modified")); |
5e3ce663 EN |
1590 | } |
1591 | ||
0c4918d1 EN |
1592 | static int merge_content(struct merge_options *o, |
1593 | const char *path, | |
b4da9d62 | 1594 | struct object_id *o_oid, int o_mode, |
1595 | struct object_id *a_oid, int a_mode, | |
1596 | struct object_id *b_oid, int b_mode, | |
4f66dade | 1597 | struct rename_conflict_info *rename_conflict_info) |
0c4918d1 | 1598 | { |
55653a68 | 1599 | const char *reason = _("content"); |
5b448b85 | 1600 | const char *path1 = NULL, *path2 = NULL; |
0c4918d1 EN |
1601 | struct merge_file_info mfi; |
1602 | struct diff_filespec one, a, b; | |
4ab9a157 | 1603 | unsigned df_conflict_remains = 0; |
0c4918d1 | 1604 | |
b4da9d62 | 1605 | if (!o_oid) { |
55653a68 | 1606 | reason = _("add/add"); |
b4da9d62 | 1607 | o_oid = (struct object_id *)&null_oid; |
0c4918d1 EN |
1608 | } |
1609 | one.path = a.path = b.path = (char *)path; | |
b4da9d62 | 1610 | oidcpy(&one.oid, o_oid); |
0c4918d1 | 1611 | one.mode = o_mode; |
b4da9d62 | 1612 | oidcpy(&a.oid, a_oid); |
0c4918d1 | 1613 | a.mode = a_mode; |
b4da9d62 | 1614 | oidcpy(&b.oid, b_oid); |
0c4918d1 EN |
1615 | b.mode = b_mode; |
1616 | ||
3c217c07 | 1617 | if (rename_conflict_info) { |
3c217c07 EN |
1618 | struct diff_filepair *pair1 = rename_conflict_info->pair1; |
1619 | ||
1620 | path1 = (o->branch1 == rename_conflict_info->branch1) ? | |
1621 | pair1->two->path : pair1->one->path; | |
1622 | /* If rename_conflict_info->pair2 != NULL, we are in | |
1623 | * RENAME_ONE_FILE_TO_ONE case. Otherwise, we have a | |
1624 | * normal rename. | |
1625 | */ | |
1626 | path2 = (rename_conflict_info->pair2 || | |
1627 | o->branch2 == rename_conflict_info->branch1) ? | |
1628 | pair1->two->path : pair1->one->path; | |
3c217c07 EN |
1629 | |
1630 | if (dir_in_way(path, !o->call_depth)) | |
1631 | df_conflict_remains = 1; | |
4ab9a157 | 1632 | } |
dac47415 EN |
1633 | mfi = merge_file_special_markers(o, &one, &a, &b, |
1634 | o->branch1, path1, | |
1635 | o->branch2, path2); | |
4ab9a157 EN |
1636 | |
1637 | if (mfi.clean && !df_conflict_remains && | |
b4da9d62 | 1638 | oid_eq(&mfi.oid, a_oid) && mfi.mode == a_mode) { |
5b448b85 | 1639 | int path_renamed_outside_HEAD; |
55653a68 | 1640 | output(o, 3, _("Skipped %s (merged same as existing)"), path); |
5b448b85 EN |
1641 | /* |
1642 | * The content merge resulted in the same file contents we | |
1643 | * already had. We can return early if those file contents | |
1644 | * are recorded at the correct path (which may not be true | |
1645 | * if the merge involves a rename). | |
1646 | */ | |
1647 | path_renamed_outside_HEAD = !path2 || !strcmp(path, path2); | |
1648 | if (!path_renamed_outside_HEAD) { | |
b4da9d62 | 1649 | add_cacheinfo(mfi.mode, &mfi.oid, path, |
d45b7f40 | 1650 | 0, (!o->call_depth), 0); |
5b448b85 EN |
1651 | return mfi.clean; |
1652 | } | |
1653 | } else | |
55653a68 | 1654 | output(o, 2, _("Auto-merging %s"), path); |
0c4918d1 EN |
1655 | |
1656 | if (!mfi.clean) { | |
1657 | if (S_ISGITLINK(mfi.mode)) | |
55653a68 JX |
1658 | reason = _("submodule"); |
1659 | output(o, 1, _("CONFLICT (%s): Merge conflict in %s"), | |
0c4918d1 | 1660 | reason, path); |
4f66dade | 1661 | if (rename_conflict_info && !df_conflict_remains) |
b8ddf164 | 1662 | update_stages(path, &one, &a, &b); |
0c4918d1 EN |
1663 | } |
1664 | ||
4ab9a157 | 1665 | if (df_conflict_remains) { |
3d6b8e88 | 1666 | char *new_path; |
51931bf0 EN |
1667 | if (o->call_depth) { |
1668 | remove_file_from_cache(path); | |
1669 | } else { | |
1670 | if (!mfi.clean) | |
1671 | update_stages(path, &one, &a, &b); | |
1672 | else { | |
1673 | int file_from_stage2 = was_tracked(path); | |
1674 | struct diff_filespec merged; | |
9b561499 | 1675 | oidcpy(&merged.oid, &mfi.oid); |
51931bf0 EN |
1676 | merged.mode = mfi.mode; |
1677 | ||
1678 | update_stages(path, NULL, | |
1679 | file_from_stage2 ? &merged : NULL, | |
1680 | file_from_stage2 ? NULL : &merged); | |
1681 | } | |
1682 | ||
1683 | } | |
4f66dade | 1684 | new_path = unique_path(o, path, rename_conflict_info->branch1); |
55653a68 | 1685 | output(o, 1, _("Adding as %s instead"), new_path); |
b4da9d62 | 1686 | update_file(o, 0, &mfi.oid, mfi.mode, new_path); |
3d6b8e88 | 1687 | free(new_path); |
51931bf0 | 1688 | mfi.clean = 0; |
4ab9a157 | 1689 | } else { |
b4da9d62 | 1690 | update_file(o, mfi.clean, &mfi.oid, mfi.mode, path); |
4ab9a157 | 1691 | } |
0c4918d1 EN |
1692 | return mfi.clean; |
1693 | ||
1694 | } | |
1695 | ||
9047ebbc | 1696 | /* Per entry merge function */ |
8a2fce18 MV |
1697 | static int process_entry(struct merge_options *o, |
1698 | const char *path, struct stage_data *entry) | |
9047ebbc | 1699 | { |
9047ebbc | 1700 | int clean_merge = 1; |
1bc0ab7c | 1701 | int normalize = o->renormalize; |
9047ebbc MV |
1702 | unsigned o_mode = entry->stages[1].mode; |
1703 | unsigned a_mode = entry->stages[2].mode; | |
1704 | unsigned b_mode = entry->stages[3].mode; | |
b4da9d62 | 1705 | struct object_id *o_oid = stage_oid(&entry->stages[1].oid, o_mode); |
1706 | struct object_id *a_oid = stage_oid(&entry->stages[2].oid, a_mode); | |
1707 | struct object_id *b_oid = stage_oid(&entry->stages[3].oid, b_mode); | |
9047ebbc | 1708 | |
37348937 | 1709 | entry->processed = 1; |
4f66dade EN |
1710 | if (entry->rename_conflict_info) { |
1711 | struct rename_conflict_info *conflict_info = entry->rename_conflict_info; | |
07413c5a | 1712 | switch (conflict_info->rename_type) { |
882fd11a | 1713 | case RENAME_NORMAL: |
4f66dade | 1714 | case RENAME_ONE_FILE_TO_ONE: |
882fd11a | 1715 | clean_merge = merge_content(o, path, |
b4da9d62 | 1716 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, |
4f66dade | 1717 | conflict_info); |
882fd11a | 1718 | break; |
3b130adf EN |
1719 | case RENAME_DELETE: |
1720 | clean_merge = 0; | |
1721 | conflict_rename_delete(o, conflict_info->pair1, | |
1722 | conflict_info->branch1, | |
1723 | conflict_info->branch2); | |
1724 | break; | |
07413c5a | 1725 | case RENAME_ONE_FILE_TO_TWO: |
07413c5a | 1726 | clean_merge = 0; |
a99b7f22 | 1727 | conflict_rename_rename_1to2(o, conflict_info); |
07413c5a | 1728 | break; |
461f5041 EN |
1729 | case RENAME_TWO_FILES_TO_ONE: |
1730 | clean_merge = 0; | |
1731 | conflict_rename_rename_2to1(o, conflict_info); | |
07413c5a EN |
1732 | break; |
1733 | default: | |
1734 | entry->processed = 0; | |
1735 | break; | |
1736 | } | |
b4da9d62 | 1737 | } else if (o_oid && (!a_oid || !b_oid)) { |
edd2faf5 | 1738 | /* Case A: Deleted in one */ |
b4da9d62 | 1739 | if ((!a_oid && !b_oid) || |
1740 | (!b_oid && blob_unchanged(o_oid, o_mode, a_oid, a_mode, normalize, path)) || | |
1741 | (!a_oid && blob_unchanged(o_oid, o_mode, b_oid, b_mode, normalize, path))) { | |
edd2faf5 EN |
1742 | /* Deleted in both or deleted in one and |
1743 | * unchanged in the other */ | |
b4da9d62 | 1744 | if (a_oid) |
55653a68 | 1745 | output(o, 2, _("Removing %s"), path); |
edd2faf5 | 1746 | /* do not touch working file if it did not exist */ |
b4da9d62 | 1747 | remove_file(o, 1, path, !a_oid); |
edd2faf5 EN |
1748 | } else { |
1749 | /* Modify/delete; deleted side may have put a directory in the way */ | |
edd2faf5 | 1750 | clean_merge = 0; |
b4da9d62 | 1751 | handle_modify_delete(o, path, o_oid, o_mode, |
1752 | a_oid, a_mode, b_oid, b_mode); | |
3d6b8e88 | 1753 | } |
b4da9d62 | 1754 | } else if ((!o_oid && a_oid && !b_oid) || |
1755 | (!o_oid && !a_oid && b_oid)) { | |
edd2faf5 EN |
1756 | /* Case B: Added in one. */ |
1757 | /* [nothing|directory] -> ([nothing|directory], file) */ | |
1758 | ||
9c0bbb50 EN |
1759 | const char *add_branch; |
1760 | const char *other_branch; | |
1761 | unsigned mode; | |
b4da9d62 | 1762 | const struct object_id *oid; |
9c0bbb50 | 1763 | const char *conf; |
37348937 | 1764 | |
b4da9d62 | 1765 | if (a_oid) { |
9c0bbb50 EN |
1766 | add_branch = o->branch1; |
1767 | other_branch = o->branch2; | |
1768 | mode = a_mode; | |
b4da9d62 | 1769 | oid = a_oid; |
55653a68 | 1770 | conf = _("file/directory"); |
9c0bbb50 EN |
1771 | } else { |
1772 | add_branch = o->branch2; | |
1773 | other_branch = o->branch1; | |
1774 | mode = b_mode; | |
b4da9d62 | 1775 | oid = b_oid; |
55653a68 | 1776 | conf = _("directory/file"); |
9c0bbb50 | 1777 | } |
f2507b4e | 1778 | if (dir_in_way(path, !o->call_depth)) { |
3d6b8e88 | 1779 | char *new_path = unique_path(o, path, add_branch); |
9c0bbb50 | 1780 | clean_merge = 0; |
55653a68 JX |
1781 | output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. " |
1782 | "Adding %s as %s"), | |
9c0bbb50 | 1783 | conf, path, other_branch, path, new_path); |
b4da9d62 | 1784 | update_file(o, 0, oid, mode, new_path); |
7b1c610f EN |
1785 | if (o->call_depth) |
1786 | remove_file_from_cache(path); | |
3d6b8e88 | 1787 | free(new_path); |
9c0bbb50 | 1788 | } else { |
55653a68 | 1789 | output(o, 2, _("Adding %s"), path); |
35a74abf | 1790 | /* do not overwrite file if already present */ |
b4da9d62 | 1791 | update_file_flags(o, oid, mode, path, 1, !a_oid); |
9c0bbb50 | 1792 | } |
b4da9d62 | 1793 | } else if (a_oid && b_oid) { |
edd2faf5 EN |
1794 | /* Case C: Added in both (check for same permissions) and */ |
1795 | /* case D: Modified in both, but differently. */ | |
4f66dade | 1796 | clean_merge = merge_content(o, path, |
b4da9d62 | 1797 | o_oid, o_mode, a_oid, a_mode, b_oid, b_mode, |
edd2faf5 | 1798 | NULL); |
b4da9d62 | 1799 | } else if (!o_oid && !a_oid && !b_oid) { |
edd2faf5 EN |
1800 | /* |
1801 | * this entry was deleted altogether. a_mode == 0 means | |
1802 | * we had that path and want to actively remove it. | |
1803 | */ | |
1804 | remove_file(o, 1, path, !a_mode); | |
1805 | } else | |
55653a68 | 1806 | die(_("Fatal merge failure, shouldn't happen.")); |
37348937 EN |
1807 | |
1808 | return clean_merge; | |
1809 | } | |
1810 | ||
8a2fce18 MV |
1811 | int merge_trees(struct merge_options *o, |
1812 | struct tree *head, | |
9047ebbc MV |
1813 | struct tree *merge, |
1814 | struct tree *common, | |
9047ebbc MV |
1815 | struct tree **result) |
1816 | { | |
1817 | int code, clean; | |
1818 | ||
85e51b78 JH |
1819 | if (o->subtree_shift) { |
1820 | merge = shift_tree_object(head, merge, o->subtree_shift); | |
1821 | common = shift_tree_object(head, common, o->subtree_shift); | |
9047ebbc MV |
1822 | } |
1823 | ||
b4da9d62 | 1824 | if (oid_eq(&common->object.oid, &merge->object.oid)) { |
55653a68 | 1825 | output(o, 0, _("Already up-to-date!")); |
9047ebbc MV |
1826 | *result = head; |
1827 | return 1; | |
1828 | } | |
1829 | ||
b7fa51da | 1830 | code = git_merge_trees(o->call_depth, common, head, merge); |
9047ebbc | 1831 | |
fadd069d JH |
1832 | if (code != 0) { |
1833 | if (show(o, 4) || o->call_depth) | |
55653a68 | 1834 | die(_("merging of trees %s and %s failed"), |
f2fd0760 | 1835 | oid_to_hex(&head->object.oid), |
1836 | oid_to_hex(&merge->object.oid)); | |
fadd069d JH |
1837 | else |
1838 | exit(128); | |
1839 | } | |
9047ebbc MV |
1840 | |
1841 | if (unmerged_cache()) { | |
1842 | struct string_list *entries, *re_head, *re_merge; | |
1843 | int i; | |
696ee23c MV |
1844 | string_list_clear(&o->current_file_set, 1); |
1845 | string_list_clear(&o->current_directory_set, 1); | |
1846 | get_files_dirs(o, head); | |
1847 | get_files_dirs(o, merge); | |
9047ebbc MV |
1848 | |
1849 | entries = get_unmerged(); | |
70cc3d36 | 1850 | record_df_conflict_files(o, entries); |
8a2fce18 MV |
1851 | re_head = get_renames(o, head, common, head, merge, entries); |
1852 | re_merge = get_renames(o, merge, common, head, merge, entries); | |
1853 | clean = process_renames(o, re_head, re_merge); | |
edd2faf5 | 1854 | for (i = entries->nr-1; 0 <= i; i--) { |
9047ebbc MV |
1855 | const char *path = entries->items[i].string; |
1856 | struct stage_data *e = entries->items[i].util; | |
1857 | if (!e->processed | |
8a2fce18 | 1858 | && !process_entry(o, path, e)) |
9047ebbc MV |
1859 | clean = 0; |
1860 | } | |
7edba4c4 JH |
1861 | for (i = 0; i < entries->nr; i++) { |
1862 | struct stage_data *e = entries->items[i].util; | |
1863 | if (!e->processed) | |
55653a68 | 1864 | die(_("Unprocessed path??? %s"), |
7edba4c4 JH |
1865 | entries->items[i].string); |
1866 | } | |
9047ebbc MV |
1867 | |
1868 | string_list_clear(re_merge, 0); | |
1869 | string_list_clear(re_head, 0); | |
1870 | string_list_clear(entries, 1); | |
1871 | ||
473091e2 SB |
1872 | free(re_merge); |
1873 | free(re_head); | |
1874 | free(entries); | |
9047ebbc MV |
1875 | } |
1876 | else | |
1877 | clean = 1; | |
1878 | ||
b7fa51da | 1879 | if (o->call_depth) |
8a2fce18 | 1880 | *result = write_tree_from_memory(o); |
9047ebbc MV |
1881 | |
1882 | return clean; | |
1883 | } | |
1884 | ||
1885 | static struct commit_list *reverse_commit_list(struct commit_list *list) | |
1886 | { | |
1887 | struct commit_list *next = NULL, *current, *backup; | |
1888 | for (current = list; current; current = backup) { | |
1889 | backup = current->next; | |
1890 | current->next = next; | |
1891 | next = current; | |
1892 | } | |
1893 | return next; | |
1894 | } | |
1895 | ||
1896 | /* | |
1897 | * Merge the commits h1 and h2, return the resulting virtual | |
1898 | * commit object and a flag indicating the cleanness of the merge. | |
1899 | */ | |
8a2fce18 MV |
1900 | int merge_recursive(struct merge_options *o, |
1901 | struct commit *h1, | |
9047ebbc | 1902 | struct commit *h2, |
9047ebbc MV |
1903 | struct commit_list *ca, |
1904 | struct commit **result) | |
1905 | { | |
1906 | struct commit_list *iter; | |
1907 | struct commit *merged_common_ancestors; | |
1908 | struct tree *mrtree = mrtree; | |
1909 | int clean; | |
1910 | ||
8a2fce18 | 1911 | if (show(o, 4)) { |
55653a68 | 1912 | output(o, 4, _("Merging:")); |
5033639c MV |
1913 | output_commit_title(o, h1); |
1914 | output_commit_title(o, h2); | |
9047ebbc MV |
1915 | } |
1916 | ||
1917 | if (!ca) { | |
2ce406cc | 1918 | ca = get_merge_bases(h1, h2); |
9047ebbc MV |
1919 | ca = reverse_commit_list(ca); |
1920 | } | |
1921 | ||
8a2fce18 | 1922 | if (show(o, 5)) { |
e0453cd8 RT |
1923 | unsigned cnt = commit_list_count(ca); |
1924 | ||
1925 | output(o, 5, Q_("found %u common ancestor:", | |
1926 | "found %u common ancestors:", cnt), cnt); | |
9047ebbc | 1927 | for (iter = ca; iter; iter = iter->next) |
5033639c | 1928 | output_commit_title(o, iter->item); |
9047ebbc MV |
1929 | } |
1930 | ||
1931 | merged_common_ancestors = pop_commit(&ca); | |
1932 | if (merged_common_ancestors == NULL) { | |
03f622c8 JN |
1933 | /* if there is no common ancestor, use an empty tree */ |
1934 | struct tree *tree; | |
9047ebbc | 1935 | |
cba595bd | 1936 | tree = lookup_tree(EMPTY_TREE_SHA1_BIN); |
9047ebbc MV |
1937 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); |
1938 | } | |
1939 | ||
1940 | for (iter = ca; iter; iter = iter->next) { | |
8a2fce18 | 1941 | const char *saved_b1, *saved_b2; |
5033639c | 1942 | o->call_depth++; |
9047ebbc MV |
1943 | /* |
1944 | * When the merge fails, the result contains files | |
1945 | * with conflict markers. The cleanness flag is | |
1946 | * ignored, it was never actually used, as result of | |
1947 | * merge_trees has always overwritten it: the committed | |
1948 | * "conflicts" were already resolved. | |
1949 | */ | |
1950 | discard_cache(); | |
8a2fce18 MV |
1951 | saved_b1 = o->branch1; |
1952 | saved_b2 = o->branch2; | |
1953 | o->branch1 = "Temporary merge branch 1"; | |
1954 | o->branch2 = "Temporary merge branch 2"; | |
1955 | merge_recursive(o, merged_common_ancestors, iter->item, | |
1956 | NULL, &merged_common_ancestors); | |
1957 | o->branch1 = saved_b1; | |
1958 | o->branch2 = saved_b2; | |
5033639c | 1959 | o->call_depth--; |
9047ebbc MV |
1960 | |
1961 | if (!merged_common_ancestors) | |
55653a68 | 1962 | die(_("merge returned no commit")); |
9047ebbc MV |
1963 | } |
1964 | ||
1965 | discard_cache(); | |
b7fa51da | 1966 | if (!o->call_depth) |
9047ebbc | 1967 | read_cache(); |
9047ebbc | 1968 | |
7ca56aa0 | 1969 | o->ancestor = "merged common ancestors"; |
8a2fce18 MV |
1970 | clean = merge_trees(o, h1->tree, h2->tree, merged_common_ancestors->tree, |
1971 | &mrtree); | |
9047ebbc | 1972 | |
b7fa51da | 1973 | if (o->call_depth) { |
9047ebbc MV |
1974 | *result = make_virtual_commit(mrtree, "merged tree"); |
1975 | commit_list_insert(h1, &(*result)->parents); | |
1976 | commit_list_insert(h2, &(*result)->parents->next); | |
1977 | } | |
c7d84924 | 1978 | flush_output(o); |
f31027c9 JH |
1979 | if (show(o, 2)) |
1980 | diff_warn_rename_limit("merge.renamelimit", | |
1981 | o->needed_rename_limit, 0); | |
9047ebbc MV |
1982 | return clean; |
1983 | } | |
1984 | ||
4e8161a8 | 1985 | static struct commit *get_ref(const struct object_id *oid, const char *name) |
73118f89 SB |
1986 | { |
1987 | struct object *object; | |
1988 | ||
4e8161a8 | 1989 | object = deref_tag(parse_object(oid->hash), name, strlen(name)); |
73118f89 SB |
1990 | if (!object) |
1991 | return NULL; | |
1992 | if (object->type == OBJ_TREE) | |
1993 | return make_virtual_commit((struct tree*)object, name); | |
1994 | if (object->type != OBJ_COMMIT) | |
1995 | return NULL; | |
1996 | if (parse_commit((struct commit *)object)) | |
1997 | return NULL; | |
1998 | return (struct commit *)object; | |
1999 | } | |
2000 | ||
8a2fce18 | 2001 | int merge_recursive_generic(struct merge_options *o, |
4e8161a8 | 2002 | const struct object_id *head, |
2003 | const struct object_id *merge, | |
8a2fce18 | 2004 | int num_base_list, |
4e8161a8 | 2005 | const struct object_id **base_list, |
8a2fce18 | 2006 | struct commit **result) |
73118f89 | 2007 | { |
03b86647 | 2008 | int clean; |
73118f89 | 2009 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); |
8a2fce18 MV |
2010 | struct commit *head_commit = get_ref(head, o->branch1); |
2011 | struct commit *next_commit = get_ref(merge, o->branch2); | |
73118f89 SB |
2012 | struct commit_list *ca = NULL; |
2013 | ||
2014 | if (base_list) { | |
2015 | int i; | |
8a2fce18 | 2016 | for (i = 0; i < num_base_list; ++i) { |
73118f89 | 2017 | struct commit *base; |
4e8161a8 | 2018 | if (!(base = get_ref(base_list[i], oid_to_hex(base_list[i])))) |
55653a68 | 2019 | return error(_("Could not parse object '%s'"), |
4e8161a8 | 2020 | oid_to_hex(base_list[i])); |
73118f89 SB |
2021 | commit_list_insert(base, &ca); |
2022 | } | |
2023 | } | |
2024 | ||
03b86647 | 2025 | hold_locked_index(lock, 1); |
8a2fce18 MV |
2026 | clean = merge_recursive(o, head_commit, next_commit, ca, |
2027 | result); | |
73118f89 | 2028 | if (active_cache_changed && |
03b86647 | 2029 | write_locked_index(&the_index, lock, COMMIT_LOCK)) |
55653a68 | 2030 | return error(_("Unable to write index.")); |
73118f89 SB |
2031 | |
2032 | return clean ? 0 : 1; | |
2033 | } | |
2034 | ||
0e7bcb1b | 2035 | static void merge_recursive_config(struct merge_options *o) |
9047ebbc | 2036 | { |
0e7bcb1b TA |
2037 | git_config_get_int("merge.verbosity", &o->verbosity); |
2038 | git_config_get_int("diff.renamelimit", &o->diff_rename_limit); | |
2039 | git_config_get_int("merge.renamelimit", &o->merge_rename_limit); | |
2040 | git_config(git_xmerge_config, NULL); | |
9047ebbc MV |
2041 | } |
2042 | ||
8a2fce18 | 2043 | void init_merge_options(struct merge_options *o) |
9047ebbc | 2044 | { |
8a2fce18 MV |
2045 | memset(o, 0, sizeof(struct merge_options)); |
2046 | o->verbosity = 2; | |
2047 | o->buffer_output = 1; | |
2048 | o->diff_rename_limit = -1; | |
2049 | o->merge_rename_limit = -1; | |
7610fa57 | 2050 | o->renormalize = 0; |
d2b11eca | 2051 | o->detect_rename = 1; |
0e7bcb1b | 2052 | merge_recursive_config(o); |
9047ebbc | 2053 | if (getenv("GIT_MERGE_VERBOSITY")) |
8a2fce18 | 2054 | o->verbosity = |
9047ebbc | 2055 | strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10); |
8a2fce18 MV |
2056 | if (o->verbosity >= 5) |
2057 | o->buffer_output = 0; | |
c7d84924 | 2058 | strbuf_init(&o->obuf, 0); |
f93d7c6f TA |
2059 | string_list_init(&o->current_file_set, 1); |
2060 | string_list_init(&o->current_directory_set, 1); | |
2061 | string_list_init(&o->df_conflict_file_set, 1); | |
9047ebbc | 2062 | } |
635a7bb1 JN |
2063 | |
2064 | int parse_merge_opt(struct merge_options *o, const char *s) | |
2065 | { | |
95b567c7 JK |
2066 | const char *arg; |
2067 | ||
635a7bb1 JN |
2068 | if (!s || !*s) |
2069 | return -1; | |
2070 | if (!strcmp(s, "ours")) | |
2071 | o->recursive_variant = MERGE_RECURSIVE_OURS; | |
2072 | else if (!strcmp(s, "theirs")) | |
2073 | o->recursive_variant = MERGE_RECURSIVE_THEIRS; | |
2074 | else if (!strcmp(s, "subtree")) | |
2075 | o->subtree_shift = ""; | |
95b567c7 JK |
2076 | else if (skip_prefix(s, "subtree=", &arg)) |
2077 | o->subtree_shift = arg; | |
58a1ece4 | 2078 | else if (!strcmp(s, "patience")) |
307ab20b | 2079 | o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); |
8c912eea | 2080 | else if (!strcmp(s, "histogram")) |
307ab20b | 2081 | o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); |
95b567c7 JK |
2082 | else if (skip_prefix(s, "diff-algorithm=", &arg)) { |
2083 | long value = parse_algorithm_value(arg); | |
07924d4d MP |
2084 | if (value < 0) |
2085 | return -1; | |
2086 | /* clear out previous settings */ | |
2087 | DIFF_XDL_CLR(o, NEED_MINIMAL); | |
2088 | o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; | |
2089 | o->xdl_opts |= value; | |
2090 | } | |
4e5dd044 JF |
2091 | else if (!strcmp(s, "ignore-space-change")) |
2092 | o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; | |
2093 | else if (!strcmp(s, "ignore-all-space")) | |
2094 | o->xdl_opts |= XDF_IGNORE_WHITESPACE; | |
2095 | else if (!strcmp(s, "ignore-space-at-eol")) | |
2096 | o->xdl_opts |= XDF_IGNORE_WHITESPACE_AT_EOL; | |
635a7bb1 JN |
2097 | else if (!strcmp(s, "renormalize")) |
2098 | o->renormalize = 1; | |
2099 | else if (!strcmp(s, "no-renormalize")) | |
2100 | o->renormalize = 0; | |
d2b11eca FGA |
2101 | else if (!strcmp(s, "no-renames")) |
2102 | o->detect_rename = 0; | |
87892f60 | 2103 | else if (!strcmp(s, "find-renames")) { |
1b47ad16 | 2104 | o->detect_rename = 1; |
87892f60 FGA |
2105 | o->rename_score = 0; |
2106 | } | |
1b47ad16 FGA |
2107 | else if (skip_prefix(s, "find-renames=", &arg) || |
2108 | skip_prefix(s, "rename-threshold=", &arg)) { | |
95b567c7 | 2109 | if ((o->rename_score = parse_rename_score(&arg)) == -1 || *arg != 0) |
10ae7526 | 2110 | return -1; |
d2b11eca | 2111 | o->detect_rename = 1; |
10ae7526 | 2112 | } |
635a7bb1 JN |
2113 | else |
2114 | return -1; | |
2115 | return 0; | |
2116 | } |