]>
Commit | Line | Data |
---|---|---|
6d297f81 JS |
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 | */ | |
6d297f81 JS |
6 | #include "cache.h" |
7 | #include "cache-tree.h" | |
8 | #include "commit.h" | |
9 | #include "blob.h" | |
10 | #include "tree-walk.h" | |
11 | #include "diff.h" | |
12 | #include "diffcore.h" | |
13 | #include "run-command.h" | |
14 | #include "tag.h" | |
7a85b848 | 15 | #include "unpack-trees.h" |
6d297f81 | 16 | #include "path-list.h" |
c2b4faea | 17 | #include "xdiff-interface.h" |
f3ef6b6b | 18 | #include "interpolate.h" |
a129d96f | 19 | #include "attr.h" |
6d297f81 | 20 | |
68faf689 JH |
21 | static int subtree_merge; |
22 | ||
23 | static struct tree *shift_tree_object(struct tree *one, struct tree *two) | |
24 | { | |
25 | unsigned char shifted[20]; | |
26 | ||
27 | /* | |
28 | * NEEDSWORK: this limits the recursion depth to hardcoded | |
29 | * value '2' to avoid excessive overhead. | |
30 | */ | |
31 | shift_tree(one->object.sha1, two->object.sha1, shifted, 2); | |
32 | if (!hashcmp(two->object.sha1, shifted)) | |
33 | return two; | |
34 | return lookup_tree(shifted); | |
35 | } | |
36 | ||
6d297f81 JS |
37 | /* |
38 | * A virtual commit has | |
39 | * - (const char *)commit->util set to the name, and | |
40 | * - *(int *)commit->object.sha1 set to the virtual id. | |
41 | */ | |
6d297f81 JS |
42 | |
43 | static unsigned commit_list_count(const struct commit_list *l) | |
44 | { | |
45 | unsigned c = 0; | |
46 | for (; l; l = l->next ) | |
47 | c++; | |
48 | return c; | |
49 | } | |
50 | ||
51 | static struct commit *make_virtual_commit(struct tree *tree, const char *comment) | |
52 | { | |
53 | struct commit *commit = xcalloc(1, sizeof(struct commit)); | |
54 | static unsigned virtual_id = 1; | |
55 | commit->tree = tree; | |
56 | commit->util = (void*)comment; | |
57 | *(int*)commit->object.sha1 = virtual_id++; | |
c1f3089e JS |
58 | /* avoid warnings */ |
59 | commit->object.parsed = 1; | |
6d297f81 JS |
60 | return commit; |
61 | } | |
62 | ||
63 | /* | |
3058e933 JS |
64 | * Since we use get_tree_entry(), which does not put the read object into |
65 | * the object pool, we cannot rely on a == b. | |
6d297f81 JS |
66 | */ |
67 | static int sha_eq(const unsigned char *a, const unsigned char *b) | |
68 | { | |
3af244ca | 69 | if (!a && !b) |
6d297f81 | 70 | return 2; |
87cb004e | 71 | return a && b && hashcmp(a, b) == 0; |
6d297f81 JS |
72 | } |
73 | ||
6d297f81 | 74 | /* |
3058e933 JS |
75 | * Since we want to write the index eventually, we cannot reuse the index |
76 | * for these (temporary) data. | |
6d297f81 JS |
77 | */ |
78 | struct stage_data | |
79 | { | |
80 | struct | |
81 | { | |
82 | unsigned mode; | |
83 | unsigned char sha[20]; | |
84 | } stages[4]; | |
85 | unsigned processed:1; | |
86 | }; | |
87 | ||
66a155bc SP |
88 | struct output_buffer |
89 | { | |
90 | struct output_buffer *next; | |
91 | char *str; | |
92 | }; | |
93 | ||
5a753613 JS |
94 | static struct path_list current_file_set = {NULL, 0, 0, 1}; |
95 | static struct path_list current_directory_set = {NULL, 0, 0, 1}; | |
6d297f81 | 96 | |
63889639 | 97 | static int call_depth = 0; |
8c3275ab | 98 | static int verbosity = 2; |
66a155bc | 99 | static int buffer_output = 1; |
3f6ee2d1 SP |
100 | static int do_progress = 1; |
101 | static unsigned last_percent; | |
102 | static unsigned merged_cnt; | |
103 | static unsigned total_cnt; | |
104 | static volatile sig_atomic_t progress_update; | |
66a155bc | 105 | static struct output_buffer *output_list, *output_end; |
6d297f81 | 106 | |
8c3275ab SP |
107 | static int show (int v) |
108 | { | |
109 | return (!call_depth && verbosity >= v) || verbosity >= 5; | |
110 | } | |
111 | ||
112 | static void output(int v, const char *fmt, ...) | |
6d297f81 JS |
113 | { |
114 | va_list args; | |
6d297f81 | 115 | va_start(args, fmt); |
66a155bc SP |
116 | if (buffer_output && show(v)) { |
117 | struct output_buffer *b = xmalloc(sizeof(*b)); | |
118 | nfvasprintf(&b->str, fmt, args); | |
119 | b->next = NULL; | |
120 | if (output_end) | |
121 | output_end->next = b; | |
122 | else | |
123 | output_list = b; | |
124 | output_end = b; | |
125 | } else if (show(v)) { | |
8c3275ab SP |
126 | int i; |
127 | for (i = call_depth; i--;) | |
128 | fputs(" ", stdout); | |
129 | vfprintf(stdout, fmt, args); | |
130 | fputc('\n', stdout); | |
131 | } | |
6d297f81 | 132 | va_end(args); |
6d297f81 JS |
133 | } |
134 | ||
66a155bc SP |
135 | static void flush_output() |
136 | { | |
137 | struct output_buffer *b, *n; | |
138 | for (b = output_list; b; b = n) { | |
139 | int i; | |
140 | for (i = call_depth; i--;) | |
141 | fputs(" ", stdout); | |
142 | fputs(b->str, stdout); | |
143 | fputc('\n', stdout); | |
144 | n = b->next; | |
145 | free(b->str); | |
146 | free(b); | |
147 | } | |
148 | output_list = NULL; | |
149 | output_end = NULL; | |
150 | } | |
151 | ||
3af244ca JS |
152 | static void output_commit_title(struct commit *commit) |
153 | { | |
154 | int i; | |
66a155bc | 155 | flush_output(); |
63889639 | 156 | for (i = call_depth; i--;) |
3af244ca JS |
157 | fputs(" ", stdout); |
158 | if (commit->util) | |
159 | printf("virtual %s\n", (char *)commit->util); | |
160 | else { | |
9926ba98 | 161 | printf("%s ", find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV)); |
3af244ca JS |
162 | if (parse_commit(commit) != 0) |
163 | printf("(bad commit)\n"); | |
164 | else { | |
165 | const char *s; | |
166 | int len; | |
167 | for (s = commit->buffer; *s; s++) | |
168 | if (*s == '\n' && s[1] == '\n') { | |
169 | s += 2; | |
170 | break; | |
171 | } | |
172 | for (len = 0; s[len] && '\n' != s[len]; len++) | |
173 | ; /* do nothing */ | |
174 | printf("%.*s\n", len, s); | |
175 | } | |
176 | } | |
177 | } | |
178 | ||
3f6ee2d1 SP |
179 | static void progress_interval(int signum) |
180 | { | |
181 | progress_update = 1; | |
182 | } | |
183 | ||
184 | static void setup_progress_signal(void) | |
185 | { | |
186 | struct sigaction sa; | |
187 | struct itimerval v; | |
188 | ||
189 | memset(&sa, 0, sizeof(sa)); | |
190 | sa.sa_handler = progress_interval; | |
191 | sigemptyset(&sa.sa_mask); | |
192 | sa.sa_flags = SA_RESTART; | |
193 | sigaction(SIGALRM, &sa, NULL); | |
194 | ||
195 | v.it_interval.tv_sec = 1; | |
196 | v.it_interval.tv_usec = 0; | |
197 | v.it_value = v.it_interval; | |
198 | setitimer(ITIMER_REAL, &v, NULL); | |
199 | } | |
200 | ||
201 | static void display_progress() | |
202 | { | |
203 | unsigned percent = total_cnt ? merged_cnt * 100 / total_cnt : 0; | |
204 | if (progress_update || percent != last_percent) { | |
205 | fprintf(stderr, "%4u%% (%u/%u) done\r", | |
206 | percent, merged_cnt, total_cnt); | |
207 | progress_update = 0; | |
208 | last_percent = percent; | |
209 | } | |
210 | } | |
211 | ||
6d297f81 JS |
212 | static struct cache_entry *make_cache_entry(unsigned int mode, |
213 | const unsigned char *sha1, const char *path, int stage, int refresh) | |
214 | { | |
215 | int size, len; | |
216 | struct cache_entry *ce; | |
217 | ||
218 | if (!verify_path(path)) | |
219 | return NULL; | |
220 | ||
221 | len = strlen(path); | |
222 | size = cache_entry_size(len); | |
223 | ce = xcalloc(1, size); | |
224 | ||
8da71493 | 225 | hashcpy(ce->sha1, sha1); |
6d297f81 JS |
226 | memcpy(ce->name, path, len); |
227 | ce->ce_flags = create_ce_flags(len, stage); | |
228 | ce->ce_mode = create_ce_mode(mode); | |
229 | ||
230 | if (refresh) | |
231 | return refresh_cache_entry(ce, 0); | |
232 | ||
233 | return ce; | |
234 | } | |
235 | ||
236 | static int add_cacheinfo(unsigned int mode, const unsigned char *sha1, | |
237 | const char *path, int stage, int refresh, int options) | |
238 | { | |
239 | struct cache_entry *ce; | |
6d297f81 JS |
240 | ce = make_cache_entry(mode, sha1 ? sha1 : null_sha1, path, stage, refresh); |
241 | if (!ce) | |
0424138d | 242 | return error("addinfo_cache failed for path '%s'", path); |
6d297f81 JS |
243 | return add_cache_entry(ce, options); |
244 | } | |
245 | ||
246 | /* | |
247 | * This is a global variable which is used in a number of places but | |
248 | * only written to in the 'merge' function. | |
249 | * | |
250 | * index_only == 1 => Don't leave any non-stage 0 entries in the cache and | |
251 | * don't update the working directory. | |
252 | * 0 => Leave unmerged entries in the cache and update | |
253 | * the working directory. | |
254 | */ | |
255 | static int index_only = 0; | |
256 | ||
7a85b848 | 257 | static int git_merge_trees(int index_only, |
6d297f81 JS |
258 | struct tree *common, |
259 | struct tree *head, | |
260 | struct tree *merge) | |
261 | { | |
3af244ca | 262 | int rc; |
7a85b848 JS |
263 | struct object_list *trees = NULL; |
264 | struct unpack_trees_options opts; | |
265 | ||
7a85b848 JS |
266 | memset(&opts, 0, sizeof(opts)); |
267 | if (index_only) | |
268 | opts.index_only = 1; | |
269 | else | |
270 | opts.update = 1; | |
271 | opts.merge = 1; | |
272 | opts.head_idx = 2; | |
273 | opts.fn = threeway_merge; | |
274 | ||
275 | object_list_append(&common->object, &trees); | |
276 | object_list_append(&head->object, &trees); | |
277 | object_list_append(&merge->object, &trees); | |
278 | ||
279 | rc = unpack_trees(trees, &opts); | |
280 | cache_tree_free(&active_cache_tree); | |
7a85b848 | 281 | return rc; |
6d297f81 JS |
282 | } |
283 | ||
8b944b56 JH |
284 | static int unmerged_index(void) |
285 | { | |
286 | int i; | |
287 | for (i = 0; i < active_nr; i++) { | |
288 | struct cache_entry *ce = active_cache[i]; | |
289 | if (ce_stage(ce)) | |
290 | return 1; | |
291 | } | |
292 | return 0; | |
293 | } | |
294 | ||
3af244ca | 295 | static struct tree *git_write_tree(void) |
6d297f81 | 296 | { |
5b982f84 JS |
297 | struct tree *result = NULL; |
298 | ||
a97e4075 AR |
299 | if (unmerged_index()) { |
300 | int i; | |
301 | output(0, "There are unmerged index entries:"); | |
302 | for (i = 0; i < active_nr; i++) { | |
303 | struct cache_entry *ce = active_cache[i]; | |
304 | if (ce_stage(ce)) | |
305 | output(0, "%d %.*s", ce_stage(ce), ce_namelen(ce), ce->name); | |
306 | } | |
8b944b56 | 307 | return NULL; |
a97e4075 | 308 | } |
5b982f84 JS |
309 | |
310 | if (!active_cache_tree) | |
311 | active_cache_tree = cache_tree(); | |
312 | ||
313 | if (!cache_tree_fully_valid(active_cache_tree) && | |
8b944b56 JH |
314 | cache_tree_update(active_cache_tree, |
315 | active_cache, active_nr, 0, 0) < 0) | |
5b982f84 JS |
316 | die("error building trees"); |
317 | ||
318 | result = lookup_tree(active_cache_tree->sha1); | |
319 | ||
5b982f84 | 320 | return result; |
6d297f81 JS |
321 | } |
322 | ||
6d297f81 JS |
323 | static int save_files_dirs(const unsigned char *sha1, |
324 | const char *base, int baselen, const char *path, | |
325 | unsigned int mode, int stage) | |
326 | { | |
327 | int len = strlen(path); | |
2d7320d0 | 328 | char *newpath = xmalloc(baselen + len + 1); |
6d297f81 JS |
329 | memcpy(newpath, base, baselen); |
330 | memcpy(newpath + baselen, path, len); | |
331 | newpath[baselen + len] = '\0'; | |
332 | ||
333 | if (S_ISDIR(mode)) | |
5a753613 | 334 | path_list_insert(newpath, ¤t_directory_set); |
6d297f81 | 335 | else |
5a753613 | 336 | path_list_insert(newpath, ¤t_file_set); |
6d297f81 JS |
337 | free(newpath); |
338 | ||
339 | return READ_TREE_RECURSIVE; | |
340 | } | |
341 | ||
3af244ca | 342 | static int get_files_dirs(struct tree *tree) |
6d297f81 JS |
343 | { |
344 | int n; | |
bd669986 | 345 | if (read_tree_recursive(tree, "", 0, 0, NULL, save_files_dirs) != 0) |
6d297f81 | 346 | return 0; |
5a753613 | 347 | n = current_file_set.nr + current_directory_set.nr; |
6d297f81 JS |
348 | return n; |
349 | } | |
350 | ||
6d297f81 JS |
351 | /* |
352 | * Returns a index_entry instance which doesn't have to correspond to | |
353 | * a real cache entry in Git's index. | |
354 | */ | |
3af244ca JS |
355 | static struct stage_data *insert_stage_data(const char *path, |
356 | struct tree *o, struct tree *a, struct tree *b, | |
357 | struct path_list *entries) | |
6d297f81 | 358 | { |
3af244ca | 359 | struct path_list_item *item; |
6d297f81 JS |
360 | struct stage_data *e = xcalloc(1, sizeof(struct stage_data)); |
361 | get_tree_entry(o->object.sha1, path, | |
362 | e->stages[1].sha, &e->stages[1].mode); | |
363 | get_tree_entry(a->object.sha1, path, | |
364 | e->stages[2].sha, &e->stages[2].mode); | |
365 | get_tree_entry(b->object.sha1, path, | |
366 | e->stages[3].sha, &e->stages[3].mode); | |
3af244ca JS |
367 | item = path_list_insert(path, entries); |
368 | item->util = e; | |
6d297f81 JS |
369 | return e; |
370 | } | |
371 | ||
6d297f81 | 372 | /* |
5a753613 | 373 | * Create a dictionary mapping file names to stage_data objects. The |
6d297f81 JS |
374 | * dictionary contains one entry for every path with a non-zero stage entry. |
375 | */ | |
3af244ca | 376 | static struct path_list *get_unmerged(void) |
6d297f81 JS |
377 | { |
378 | struct path_list *unmerged = xcalloc(1, sizeof(struct path_list)); | |
379 | int i; | |
380 | ||
381 | unmerged->strdup_paths = 1; | |
3f6ee2d1 | 382 | total_cnt += active_nr; |
8b944b56 | 383 | |
3f6ee2d1 | 384 | for (i = 0; i < active_nr; i++, merged_cnt++) { |
3af244ca JS |
385 | struct path_list_item *item; |
386 | struct stage_data *e; | |
6d297f81 | 387 | struct cache_entry *ce = active_cache[i]; |
3f6ee2d1 SP |
388 | if (do_progress) |
389 | display_progress(); | |
6d297f81 JS |
390 | if (!ce_stage(ce)) |
391 | continue; | |
392 | ||
3af244ca JS |
393 | item = path_list_lookup(ce->name, unmerged); |
394 | if (!item) { | |
395 | item = path_list_insert(ce->name, unmerged); | |
396 | item->util = xcalloc(1, sizeof(struct stage_data)); | |
397 | } | |
398 | e = item->util; | |
6d297f81 | 399 | e->stages[ce_stage(ce)].mode = ntohl(ce->ce_mode); |
8da71493 | 400 | hashcpy(e->stages[ce_stage(ce)].sha, ce->sha1); |
6d297f81 JS |
401 | } |
402 | ||
6d297f81 JS |
403 | return unmerged; |
404 | } | |
405 | ||
406 | struct rename | |
407 | { | |
408 | struct diff_filepair *pair; | |
409 | struct stage_data *src_entry; | |
410 | struct stage_data *dst_entry; | |
411 | unsigned processed:1; | |
412 | }; | |
413 | ||
6d297f81 | 414 | /* |
3dff5379 | 415 | * Get information of all renames which occurred between 'o_tree' and |
5a753613 JS |
416 | * 'tree'. We need the three trees in the merge ('o_tree', 'a_tree' and |
417 | * 'b_tree') to be able to associate the correct cache entries with | |
418 | * the rename information. 'tree' is always equal to either a_tree or b_tree. | |
6d297f81 JS |
419 | */ |
420 | static struct path_list *get_renames(struct tree *tree, | |
5a753613 JS |
421 | struct tree *o_tree, |
422 | struct tree *a_tree, | |
423 | struct tree *b_tree, | |
6d297f81 JS |
424 | struct path_list *entries) |
425 | { | |
3af244ca JS |
426 | int i; |
427 | struct path_list *renames; | |
428 | struct diff_options opts; | |
3af244ca JS |
429 | |
430 | renames = xcalloc(1, sizeof(struct path_list)); | |
6d297f81 JS |
431 | diff_setup(&opts); |
432 | opts.recursive = 1; | |
433 | opts.detect_rename = DIFF_DETECT_RENAME; | |
434 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
435 | if (diff_setup_done(&opts) < 0) | |
436 | die("diff setup failed"); | |
5a753613 | 437 | diff_tree_sha1(o_tree->object.sha1, tree->object.sha1, "", &opts); |
6d297f81 JS |
438 | diffcore_std(&opts); |
439 | for (i = 0; i < diff_queued_diff.nr; ++i) { | |
3af244ca | 440 | struct path_list_item *item; |
6d297f81 JS |
441 | struct rename *re; |
442 | struct diff_filepair *pair = diff_queued_diff.queue[i]; | |
443 | if (pair->status != 'R') { | |
444 | diff_free_filepair(pair); | |
445 | continue; | |
446 | } | |
447 | re = xmalloc(sizeof(*re)); | |
448 | re->processed = 0; | |
449 | re->pair = pair; | |
3af244ca JS |
450 | item = path_list_lookup(re->pair->one->path, entries); |
451 | if (!item) | |
452 | re->src_entry = insert_stage_data(re->pair->one->path, | |
5a753613 | 453 | o_tree, a_tree, b_tree, entries); |
3af244ca JS |
454 | else |
455 | re->src_entry = item->util; | |
456 | ||
457 | item = path_list_lookup(re->pair->two->path, entries); | |
458 | if (!item) | |
459 | re->dst_entry = insert_stage_data(re->pair->two->path, | |
5a753613 | 460 | o_tree, a_tree, b_tree, entries); |
3af244ca JS |
461 | else |
462 | re->dst_entry = item->util; | |
463 | item = path_list_insert(pair->one->path, renames); | |
6d297f81 JS |
464 | item->util = re; |
465 | } | |
466 | opts.output_format = DIFF_FORMAT_NO_OUTPUT; | |
467 | diff_queued_diff.nr = 0; | |
468 | diff_flush(&opts); | |
6d297f81 JS |
469 | return renames; |
470 | } | |
471 | ||
9fe0d87d JH |
472 | static int update_stages(const char *path, struct diff_filespec *o, |
473 | struct diff_filespec *a, struct diff_filespec *b, | |
474 | int clear) | |
6d297f81 JS |
475 | { |
476 | int options = ADD_CACHE_OK_TO_ADD | ADD_CACHE_OK_TO_REPLACE; | |
3af244ca JS |
477 | if (clear) |
478 | if (remove_file_from_cache(path)) | |
6d297f81 | 479 | return -1; |
3af244ca JS |
480 | if (o) |
481 | if (add_cacheinfo(o->mode, o->sha1, path, 1, 0, options)) | |
6d297f81 | 482 | return -1; |
3af244ca JS |
483 | if (a) |
484 | if (add_cacheinfo(a->mode, a->sha1, path, 2, 0, options)) | |
6d297f81 | 485 | return -1; |
3af244ca JS |
486 | if (b) |
487 | if (add_cacheinfo(b->mode, b->sha1, path, 3, 0, options)) | |
6d297f81 JS |
488 | return -1; |
489 | return 0; | |
490 | } | |
491 | ||
6d297f81 JS |
492 | static int remove_path(const char *name) |
493 | { | |
3af244ca JS |
494 | int ret, len; |
495 | char *slash, *dirs; | |
6d297f81 JS |
496 | |
497 | ret = unlink(name); | |
3af244ca | 498 | if (ret) |
6d297f81 | 499 | return ret; |
3af244ca | 500 | len = strlen(name); |
2d7320d0 | 501 | dirs = xmalloc(len+1); |
6d297f81 JS |
502 | memcpy(dirs, name, len); |
503 | dirs[len] = '\0'; | |
3af244ca | 504 | while ((slash = strrchr(name, '/'))) { |
6d297f81 JS |
505 | *slash = '\0'; |
506 | len = slash - name; | |
3af244ca | 507 | if (rmdir(name) != 0) |
6d297f81 JS |
508 | break; |
509 | } | |
510 | free(dirs); | |
511 | return ret; | |
512 | } | |
513 | ||
65ac6e9c | 514 | static int remove_file(int clean, const char *path, int no_wd) |
6d297f81 | 515 | { |
5a753613 | 516 | int update_cache = index_only || clean; |
65ac6e9c | 517 | int update_working_directory = !index_only && !no_wd; |
6d297f81 | 518 | |
5a753613 | 519 | if (update_cache) { |
6d297f81 JS |
520 | if (remove_file_from_cache(path)) |
521 | return -1; | |
522 | } | |
65ac6e9c | 523 | if (update_working_directory) { |
6d297f81 | 524 | unlink(path); |
3af244ca | 525 | if (errno != ENOENT || errno != EISDIR) |
6d297f81 JS |
526 | return -1; |
527 | remove_path(path); | |
528 | } | |
529 | return 0; | |
530 | } | |
531 | ||
532 | static char *unique_path(const char *path, const char *branch) | |
533 | { | |
534 | char *newpath = xmalloc(strlen(path) + 1 + strlen(branch) + 8 + 1); | |
3af244ca JS |
535 | int suffix = 0; |
536 | struct stat st; | |
f59aac47 | 537 | char *p = newpath + strlen(path); |
6d297f81 | 538 | strcpy(newpath, path); |
f59aac47 | 539 | *(p++) = '~'; |
6d297f81 | 540 | strcpy(p, branch); |
3af244ca JS |
541 | for (; *p; ++p) |
542 | if ('/' == *p) | |
6d297f81 | 543 | *p = '_'; |
5a753613 JS |
544 | while (path_list_has_path(¤t_file_set, newpath) || |
545 | path_list_has_path(¤t_directory_set, newpath) || | |
3af244ca | 546 | lstat(newpath, &st) == 0) |
6d297f81 | 547 | sprintf(p, "_%d", suffix++); |
3af244ca | 548 | |
5a753613 | 549 | path_list_insert(newpath, ¤t_file_set); |
6d297f81 JS |
550 | return newpath; |
551 | } | |
552 | ||
3af244ca | 553 | static int mkdir_p(const char *path, unsigned long mode) |
6d297f81 | 554 | { |
9befac47 SP |
555 | /* path points to cache entries, so xstrdup before messing with it */ |
556 | char *buf = xstrdup(path); | |
3af244ca | 557 | int result = safe_create_leading_directories(buf); |
6d297f81 | 558 | free(buf); |
3af244ca | 559 | return result; |
6d297f81 JS |
560 | } |
561 | ||
562 | static void flush_buffer(int fd, const char *buf, unsigned long size) | |
563 | { | |
564 | while (size > 0) { | |
93822c22 | 565 | long ret = write_in_full(fd, buf, size); |
6d297f81 JS |
566 | if (ret < 0) { |
567 | /* Ignore epipe */ | |
568 | if (errno == EPIPE) | |
569 | break; | |
570 | die("merge-recursive: %s", strerror(errno)); | |
571 | } else if (!ret) { | |
572 | die("merge-recursive: disk full?"); | |
573 | } | |
574 | size -= ret; | |
575 | buf += ret; | |
576 | } | |
577 | } | |
578 | ||
9fe0d87d JH |
579 | static void update_file_flags(const unsigned char *sha, |
580 | unsigned mode, | |
581 | const char *path, | |
582 | int update_cache, | |
583 | int update_wd) | |
6d297f81 | 584 | { |
3af244ca JS |
585 | if (index_only) |
586 | update_wd = 0; | |
6d297f81 | 587 | |
3af244ca | 588 | if (update_wd) { |
21666f1a | 589 | enum object_type type; |
6d297f81 JS |
590 | void *buf; |
591 | unsigned long size; | |
592 | ||
21666f1a | 593 | buf = read_sha1_file(sha, &type, &size); |
6d297f81 JS |
594 | if (!buf) |
595 | die("cannot read object %s '%s'", sha1_to_hex(sha), path); | |
21666f1a | 596 | if (type != OBJ_BLOB) |
6d297f81 JS |
597 | die("blob expected for %s '%s'", sha1_to_hex(sha), path); |
598 | ||
723024d6 | 599 | if (S_ISREG(mode) || (!has_symlinks && S_ISLNK(mode))) { |
3af244ca JS |
600 | int fd; |
601 | if (mkdir_p(path, 0777)) | |
6d297f81 JS |
602 | die("failed to create path %s: %s", path, strerror(errno)); |
603 | unlink(path); | |
3af244ca | 604 | if (mode & 0100) |
6d297f81 JS |
605 | mode = 0777; |
606 | else | |
607 | mode = 0666; | |
3af244ca JS |
608 | fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode); |
609 | if (fd < 0) | |
6d297f81 JS |
610 | die("failed to open %s: %s", path, strerror(errno)); |
611 | flush_buffer(fd, buf, size); | |
612 | close(fd); | |
3af244ca | 613 | } else if (S_ISLNK(mode)) { |
2d7320d0 | 614 | char *lnk = xmalloc(size + 1); |
3af244ca JS |
615 | memcpy(lnk, buf, size); |
616 | lnk[size] = '\0'; | |
617 | mkdir_p(path, 0777); | |
17cd29b2 | 618 | unlink(path); |
3af244ca | 619 | symlink(lnk, path); |
723024d6 | 620 | free(lnk); |
6d297f81 JS |
621 | } else |
622 | die("do not know what to do with %06o %s '%s'", | |
623 | mode, sha1_to_hex(sha), path); | |
624 | } | |
3af244ca JS |
625 | if (update_cache) |
626 | add_cacheinfo(mode, sha, path, 0, update_wd, ADD_CACHE_OK_TO_ADD); | |
6d297f81 JS |
627 | } |
628 | ||
9fe0d87d JH |
629 | static void update_file(int clean, |
630 | const unsigned char *sha, | |
631 | unsigned mode, | |
632 | const char *path) | |
6d297f81 JS |
633 | { |
634 | update_file_flags(sha, mode, path, index_only || clean, !index_only); | |
635 | } | |
636 | ||
637 | /* Low level file merging, update and removal */ | |
638 | ||
639 | struct merge_file_info | |
640 | { | |
641 | unsigned char sha[20]; | |
642 | unsigned mode; | |
643 | unsigned clean:1, | |
644 | merge:1; | |
645 | }; | |
646 | ||
c2b4faea | 647 | static void fill_mm(const unsigned char *sha1, mmfile_t *mm) |
6d297f81 | 648 | { |
6d297f81 | 649 | unsigned long size; |
21666f1a | 650 | enum object_type type; |
6d297f81 | 651 | |
f953831e JS |
652 | if (!hashcmp(sha1, null_sha1)) { |
653 | mm->ptr = xstrdup(""); | |
654 | mm->size = 0; | |
655 | return; | |
656 | } | |
6d297f81 | 657 | |
21666f1a NP |
658 | mm->ptr = read_sha1_file(sha1, &type, &size); |
659 | if (!mm->ptr || type != OBJ_BLOB) | |
6d297f81 | 660 | die("unable to read blob object %s", sha1_to_hex(sha1)); |
c2b4faea | 661 | mm->size = size; |
6d297f81 JS |
662 | } |
663 | ||
153920da JH |
664 | /* |
665 | * Customizable low-level merge drivers support. | |
666 | */ | |
667 | ||
668 | struct ll_merge_driver; | |
669 | typedef int (*ll_merge_fn)(const struct ll_merge_driver *, | |
670 | const char *path, | |
f3ef6b6b | 671 | mmfile_t *orig, |
a129d96f JH |
672 | mmfile_t *src1, const char *name1, |
673 | mmfile_t *src2, const char *name2, | |
674 | mmbuffer_t *result); | |
675 | ||
153920da JH |
676 | struct ll_merge_driver { |
677 | const char *name; | |
678 | const char *description; | |
679 | ll_merge_fn fn; | |
3086486d | 680 | const char *recursive; |
153920da JH |
681 | struct ll_merge_driver *next; |
682 | char *cmdline; | |
683 | }; | |
684 | ||
685 | /* | |
686 | * Built-in low-levels | |
687 | */ | |
688 | static int ll_xdl_merge(const struct ll_merge_driver *drv_unused, | |
689 | const char *path_unused, | |
f3ef6b6b | 690 | mmfile_t *orig, |
a129d96f JH |
691 | mmfile_t *src1, const char *name1, |
692 | mmfile_t *src2, const char *name2, | |
693 | mmbuffer_t *result) | |
694 | { | |
695 | xpparam_t xpp; | |
696 | ||
697 | memset(&xpp, 0, sizeof(xpp)); | |
698 | return xdl_merge(orig, | |
699 | src1, name1, | |
700 | src2, name2, | |
701 | &xpp, XDL_MERGE_ZEALOUS, | |
702 | result); | |
703 | } | |
704 | ||
153920da JH |
705 | static int ll_union_merge(const struct ll_merge_driver *drv_unused, |
706 | const char *path_unused, | |
f3ef6b6b | 707 | mmfile_t *orig, |
a129d96f JH |
708 | mmfile_t *src1, const char *name1, |
709 | mmfile_t *src2, const char *name2, | |
710 | mmbuffer_t *result) | |
711 | { | |
712 | char *src, *dst; | |
713 | long size; | |
714 | const int marker_size = 7; | |
715 | ||
153920da JH |
716 | int status = ll_xdl_merge(drv_unused, path_unused, |
717 | orig, src1, NULL, src2, NULL, result); | |
a129d96f JH |
718 | if (status <= 0) |
719 | return status; | |
720 | size = result->size; | |
721 | src = dst = result->ptr; | |
722 | while (size) { | |
723 | char ch; | |
724 | if ((marker_size < size) && | |
725 | (*src == '<' || *src == '=' || *src == '>')) { | |
726 | int i; | |
727 | ch = *src; | |
728 | for (i = 0; i < marker_size; i++) | |
729 | if (src[i] != ch) | |
730 | goto not_a_marker; | |
731 | if (src[marker_size] != '\n') | |
732 | goto not_a_marker; | |
733 | src += marker_size + 1; | |
734 | size -= marker_size + 1; | |
735 | continue; | |
736 | } | |
737 | not_a_marker: | |
738 | do { | |
739 | ch = *src++; | |
740 | *dst++ = ch; | |
741 | size--; | |
742 | } while (ch != '\n' && size); | |
743 | } | |
744 | result->size = dst - result->ptr; | |
745 | return 0; | |
746 | } | |
747 | ||
153920da JH |
748 | static int ll_binary_merge(const struct ll_merge_driver *drv_unused, |
749 | const char *path_unused, | |
f3ef6b6b | 750 | mmfile_t *orig, |
a129d96f JH |
751 | mmfile_t *src1, const char *name1, |
752 | mmfile_t *src2, const char *name2, | |
753 | mmbuffer_t *result) | |
754 | { | |
755 | /* | |
756 | * The tentative merge result is "ours" for the final round, | |
757 | * or common ancestor for an internal merge. Still return | |
758 | * "conflicted merge" status. | |
759 | */ | |
760 | mmfile_t *stolen = index_only ? orig : src1; | |
761 | ||
762 | result->ptr = stolen->ptr; | |
763 | result->size = stolen->size; | |
764 | stolen->ptr = NULL; | |
765 | return 1; | |
766 | } | |
767 | ||
153920da JH |
768 | #define LL_BINARY_MERGE 0 |
769 | #define LL_TEXT_MERGE 1 | |
770 | #define LL_UNION_MERGE 2 | |
771 | static struct ll_merge_driver ll_merge_drv[] = { | |
772 | { "binary", "built-in binary merge", ll_binary_merge }, | |
773 | { "text", "built-in 3-way text merge", ll_xdl_merge }, | |
774 | { "union", "built-in union merge", ll_union_merge }, | |
a129d96f JH |
775 | }; |
776 | ||
f3ef6b6b JH |
777 | static void create_temp(mmfile_t *src, char *path) |
778 | { | |
779 | int fd; | |
780 | ||
781 | strcpy(path, ".merge_file_XXXXXX"); | |
782 | fd = mkstemp(path); | |
783 | if (fd < 0) | |
784 | die("unable to create temp-file"); | |
785 | if (write_in_full(fd, src->ptr, src->size) != src->size) | |
786 | die("unable to write temp-file"); | |
787 | close(fd); | |
788 | } | |
789 | ||
153920da JH |
790 | /* |
791 | * User defined low-level merge driver support. | |
792 | */ | |
793 | static int ll_ext_merge(const struct ll_merge_driver *fn, | |
794 | const char *path, | |
f3ef6b6b JH |
795 | mmfile_t *orig, |
796 | mmfile_t *src1, const char *name1, | |
797 | mmfile_t *src2, const char *name2, | |
798 | mmbuffer_t *result) | |
799 | { | |
800 | char temp[3][50]; | |
801 | char cmdbuf[2048]; | |
802 | struct interp table[] = { | |
803 | { "%O" }, | |
804 | { "%A" }, | |
805 | { "%B" }, | |
806 | }; | |
807 | struct child_process child; | |
808 | const char *args[20]; | |
809 | int status, fd, i; | |
810 | struct stat st; | |
811 | ||
812 | result->ptr = NULL; | |
813 | result->size = 0; | |
814 | create_temp(orig, temp[0]); | |
815 | create_temp(src1, temp[1]); | |
816 | create_temp(src2, temp[2]); | |
817 | ||
818 | interp_set_entry(table, 0, temp[0]); | |
819 | interp_set_entry(table, 1, temp[1]); | |
820 | interp_set_entry(table, 2, temp[2]); | |
821 | ||
153920da JH |
822 | output(1, "merging %s using %s", path, |
823 | fn->description ? fn->description : fn->name); | |
824 | ||
825 | interpolate(cmdbuf, sizeof(cmdbuf), fn->cmdline, table, 3); | |
f3ef6b6b JH |
826 | |
827 | memset(&child, 0, sizeof(child)); | |
828 | child.argv = args; | |
829 | args[0] = "sh"; | |
830 | args[1] = "-c"; | |
831 | args[2] = cmdbuf; | |
832 | args[3] = NULL; | |
833 | ||
834 | status = run_command(&child); | |
835 | if (status < -ERR_RUN_COMMAND_FORK) | |
836 | ; /* failure in run-command */ | |
837 | else | |
838 | status = -status; | |
839 | fd = open(temp[1], O_RDONLY); | |
840 | if (fd < 0) | |
841 | goto bad; | |
842 | if (fstat(fd, &st)) | |
843 | goto close_bad; | |
844 | result->size = st.st_size; | |
845 | result->ptr = xmalloc(result->size + 1); | |
846 | if (read_in_full(fd, result->ptr, result->size) != result->size) { | |
847 | free(result->ptr); | |
848 | result->ptr = NULL; | |
849 | result->size = 0; | |
850 | } | |
851 | close_bad: | |
852 | close(fd); | |
853 | bad: | |
854 | for (i = 0; i < 3; i++) | |
855 | unlink(temp[i]); | |
856 | return status; | |
857 | } | |
858 | ||
859 | /* | |
860 | * merge.default and merge.driver configuration items | |
861 | */ | |
153920da | 862 | static struct ll_merge_driver *ll_user_merge, **ll_user_merge_tail; |
be89cb23 | 863 | static const char *default_ll_merge; |
f3ef6b6b JH |
864 | |
865 | static int read_merge_config(const char *var, const char *value) | |
866 | { | |
153920da JH |
867 | struct ll_merge_driver *fn; |
868 | const char *ep, *name; | |
869 | int namelen; | |
f3ef6b6b | 870 | |
be89cb23 | 871 | if (!strcmp(var, "merge.default")) { |
153920da JH |
872 | if (value) |
873 | default_ll_merge = strdup(value); | |
be89cb23 JH |
874 | return 0; |
875 | } | |
876 | ||
153920da JH |
877 | /* |
878 | * We are not interested in anything but "merge.<name>.variable"; | |
879 | * especially, we do not want to look at variables such as | |
880 | * "merge.summary", "merge.tool", and "merge.verbosity". | |
881 | */ | |
882 | if (prefixcmp(var, "merge.") || (ep = strrchr(var, '.')) == var + 6) | |
f3ef6b6b | 883 | return 0; |
153920da | 884 | |
f3ef6b6b | 885 | /* |
153920da JH |
886 | * Find existing one as we might be processing merge.<name>.var2 |
887 | * after seeing merge.<name>.var1. | |
f3ef6b6b | 888 | */ |
153920da JH |
889 | name = var + 6; |
890 | namelen = ep - name; | |
891 | for (fn = ll_user_merge; fn; fn = fn->next) | |
892 | if (!strncmp(fn->name, name, namelen) && !fn->name[namelen]) | |
893 | break; | |
894 | if (!fn) { | |
895 | char *namebuf; | |
896 | fn = xcalloc(1, sizeof(struct ll_merge_driver)); | |
897 | namebuf = xmalloc(namelen + 1); | |
898 | memcpy(namebuf, name, namelen); | |
899 | namebuf[namelen] = 0; | |
900 | fn->name = namebuf; | |
901 | fn->fn = ll_ext_merge; | |
902 | fn->next = *ll_user_merge_tail; | |
903 | *ll_user_merge_tail = fn; | |
904 | } | |
905 | ||
906 | ep++; | |
907 | ||
908 | if (!strcmp("name", ep)) { | |
909 | if (!value) | |
910 | return error("%s: lacks value", var); | |
911 | fn->description = strdup(value); | |
912 | return 0; | |
913 | } | |
914 | ||
915 | if (!strcmp("driver", ep)) { | |
916 | if (!value) | |
917 | return error("%s: lacks value", var); | |
918 | /* | |
919 | * merge.<name>.driver specifies the command line: | |
920 | * | |
921 | * command-line | |
922 | * | |
923 | * The command-line will be interpolated with the following | |
924 | * tokens and is given to the shell: | |
925 | * | |
926 | * %O - temporary file name for the merge base. | |
927 | * %A - temporary file name for our version. | |
928 | * %B - temporary file name for the other branches' version. | |
929 | * | |
930 | * The external merge driver should write the results in the | |
931 | * file named by %A, and signal that it has done with zero exit | |
932 | * status. | |
933 | */ | |
934 | fn->cmdline = strdup(value); | |
935 | return 0; | |
936 | } | |
937 | ||
3086486d JH |
938 | if (!strcmp("recursive", ep)) { |
939 | if (!value) | |
940 | return error("%s: lacks value", var); | |
941 | fn->recursive = strdup(value); | |
942 | return 0; | |
943 | } | |
944 | ||
f3ef6b6b JH |
945 | return 0; |
946 | } | |
947 | ||
948 | static void initialize_ll_merge(void) | |
a129d96f | 949 | { |
153920da | 950 | if (ll_user_merge_tail) |
f3ef6b6b | 951 | return; |
153920da | 952 | ll_user_merge_tail = &ll_user_merge; |
f3ef6b6b JH |
953 | git_config(read_merge_config); |
954 | } | |
955 | ||
153920da | 956 | static const struct ll_merge_driver *find_ll_merge_driver(void *merge_attr) |
f3ef6b6b | 957 | { |
153920da | 958 | struct ll_merge_driver *fn; |
a129d96f JH |
959 | const char *name; |
960 | int i; | |
961 | ||
f3ef6b6b JH |
962 | initialize_ll_merge(); |
963 | ||
964 | if (ATTR_TRUE(merge_attr)) | |
153920da | 965 | return &ll_merge_drv[LL_TEXT_MERGE]; |
a129d96f | 966 | else if (ATTR_FALSE(merge_attr)) |
153920da | 967 | return &ll_merge_drv[LL_BINARY_MERGE]; |
be89cb23 JH |
968 | else if (ATTR_UNSET(merge_attr)) { |
969 | if (!default_ll_merge) | |
153920da | 970 | return &ll_merge_drv[LL_TEXT_MERGE]; |
be89cb23 JH |
971 | else |
972 | name = default_ll_merge; | |
973 | } | |
f3ef6b6b JH |
974 | else |
975 | name = merge_attr; | |
976 | ||
153920da JH |
977 | for (fn = ll_user_merge; fn; fn = fn->next) |
978 | if (!strcmp(fn->name, name)) | |
979 | return fn; | |
a129d96f | 980 | |
153920da JH |
981 | for (i = 0; i < ARRAY_SIZE(ll_merge_drv); i++) |
982 | if (!strcmp(ll_merge_drv[i].name, name)) | |
983 | return &ll_merge_drv[i]; | |
a129d96f JH |
984 | |
985 | /* default to the 3-way */ | |
153920da | 986 | return &ll_merge_drv[LL_TEXT_MERGE]; |
a129d96f JH |
987 | } |
988 | ||
989 | static void *git_path_check_merge(const char *path) | |
990 | { | |
991 | static struct git_attr_check attr_merge_check; | |
992 | ||
993 | if (!attr_merge_check.attr) | |
994 | attr_merge_check.attr = git_attr("merge", 5); | |
995 | ||
996 | if (git_checkattr(path, 1, &attr_merge_check)) | |
997 | return ATTR__UNSET; | |
998 | return attr_merge_check.value; | |
999 | } | |
1000 | ||
3e5261a2 JH |
1001 | static int ll_merge(mmbuffer_t *result_buf, |
1002 | struct diff_filespec *o, | |
1003 | struct diff_filespec *a, | |
1004 | struct diff_filespec *b, | |
1005 | const char *branch1, | |
1006 | const char *branch2) | |
1007 | { | |
1008 | mmfile_t orig, src1, src2; | |
3e5261a2 JH |
1009 | char *name1, *name2; |
1010 | int merge_status; | |
a129d96f | 1011 | void *merge_attr; |
153920da | 1012 | const struct ll_merge_driver *driver; |
3e5261a2 JH |
1013 | |
1014 | name1 = xstrdup(mkpath("%s:%s", branch1, a->path)); | |
1015 | name2 = xstrdup(mkpath("%s:%s", branch2, b->path)); | |
1016 | ||
1017 | fill_mm(o->sha1, &orig); | |
1018 | fill_mm(a->sha1, &src1); | |
1019 | fill_mm(b->sha1, &src2); | |
1020 | ||
a129d96f | 1021 | merge_attr = git_path_check_merge(a->path); |
153920da | 1022 | driver = find_ll_merge_driver(merge_attr); |
a129d96f | 1023 | |
3086486d JH |
1024 | if (index_only && driver->recursive) { |
1025 | merge_attr = git_attr(driver->recursive, strlen(driver->recursive)); | |
1026 | driver = find_ll_merge_driver(merge_attr); | |
1027 | } | |
153920da JH |
1028 | merge_status = driver->fn(driver, a->path, |
1029 | &orig, &src1, name1, &src2, name2, | |
1030 | result_buf); | |
a129d96f | 1031 | |
3e5261a2 JH |
1032 | free(name1); |
1033 | free(name2); | |
1034 | free(orig.ptr); | |
1035 | free(src1.ptr); | |
1036 | free(src2.ptr); | |
1037 | return merge_status; | |
1038 | } | |
1039 | ||
3af244ca JS |
1040 | static struct merge_file_info merge_file(struct diff_filespec *o, |
1041 | struct diff_filespec *a, struct diff_filespec *b, | |
c1d20846 | 1042 | const char *branch1, const char *branch2) |
6d297f81 JS |
1043 | { |
1044 | struct merge_file_info result; | |
1045 | result.merge = 0; | |
1046 | result.clean = 1; | |
1047 | ||
3af244ca | 1048 | if ((S_IFMT & a->mode) != (S_IFMT & b->mode)) { |
6d297f81 | 1049 | result.clean = 0; |
3af244ca JS |
1050 | if (S_ISREG(a->mode)) { |
1051 | result.mode = a->mode; | |
8da71493 | 1052 | hashcpy(result.sha, a->sha1); |
6d297f81 | 1053 | } else { |
3af244ca | 1054 | result.mode = b->mode; |
8da71493 | 1055 | hashcpy(result.sha, b->sha1); |
6d297f81 JS |
1056 | } |
1057 | } else { | |
3af244ca | 1058 | if (!sha_eq(a->sha1, o->sha1) && !sha_eq(b->sha1, o->sha1)) |
6d297f81 JS |
1059 | result.merge = 1; |
1060 | ||
3af244ca | 1061 | result.mode = a->mode == o->mode ? b->mode: a->mode; |
6d297f81 | 1062 | |
3af244ca | 1063 | if (sha_eq(a->sha1, o->sha1)) |
8da71493 | 1064 | hashcpy(result.sha, b->sha1); |
3af244ca | 1065 | else if (sha_eq(b->sha1, o->sha1)) |
8da71493 | 1066 | hashcpy(result.sha, a->sha1); |
3af244ca | 1067 | else if (S_ISREG(a->mode)) { |
c2b4faea | 1068 | mmbuffer_t result_buf; |
c2b4faea JH |
1069 | int merge_status; |
1070 | ||
3e5261a2 JH |
1071 | merge_status = ll_merge(&result_buf, o, a, b, |
1072 | branch1, branch2); | |
c2b4faea JH |
1073 | |
1074 | if ((merge_status < 0) || !result_buf.ptr) | |
1075 | die("Failed to execute internal merge"); | |
1076 | ||
1077 | if (write_sha1_file(result_buf.ptr, result_buf.size, | |
1078 | blob_type, result.sha)) | |
1079 | die("Unable to add %s to database", | |
1080 | a->path); | |
1081 | ||
1082 | free(result_buf.ptr); | |
1083 | result.clean = (merge_status == 0); | |
6d297f81 | 1084 | } else { |
3af244ca | 1085 | if (!(S_ISLNK(a->mode) || S_ISLNK(b->mode))) |
6d297f81 JS |
1086 | die("cannot merge modes?"); |
1087 | ||
8da71493 | 1088 | hashcpy(result.sha, a->sha1); |
6d297f81 | 1089 | |
3af244ca | 1090 | if (!sha_eq(a->sha1, b->sha1)) |
6d297f81 JS |
1091 | result.clean = 0; |
1092 | } | |
1093 | } | |
1094 | ||
1095 | return result; | |
1096 | } | |
1097 | ||
1098 | static void conflict_rename_rename(struct rename *ren1, | |
1099 | const char *branch1, | |
1100 | struct rename *ren2, | |
1101 | const char *branch2) | |
1102 | { | |
1103 | char *del[2]; | |
1104 | int delp = 0; | |
1105 | const char *ren1_dst = ren1->pair->two->path; | |
1106 | const char *ren2_dst = ren2->pair->two->path; | |
5a753613 JS |
1107 | const char *dst_name1 = ren1_dst; |
1108 | const char *dst_name2 = ren2_dst; | |
1109 | if (path_list_has_path(¤t_directory_set, ren1_dst)) { | |
1110 | dst_name1 = del[delp++] = unique_path(ren1_dst, branch1); | |
89f40be2 | 1111 | output(1, "%s is a directory in %s added as %s instead", |
5a753613 | 1112 | ren1_dst, branch2, dst_name1); |
65ac6e9c | 1113 | remove_file(0, ren1_dst, 0); |
6d297f81 | 1114 | } |
5a753613 JS |
1115 | if (path_list_has_path(¤t_directory_set, ren2_dst)) { |
1116 | dst_name2 = del[delp++] = unique_path(ren2_dst, branch2); | |
89f40be2 | 1117 | output(1, "%s is a directory in %s added as %s instead", |
5a753613 | 1118 | ren2_dst, branch1, dst_name2); |
65ac6e9c | 1119 | remove_file(0, ren2_dst, 0); |
6d297f81 | 1120 | } |
a97e4075 AR |
1121 | if (index_only) { |
1122 | remove_file_from_cache(dst_name1); | |
1123 | remove_file_from_cache(dst_name2); | |
1124 | /* | |
1125 | * Uncomment to leave the conflicting names in the resulting tree | |
1126 | * | |
1127 | * update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, dst_name1); | |
1128 | * update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, dst_name2); | |
1129 | */ | |
1130 | } else { | |
1131 | update_stages(dst_name1, NULL, ren1->pair->two, NULL, 1); | |
1132 | update_stages(dst_name2, NULL, NULL, ren2->pair->two, 1); | |
1133 | } | |
3af244ca | 1134 | while (delp--) |
6d297f81 JS |
1135 | free(del[delp]); |
1136 | } | |
1137 | ||
1138 | static void conflict_rename_dir(struct rename *ren1, | |
1139 | const char *branch1) | |
1140 | { | |
5a753613 | 1141 | char *new_path = unique_path(ren1->pair->two->path, branch1); |
89f40be2 | 1142 | output(1, "Renamed %s to %s instead", ren1->pair->one->path, new_path); |
65ac6e9c | 1143 | remove_file(0, ren1->pair->two->path, 0); |
5a753613 JS |
1144 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path); |
1145 | free(new_path); | |
6d297f81 JS |
1146 | } |
1147 | ||
1148 | static void conflict_rename_rename_2(struct rename *ren1, | |
1149 | const char *branch1, | |
1150 | struct rename *ren2, | |
1151 | const char *branch2) | |
1152 | { | |
5a753613 JS |
1153 | char *new_path1 = unique_path(ren1->pair->two->path, branch1); |
1154 | char *new_path2 = unique_path(ren2->pair->two->path, branch2); | |
89f40be2 | 1155 | output(1, "Renamed %s to %s and %s to %s instead", |
5a753613 JS |
1156 | ren1->pair->one->path, new_path1, |
1157 | ren2->pair->one->path, new_path2); | |
65ac6e9c | 1158 | remove_file(0, ren1->pair->two->path, 0); |
5a753613 JS |
1159 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, new_path1); |
1160 | update_file(0, ren2->pair->two->sha1, ren2->pair->two->mode, new_path2); | |
1161 | free(new_path2); | |
1162 | free(new_path1); | |
6d297f81 JS |
1163 | } |
1164 | ||
5a753613 JS |
1165 | static int process_renames(struct path_list *a_renames, |
1166 | struct path_list *b_renames, | |
1167 | const char *a_branch, | |
1168 | const char *b_branch) | |
6d297f81 | 1169 | { |
5a753613 JS |
1170 | int clean_merge = 1, i, j; |
1171 | struct path_list a_by_dst = {NULL, 0, 0, 0}, b_by_dst = {NULL, 0, 0, 0}; | |
6d297f81 JS |
1172 | const struct rename *sre; |
1173 | ||
5a753613 JS |
1174 | for (i = 0; i < a_renames->nr; i++) { |
1175 | sre = a_renames->items[i].util; | |
1176 | path_list_insert(sre->pair->two->path, &a_by_dst)->util | |
6d297f81 JS |
1177 | = sre->dst_entry; |
1178 | } | |
5a753613 JS |
1179 | for (i = 0; i < b_renames->nr; i++) { |
1180 | sre = b_renames->items[i].util; | |
1181 | path_list_insert(sre->pair->two->path, &b_by_dst)->util | |
6d297f81 JS |
1182 | = sre->dst_entry; |
1183 | } | |
1184 | ||
5a753613 | 1185 | for (i = 0, j = 0; i < a_renames->nr || j < b_renames->nr;) { |
3af244ca JS |
1186 | int compare; |
1187 | char *src; | |
6d297f81 | 1188 | struct path_list *renames1, *renames2, *renames2Dst; |
3af244ca | 1189 | struct rename *ren1 = NULL, *ren2 = NULL; |
5a753613 | 1190 | const char *branch1, *branch2; |
3af244ca JS |
1191 | const char *ren1_src, *ren1_dst; |
1192 | ||
5a753613 | 1193 | if (i >= a_renames->nr) { |
3af244ca | 1194 | compare = 1; |
5a753613 JS |
1195 | ren2 = b_renames->items[j++].util; |
1196 | } else if (j >= b_renames->nr) { | |
3af244ca | 1197 | compare = -1; |
5a753613 | 1198 | ren1 = a_renames->items[i++].util; |
3af244ca | 1199 | } else { |
5a753613 JS |
1200 | compare = strcmp(a_renames->items[i].path, |
1201 | b_renames->items[j].path); | |
3d234d0a JS |
1202 | if (compare <= 0) |
1203 | ren1 = a_renames->items[i++].util; | |
1204 | if (compare >= 0) | |
1205 | ren2 = b_renames->items[j++].util; | |
3af244ca JS |
1206 | } |
1207 | ||
6d297f81 | 1208 | /* TODO: refactor, so that 1/2 are not needed */ |
3af244ca | 1209 | if (ren1) { |
5a753613 JS |
1210 | renames1 = a_renames; |
1211 | renames2 = b_renames; | |
1212 | renames2Dst = &b_by_dst; | |
1213 | branch1 = a_branch; | |
1214 | branch2 = b_branch; | |
6d297f81 | 1215 | } else { |
3af244ca | 1216 | struct rename *tmp; |
5a753613 JS |
1217 | renames1 = b_renames; |
1218 | renames2 = a_renames; | |
1219 | renames2Dst = &a_by_dst; | |
1220 | branch1 = b_branch; | |
1221 | branch2 = a_branch; | |
3af244ca | 1222 | tmp = ren2; |
6d297f81 JS |
1223 | ren2 = ren1; |
1224 | ren1 = tmp; | |
1225 | } | |
3af244ca | 1226 | src = ren1->pair->one->path; |
6d297f81 JS |
1227 | |
1228 | ren1->dst_entry->processed = 1; | |
1229 | ren1->src_entry->processed = 1; | |
1230 | ||
3af244ca | 1231 | if (ren1->processed) |
6d297f81 JS |
1232 | continue; |
1233 | ren1->processed = 1; | |
1234 | ||
3af244ca JS |
1235 | ren1_src = ren1->pair->one->path; |
1236 | ren1_dst = ren1->pair->two->path; | |
6d297f81 | 1237 | |
3af244ca | 1238 | if (ren2) { |
6d297f81 JS |
1239 | const char *ren2_src = ren2->pair->one->path; |
1240 | const char *ren2_dst = ren2->pair->two->path; | |
1241 | /* Renamed in 1 and renamed in 2 */ | |
1242 | if (strcmp(ren1_src, ren2_src) != 0) | |
1243 | die("ren1.src != ren2.src"); | |
1244 | ren2->dst_entry->processed = 1; | |
1245 | ren2->processed = 1; | |
1246 | if (strcmp(ren1_dst, ren2_dst) != 0) { | |
5a753613 | 1247 | clean_merge = 0; |
8c3275ab | 1248 | output(1, "CONFLICT (rename/rename): " |
a97e4075 AR |
1249 | "Rename \"%s\"->\"%s\" in branch \"%s\" " |
1250 | "rename \"%s\"->\"%s\" in \"%s\"%s", | |
5a753613 | 1251 | src, ren1_dst, branch1, |
a97e4075 AR |
1252 | src, ren2_dst, branch2, |
1253 | index_only ? " (left unresolved)": ""); | |
1254 | if (index_only) { | |
1255 | remove_file_from_cache(src); | |
1256 | update_file(0, ren1->pair->one->sha1, | |
1257 | ren1->pair->one->mode, src); | |
1258 | } | |
5a753613 | 1259 | conflict_rename_rename(ren1, branch1, ren2, branch2); |
6d297f81 | 1260 | } else { |
6d297f81 | 1261 | struct merge_file_info mfi; |
65ac6e9c | 1262 | remove_file(1, ren1_src, 1); |
3af244ca JS |
1263 | mfi = merge_file(ren1->pair->one, |
1264 | ren1->pair->two, | |
1265 | ren2->pair->two, | |
5a753613 JS |
1266 | branch1, |
1267 | branch2); | |
3af244ca | 1268 | if (mfi.merge || !mfi.clean) |
89f40be2 | 1269 | output(1, "Renamed %s->%s", src, ren1_dst); |
6d297f81 | 1270 | |
3af244ca | 1271 | if (mfi.merge) |
89f40be2 | 1272 | output(2, "Auto-merged %s", ren1_dst); |
6d297f81 | 1273 | |
3af244ca | 1274 | if (!mfi.clean) { |
8c3275ab | 1275 | output(1, "CONFLICT (content): merge conflict in %s", |
6d297f81 | 1276 | ren1_dst); |
5a753613 | 1277 | clean_merge = 0; |
6d297f81 | 1278 | |
3af244ca | 1279 | if (!index_only) |
6d297f81 | 1280 | update_stages(ren1_dst, |
3af244ca JS |
1281 | ren1->pair->one, |
1282 | ren1->pair->two, | |
1283 | ren2->pair->two, | |
6d297f81 JS |
1284 | 1 /* clear */); |
1285 | } | |
1286 | update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst); | |
1287 | } | |
1288 | } else { | |
1289 | /* Renamed in 1, maybe changed in 2 */ | |
3af244ca JS |
1290 | struct path_list_item *item; |
1291 | /* we only use sha1 and mode of these */ | |
1292 | struct diff_filespec src_other, dst_other; | |
5a753613 | 1293 | int try_merge, stage = a_renames == renames1 ? 3: 2; |
6d297f81 | 1294 | |
183d7972 | 1295 | remove_file(1, ren1_src, index_only || stage == 3); |
6d297f81 | 1296 | |
87cb004e | 1297 | hashcpy(src_other.sha1, ren1->src_entry->stages[stage].sha); |
3af244ca | 1298 | src_other.mode = ren1->src_entry->stages[stage].mode; |
87cb004e | 1299 | hashcpy(dst_other.sha1, ren1->dst_entry->stages[stage].sha); |
3af244ca | 1300 | dst_other.mode = ren1->dst_entry->stages[stage].mode; |
6d297f81 | 1301 | |
5a753613 | 1302 | try_merge = 0; |
6d297f81 | 1303 | |
5a753613 JS |
1304 | if (path_list_has_path(¤t_directory_set, ren1_dst)) { |
1305 | clean_merge = 0; | |
89f40be2 | 1306 | output(1, "CONFLICT (rename/directory): Renamed %s->%s in %s " |
6d297f81 | 1307 | " directory %s added in %s", |
5a753613 JS |
1308 | ren1_src, ren1_dst, branch1, |
1309 | ren1_dst, branch2); | |
1310 | conflict_rename_dir(ren1, branch1); | |
3af244ca | 1311 | } else if (sha_eq(src_other.sha1, null_sha1)) { |
5a753613 | 1312 | clean_merge = 0; |
89f40be2 | 1313 | output(1, "CONFLICT (rename/delete): Renamed %s->%s in %s " |
6d297f81 | 1314 | "and deleted in %s", |
5a753613 JS |
1315 | ren1_src, ren1_dst, branch1, |
1316 | branch2); | |
6d297f81 | 1317 | update_file(0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst); |
3af244ca | 1318 | } else if (!sha_eq(dst_other.sha1, null_sha1)) { |
5a753613 JS |
1319 | const char *new_path; |
1320 | clean_merge = 0; | |
1321 | try_merge = 1; | |
89f40be2 | 1322 | output(1, "CONFLICT (rename/add): Renamed %s->%s in %s. " |
6d297f81 | 1323 | "%s added in %s", |
5a753613 JS |
1324 | ren1_src, ren1_dst, branch1, |
1325 | ren1_dst, branch2); | |
1326 | new_path = unique_path(ren1_dst, branch2); | |
89f40be2 | 1327 | output(1, "Added as %s instead", new_path); |
5a753613 | 1328 | update_file(0, dst_other.sha1, dst_other.mode, new_path); |
3af244ca JS |
1329 | } else if ((item = path_list_lookup(ren1_dst, renames2Dst))) { |
1330 | ren2 = item->util; | |
5a753613 | 1331 | clean_merge = 0; |
6d297f81 | 1332 | ren2->processed = 1; |
89f40be2 SP |
1333 | output(1, "CONFLICT (rename/rename): Renamed %s->%s in %s. " |
1334 | "Renamed %s->%s in %s", | |
5a753613 JS |
1335 | ren1_src, ren1_dst, branch1, |
1336 | ren2->pair->one->path, ren2->pair->two->path, branch2); | |
1337 | conflict_rename_rename_2(ren1, branch1, ren2, branch2); | |
6d297f81 | 1338 | } else |
5a753613 | 1339 | try_merge = 1; |
6d297f81 | 1340 | |
5a753613 | 1341 | if (try_merge) { |
3af244ca | 1342 | struct diff_filespec *o, *a, *b; |
6d297f81 | 1343 | struct merge_file_info mfi; |
3af244ca JS |
1344 | src_other.path = (char *)ren1_src; |
1345 | ||
1346 | o = ren1->pair->one; | |
5a753613 | 1347 | if (a_renames == renames1) { |
3af244ca JS |
1348 | a = ren1->pair->two; |
1349 | b = &src_other; | |
1350 | } else { | |
1351 | b = ren1->pair->two; | |
1352 | a = &src_other; | |
1353 | } | |
1354 | mfi = merge_file(o, a, b, | |
5a753613 | 1355 | a_branch, b_branch); |
6d297f81 | 1356 | |
3af244ca | 1357 | if (mfi.merge || !mfi.clean) |
89f40be2 | 1358 | output(1, "Renamed %s => %s", ren1_src, ren1_dst); |
3af244ca | 1359 | if (mfi.merge) |
89f40be2 | 1360 | output(2, "Auto-merged %s", ren1_dst); |
3af244ca | 1361 | if (!mfi.clean) { |
8c3275ab | 1362 | output(1, "CONFLICT (rename/modify): Merge conflict in %s", |
6d297f81 | 1363 | ren1_dst); |
5a753613 | 1364 | clean_merge = 0; |
6d297f81 | 1365 | |
3af244ca | 1366 | if (!index_only) |
6d297f81 | 1367 | update_stages(ren1_dst, |
3af244ca | 1368 | o, a, b, 1); |
6d297f81 JS |
1369 | } |
1370 | update_file(mfi.clean, mfi.sha, mfi.mode, ren1_dst); | |
1371 | } | |
1372 | } | |
1373 | } | |
5a753613 JS |
1374 | path_list_clear(&a_by_dst, 0); |
1375 | path_list_clear(&b_by_dst, 0); | |
6d297f81 | 1376 | |
5a753613 | 1377 | return clean_merge; |
6d297f81 JS |
1378 | } |
1379 | ||
1380 | static unsigned char *has_sha(const unsigned char *sha) | |
1381 | { | |
87cb004e | 1382 | return is_null_sha1(sha) ? NULL: (unsigned char *)sha; |
6d297f81 JS |
1383 | } |
1384 | ||
1385 | /* Per entry merge function */ | |
1386 | static int process_entry(const char *path, struct stage_data *entry, | |
c1d20846 JS |
1387 | const char *branch1, |
1388 | const char *branch2) | |
6d297f81 JS |
1389 | { |
1390 | /* | |
1391 | printf("processing entry, clean cache: %s\n", index_only ? "yes": "no"); | |
1392 | print_index_entry("\tpath: ", entry); | |
1393 | */ | |
5a753613 JS |
1394 | int clean_merge = 1; |
1395 | unsigned char *o_sha = has_sha(entry->stages[1].sha); | |
1396 | unsigned char *a_sha = has_sha(entry->stages[2].sha); | |
1397 | unsigned char *b_sha = has_sha(entry->stages[3].sha); | |
1398 | unsigned o_mode = entry->stages[1].mode; | |
1399 | unsigned a_mode = entry->stages[2].mode; | |
1400 | unsigned b_mode = entry->stages[3].mode; | |
1401 | ||
1402 | if (o_sha && (!a_sha || !b_sha)) { | |
6d297f81 | 1403 | /* Case A: Deleted in one */ |
5a753613 JS |
1404 | if ((!a_sha && !b_sha) || |
1405 | (sha_eq(a_sha, o_sha) && !b_sha) || | |
1406 | (!a_sha && sha_eq(b_sha, o_sha))) { | |
6d297f81 JS |
1407 | /* Deleted in both or deleted in one and |
1408 | * unchanged in the other */ | |
5a753613 | 1409 | if (a_sha) |
89f40be2 | 1410 | output(2, "Removed %s", path); |
65ac6e9c JH |
1411 | /* do not touch working file if it did not exist */ |
1412 | remove_file(1, path, !a_sha); | |
6d297f81 JS |
1413 | } else { |
1414 | /* Deleted in one and changed in the other */ | |
5a753613 JS |
1415 | clean_merge = 0; |
1416 | if (!a_sha) { | |
8c3275ab | 1417 | output(1, "CONFLICT (delete/modify): %s deleted in %s " |
6d297f81 | 1418 | "and modified in %s. Version %s of %s left in tree.", |
c1d20846 JS |
1419 | path, branch1, |
1420 | branch2, branch2, path); | |
5a753613 | 1421 | update_file(0, b_sha, b_mode, path); |
6d297f81 | 1422 | } else { |
8c3275ab | 1423 | output(1, "CONFLICT (delete/modify): %s deleted in %s " |
6d297f81 | 1424 | "and modified in %s. Version %s of %s left in tree.", |
c1d20846 JS |
1425 | path, branch2, |
1426 | branch1, branch1, path); | |
5a753613 | 1427 | update_file(0, a_sha, a_mode, path); |
6d297f81 JS |
1428 | } |
1429 | } | |
1430 | ||
5a753613 JS |
1431 | } else if ((!o_sha && a_sha && !b_sha) || |
1432 | (!o_sha && !a_sha && b_sha)) { | |
6d297f81 | 1433 | /* Case B: Added in one. */ |
5a753613 JS |
1434 | const char *add_branch; |
1435 | const char *other_branch; | |
6d297f81 JS |
1436 | unsigned mode; |
1437 | const unsigned char *sha; | |
1438 | const char *conf; | |
1439 | ||
5a753613 | 1440 | if (a_sha) { |
c1d20846 JS |
1441 | add_branch = branch1; |
1442 | other_branch = branch2; | |
5a753613 JS |
1443 | mode = a_mode; |
1444 | sha = a_sha; | |
6d297f81 JS |
1445 | conf = "file/directory"; |
1446 | } else { | |
c1d20846 JS |
1447 | add_branch = branch2; |
1448 | other_branch = branch1; | |
5a753613 JS |
1449 | mode = b_mode; |
1450 | sha = b_sha; | |
6d297f81 JS |
1451 | conf = "directory/file"; |
1452 | } | |
5a753613 JS |
1453 | if (path_list_has_path(¤t_directory_set, path)) { |
1454 | const char *new_path = unique_path(path, add_branch); | |
1455 | clean_merge = 0; | |
8c3275ab | 1456 | output(1, "CONFLICT (%s): There is a directory with name %s in %s. " |
89f40be2 | 1457 | "Added %s as %s", |
5a753613 | 1458 | conf, path, other_branch, path, new_path); |
65ac6e9c | 1459 | remove_file(0, path, 0); |
5a753613 | 1460 | update_file(0, sha, mode, new_path); |
6d297f81 | 1461 | } else { |
89f40be2 | 1462 | output(2, "Added %s", path); |
6d297f81 JS |
1463 | update_file(1, sha, mode, path); |
1464 | } | |
f953831e JS |
1465 | } else if (a_sha && b_sha) { |
1466 | /* Case C: Added in both (check for same permissions) and */ | |
6d297f81 | 1467 | /* case D: Modified in both, but differently. */ |
f953831e | 1468 | const char *reason = "content"; |
6d297f81 | 1469 | struct merge_file_info mfi; |
3af244ca JS |
1470 | struct diff_filespec o, a, b; |
1471 | ||
f953831e JS |
1472 | if (!o_sha) { |
1473 | reason = "add/add"; | |
1474 | o_sha = (unsigned char *)null_sha1; | |
1475 | } | |
89f40be2 | 1476 | output(2, "Auto-merged %s", path); |
3af244ca | 1477 | o.path = a.path = b.path = (char *)path; |
8da71493 | 1478 | hashcpy(o.sha1, o_sha); |
5a753613 | 1479 | o.mode = o_mode; |
8da71493 | 1480 | hashcpy(a.sha1, a_sha); |
5a753613 | 1481 | a.mode = a_mode; |
8da71493 | 1482 | hashcpy(b.sha1, b_sha); |
5a753613 | 1483 | b.mode = b_mode; |
3af244ca JS |
1484 | |
1485 | mfi = merge_file(&o, &a, &b, | |
c1d20846 | 1486 | branch1, branch2); |
6d297f81 | 1487 | |
3af244ca | 1488 | if (mfi.clean) |
6d297f81 JS |
1489 | update_file(1, mfi.sha, mfi.mode, path); |
1490 | else { | |
5a753613 | 1491 | clean_merge = 0; |
8c3275ab | 1492 | output(1, "CONFLICT (%s): Merge conflict in %s", |
f953831e | 1493 | reason, path); |
6d297f81 | 1494 | |
3af244ca | 1495 | if (index_only) |
6d297f81 JS |
1496 | update_file(0, mfi.sha, mfi.mode, path); |
1497 | else | |
1498 | update_file_flags(mfi.sha, mfi.mode, path, | |
5a753613 | 1499 | 0 /* update_cache */, 1 /* update_working_directory */); |
6d297f81 JS |
1500 | } |
1501 | } else | |
1502 | die("Fatal merge failure, shouldn't happen."); | |
1503 | ||
5a753613 | 1504 | return clean_merge; |
6d297f81 JS |
1505 | } |
1506 | ||
3af244ca JS |
1507 | static int merge_trees(struct tree *head, |
1508 | struct tree *merge, | |
1509 | struct tree *common, | |
c1d20846 JS |
1510 | const char *branch1, |
1511 | const char *branch2, | |
3af244ca | 1512 | struct tree **result) |
6d297f81 | 1513 | { |
3af244ca | 1514 | int code, clean; |
68faf689 JH |
1515 | |
1516 | if (subtree_merge) { | |
1517 | merge = shift_tree_object(head, merge); | |
1518 | common = shift_tree_object(head, common); | |
1519 | } | |
1520 | ||
3af244ca | 1521 | if (sha_eq(common->object.sha1, merge->object.sha1)) { |
8c3275ab | 1522 | output(0, "Already uptodate!"); |
3af244ca JS |
1523 | *result = head; |
1524 | return 1; | |
6d297f81 JS |
1525 | } |
1526 | ||
7a85b848 | 1527 | code = git_merge_trees(index_only, common, head, merge); |
6d297f81 | 1528 | |
3af244ca | 1529 | if (code != 0) |
6d297f81 JS |
1530 | die("merging of trees %s and %s failed", |
1531 | sha1_to_hex(head->object.sha1), | |
1532 | sha1_to_hex(merge->object.sha1)); | |
1533 | ||
8b944b56 | 1534 | if (unmerged_index()) { |
3af244ca JS |
1535 | struct path_list *entries, *re_head, *re_merge; |
1536 | int i; | |
5a753613 JS |
1537 | path_list_clear(¤t_file_set, 1); |
1538 | path_list_clear(¤t_directory_set, 1); | |
3af244ca JS |
1539 | get_files_dirs(head); |
1540 | get_files_dirs(merge); | |
6d297f81 | 1541 | |
3af244ca | 1542 | entries = get_unmerged(); |
6d297f81 JS |
1543 | re_head = get_renames(head, common, head, merge, entries); |
1544 | re_merge = get_renames(merge, common, head, merge, entries); | |
3af244ca | 1545 | clean = process_renames(re_head, re_merge, |
c1d20846 | 1546 | branch1, branch2); |
3f6ee2d1 SP |
1547 | total_cnt += entries->nr; |
1548 | for (i = 0; i < entries->nr; i++, merged_cnt++) { | |
6d297f81 JS |
1549 | const char *path = entries->items[i].path; |
1550 | struct stage_data *e = entries->items[i].util; | |
3f6ee2d1 SP |
1551 | if (!e->processed |
1552 | && !process_entry(path, e, branch1, branch2)) | |
3af244ca | 1553 | clean = 0; |
3f6ee2d1 SP |
1554 | if (do_progress) |
1555 | display_progress(); | |
6d297f81 JS |
1556 | } |
1557 | ||
3af244ca JS |
1558 | path_list_clear(re_merge, 0); |
1559 | path_list_clear(re_head, 0); | |
1560 | path_list_clear(entries, 1); | |
6d297f81 | 1561 | |
6d297f81 | 1562 | } |
1cf716a2 JH |
1563 | else |
1564 | clean = 1; | |
1565 | ||
8b944b56 JH |
1566 | if (index_only) |
1567 | *result = git_write_tree(); | |
6d297f81 | 1568 | |
3af244ca | 1569 | return clean; |
6d297f81 JS |
1570 | } |
1571 | ||
8918b0c9 JS |
1572 | static struct commit_list *reverse_commit_list(struct commit_list *list) |
1573 | { | |
1574 | struct commit_list *next = NULL, *current, *backup; | |
1575 | for (current = list; current; current = backup) { | |
1576 | backup = current->next; | |
1577 | current->next = next; | |
1578 | next = current; | |
1579 | } | |
1580 | return next; | |
1581 | } | |
1582 | ||
6d297f81 JS |
1583 | /* |
1584 | * Merge the commits h1 and h2, return the resulting virtual | |
3dff5379 | 1585 | * commit object and a flag indicating the cleanness of the merge. |
6d297f81 | 1586 | */ |
65ac6e9c JH |
1587 | static int merge(struct commit *h1, |
1588 | struct commit *h2, | |
1589 | const char *branch1, | |
1590 | const char *branch2, | |
8b944b56 | 1591 | struct commit_list *ca, |
65ac6e9c | 1592 | struct commit **result) |
6d297f81 | 1593 | { |
8b944b56 | 1594 | struct commit_list *iter; |
5a753613 | 1595 | struct commit *merged_common_ancestors; |
3af244ca JS |
1596 | struct tree *mrtree; |
1597 | int clean; | |
6d297f81 | 1598 | |
8c3275ab SP |
1599 | if (show(4)) { |
1600 | output(4, "Merging:"); | |
1601 | output_commit_title(h1); | |
1602 | output_commit_title(h2); | |
1603 | } | |
6d297f81 | 1604 | |
8b944b56 JH |
1605 | if (!ca) { |
1606 | ca = get_merge_bases(h1, h2, 1); | |
1607 | ca = reverse_commit_list(ca); | |
1608 | } | |
6d297f81 | 1609 | |
8c3275ab SP |
1610 | if (show(5)) { |
1611 | output(5, "found %u common ancestor(s):", commit_list_count(ca)); | |
1612 | for (iter = ca; iter; iter = iter->next) | |
1613 | output_commit_title(iter->item); | |
1614 | } | |
6d297f81 | 1615 | |
5a753613 | 1616 | merged_common_ancestors = pop_commit(&ca); |
934d9a24 JS |
1617 | if (merged_common_ancestors == NULL) { |
1618 | /* if there is no common ancestor, make an empty tree */ | |
1619 | struct tree *tree = xcalloc(1, sizeof(struct tree)); | |
934d9a24 JS |
1620 | |
1621 | tree->object.parsed = 1; | |
1622 | tree->object.type = OBJ_TREE; | |
21666f1a | 1623 | pretend_sha1_file(NULL, 0, OBJ_TREE, tree->object.sha1); |
934d9a24 JS |
1624 | merged_common_ancestors = make_virtual_commit(tree, "ancestor"); |
1625 | } | |
6d297f81 | 1626 | |
6d297f81 | 1627 | for (iter = ca; iter; iter = iter->next) { |
63889639 | 1628 | call_depth++; |
3af244ca JS |
1629 | /* |
1630 | * When the merge fails, the result contains files | |
1631 | * with conflict markers. The cleanness flag is | |
3dff5379 PR |
1632 | * ignored, it was never actually used, as result of |
1633 | * merge_trees has always overwritten it: the committed | |
3af244ca JS |
1634 | * "conflicts" were already resolved. |
1635 | */ | |
8b944b56 | 1636 | discard_cache(); |
5a753613 | 1637 | merge(merged_common_ancestors, iter->item, |
3af244ca JS |
1638 | "Temporary merge branch 1", |
1639 | "Temporary merge branch 2", | |
3af244ca | 1640 | NULL, |
5a753613 | 1641 | &merged_common_ancestors); |
63889639 | 1642 | call_depth--; |
6d297f81 | 1643 | |
5a753613 | 1644 | if (!merged_common_ancestors) |
6d297f81 JS |
1645 | die("merge returned no commit"); |
1646 | } | |
1647 | ||
8b944b56 | 1648 | discard_cache(); |
63889639 | 1649 | if (!call_depth) { |
8b944b56 | 1650 | read_cache(); |
6d297f81 | 1651 | index_only = 0; |
8b944b56 | 1652 | } else |
6d297f81 | 1653 | index_only = 1; |
6d297f81 | 1654 | |
5a753613 | 1655 | clean = merge_trees(h1->tree, h2->tree, merged_common_ancestors->tree, |
c1d20846 | 1656 | branch1, branch2, &mrtree); |
6d297f81 | 1657 | |
8b944b56 | 1658 | if (index_only) { |
3af244ca JS |
1659 | *result = make_virtual_commit(mrtree, "merged tree"); |
1660 | commit_list_insert(h1, &(*result)->parents); | |
1661 | commit_list_insert(h2, &(*result)->parents->next); | |
8b944b56 | 1662 | } |
3f6ee2d1 SP |
1663 | if (!call_depth && do_progress) { |
1664 | /* Make sure we end at 100% */ | |
1665 | if (!total_cnt) | |
1666 | total_cnt = 1; | |
1667 | merged_cnt = total_cnt; | |
1668 | progress_update = 1; | |
1669 | display_progress(); | |
1670 | fputc('\n', stderr); | |
1671 | } | |
66a155bc | 1672 | flush_output(); |
3af244ca | 1673 | return clean; |
6d297f81 JS |
1674 | } |
1675 | ||
7ba3c078 SP |
1676 | static const char *better_branch_name(const char *branch) |
1677 | { | |
1678 | static char githead_env[8 + 40 + 1]; | |
1679 | char *name; | |
1680 | ||
1681 | if (strlen(branch) != 40) | |
1682 | return branch; | |
1683 | sprintf(githead_env, "GITHEAD_%s", branch); | |
1684 | name = getenv(githead_env); | |
1685 | return name ? name : branch; | |
1686 | } | |
1687 | ||
6d297f81 JS |
1688 | static struct commit *get_ref(const char *ref) |
1689 | { | |
1690 | unsigned char sha1[20]; | |
1691 | struct object *object; | |
1692 | ||
1693 | if (get_sha1(ref, sha1)) | |
1694 | die("Could not resolve ref '%s'", ref); | |
1695 | object = deref_tag(parse_object(sha1), ref, strlen(ref)); | |
a970e84e SP |
1696 | if (object->type == OBJ_TREE) |
1697 | return make_virtual_commit((struct tree*)object, | |
1698 | better_branch_name(ref)); | |
bf6d324e | 1699 | if (object->type != OBJ_COMMIT) |
6d297f81 JS |
1700 | return NULL; |
1701 | if (parse_commit((struct commit *)object)) | |
1702 | die("Could not parse commit '%s'", sha1_to_hex(object->sha1)); | |
1703 | return (struct commit *)object; | |
1704 | } | |
1705 | ||
8c3275ab SP |
1706 | static int merge_config(const char *var, const char *value) |
1707 | { | |
1708 | if (!strcasecmp(var, "merge.verbosity")) { | |
1709 | verbosity = git_config_int(var, value); | |
1710 | return 0; | |
1711 | } | |
1712 | return git_default_config(var, value); | |
1713 | } | |
1714 | ||
6d297f81 JS |
1715 | int main(int argc, char *argv[]) |
1716 | { | |
8b944b56 | 1717 | static const char *bases[20]; |
6d297f81 | 1718 | static unsigned bases_count = 0; |
3af244ca JS |
1719 | int i, clean; |
1720 | const char *branch1, *branch2; | |
1721 | struct commit *result, *h1, *h2; | |
8b944b56 JH |
1722 | struct commit_list *ca = NULL; |
1723 | struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); | |
1724 | int index_fd; | |
6d297f81 | 1725 | |
68faf689 JH |
1726 | if (argv[0]) { |
1727 | int namelen = strlen(argv[0]); | |
1728 | if (8 < namelen && | |
1729 | !strcmp(argv[0] + namelen - 8, "-subtree")) | |
1730 | subtree_merge = 1; | |
1731 | } | |
1732 | ||
8c3275ab SP |
1733 | git_config(merge_config); |
1734 | if (getenv("GIT_MERGE_VERBOSITY")) | |
1735 | verbosity = strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10); | |
6d297f81 JS |
1736 | |
1737 | if (argc < 4) | |
1738 | die("Usage: %s <base>... -- <head> <remote> ...\n", argv[0]); | |
1739 | ||
6d297f81 JS |
1740 | for (i = 1; i < argc; ++i) { |
1741 | if (!strcmp(argv[i], "--")) | |
1742 | break; | |
1743 | if (bases_count < sizeof(bases)/sizeof(*bases)) | |
1744 | bases[bases_count++] = argv[i]; | |
1745 | } | |
1746 | if (argc - i != 3) /* "--" "<head>" "<remote>" */ | |
1747 | die("Not handling anything other than two heads merge."); | |
3f6ee2d1 SP |
1748 | if (verbosity >= 5) { |
1749 | buffer_output = 0; | |
1750 | do_progress = 0; | |
1751 | } | |
1752 | else | |
1753 | do_progress = isatty(1); | |
6d297f81 | 1754 | |
6d297f81 JS |
1755 | branch1 = argv[++i]; |
1756 | branch2 = argv[++i]; | |
6d297f81 | 1757 | |
3af244ca JS |
1758 | h1 = get_ref(branch1); |
1759 | h2 = get_ref(branch2); | |
6d297f81 | 1760 | |
e0ec1819 SP |
1761 | branch1 = better_branch_name(branch1); |
1762 | branch2 = better_branch_name(branch2); | |
3f6ee2d1 SP |
1763 | |
1764 | if (do_progress) | |
1765 | setup_progress_signal(); | |
8c3275ab SP |
1766 | if (show(3)) |
1767 | printf("Merging %s with %s\n", branch1, branch2); | |
e0ec1819 | 1768 | |
30ca07a2 | 1769 | index_fd = hold_locked_index(lock, 1); |
6d297f81 | 1770 | |
8b944b56 JH |
1771 | for (i = 0; i < bases_count; i++) { |
1772 | struct commit *ancestor = get_ref(bases[i]); | |
1773 | ca = commit_list_insert(ancestor, &ca); | |
1774 | } | |
63889639 | 1775 | clean = merge(h1, h2, branch1, branch2, ca, &result); |
8b944b56 JH |
1776 | |
1777 | if (active_cache_changed && | |
1778 | (write_cache(index_fd, active_cache, active_nr) || | |
30ca07a2 | 1779 | close(index_fd) || commit_locked_index(lock))) |
8b944b56 | 1780 | die ("unable to write %s", get_index_file()); |
6d297f81 | 1781 | |
3af244ca | 1782 | return clean ? 0: 1; |
6d297f81 | 1783 | } |