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