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