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