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