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