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