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