ll-merge.c: remove implicit dependency on the_index
[git/git.git] / notes-merge.c
1 #include "cache.h"
2 #include "commit.h"
3 #include "refs.h"
4 #include "object-store.h"
5 #include "repository.h"
6 #include "diff.h"
7 #include "diffcore.h"
8 #include "xdiff-interface.h"
9 #include "ll-merge.h"
10 #include "dir.h"
11 #include "notes.h"
12 #include "notes-merge.h"
13 #include "strbuf.h"
14 #include "notes-utils.h"
15
16 struct notes_merge_pair {
17 struct object_id obj, base, local, remote;
18 };
19
20 void init_notes_merge_options(struct notes_merge_options *o)
21 {
22 memset(o, 0, sizeof(struct notes_merge_options));
23 strbuf_init(&(o->commit_msg), 0);
24 o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT;
25 }
26
27 static int path_to_oid(const char *path, struct object_id *oid)
28 {
29 char hex_oid[GIT_SHA1_HEXSZ];
30 int i = 0;
31 while (*path && i < GIT_SHA1_HEXSZ) {
32 if (*path != '/')
33 hex_oid[i++] = *path;
34 path++;
35 }
36 if (*path || i != GIT_SHA1_HEXSZ)
37 return -1;
38 return get_oid_hex(hex_oid, oid);
39 }
40
41 static int verify_notes_filepair(struct diff_filepair *p, struct object_id *oid)
42 {
43 switch (p->status) {
44 case DIFF_STATUS_MODIFIED:
45 assert(p->one->mode == p->two->mode);
46 assert(!is_null_oid(&p->one->oid));
47 assert(!is_null_oid(&p->two->oid));
48 break;
49 case DIFF_STATUS_ADDED:
50 assert(is_null_oid(&p->one->oid));
51 break;
52 case DIFF_STATUS_DELETED:
53 assert(is_null_oid(&p->two->oid));
54 break;
55 default:
56 return -1;
57 }
58 assert(!strcmp(p->one->path, p->two->path));
59 return path_to_oid(p->one->path, oid);
60 }
61
62 static struct notes_merge_pair *find_notes_merge_pair_pos(
63 struct notes_merge_pair *list, int len, struct object_id *obj,
64 int insert_new, int *occupied)
65 {
66 /*
67 * Both diff_tree_remote() and diff_tree_local() tend to process
68 * merge_pairs in ascending order. Therefore, cache last returned
69 * index, and search sequentially from there until the appropriate
70 * position is found.
71 *
72 * Since inserts only happen from diff_tree_remote() (which mainly
73 * _appends_), we don't care that inserting into the middle of the
74 * list is expensive (using memmove()).
75 */
76 static int last_index;
77 int i = last_index < len ? last_index : len - 1;
78 int prev_cmp = 0, cmp = -1;
79 while (i >= 0 && i < len) {
80 cmp = oidcmp(obj, &list[i].obj);
81 if (!cmp) /* obj belongs @ i */
82 break;
83 else if (cmp < 0 && prev_cmp <= 0) /* obj belongs < i */
84 i--;
85 else if (cmp < 0) /* obj belongs between i-1 and i */
86 break;
87 else if (cmp > 0 && prev_cmp >= 0) /* obj belongs > i */
88 i++;
89 else /* if (cmp > 0) */ { /* obj belongs between i and i+1 */
90 i++;
91 break;
92 }
93 prev_cmp = cmp;
94 }
95 if (i < 0)
96 i = 0;
97 /* obj belongs at, or immediately preceding, index i (0 <= i <= len) */
98
99 if (!cmp)
100 *occupied = 1;
101 else {
102 *occupied = 0;
103 if (insert_new && i < len) {
104 MOVE_ARRAY(list + i + 1, list + i, len - i);
105 memset(list + i, 0, sizeof(struct notes_merge_pair));
106 }
107 }
108 last_index = i;
109 return list + i;
110 }
111
112 static struct object_id uninitialized = {
113 "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff" \
114 "\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff"
115 };
116
117 static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o,
118 const struct object_id *base,
119 const struct object_id *remote,
120 int *num_changes)
121 {
122 struct diff_options opt;
123 struct notes_merge_pair *changes;
124 int i, len = 0;
125
126 trace_printf("\tdiff_tree_remote(base = %.7s, remote = %.7s)\n",
127 oid_to_hex(base), oid_to_hex(remote));
128
129 repo_diff_setup(the_repository, &opt);
130 opt.flags.recursive = 1;
131 opt.output_format = DIFF_FORMAT_NO_OUTPUT;
132 diff_setup_done(&opt);
133 diff_tree_oid(base, remote, "", &opt);
134 diffcore_std(&opt);
135
136 changes = xcalloc(diff_queued_diff.nr, sizeof(struct notes_merge_pair));
137
138 for (i = 0; i < diff_queued_diff.nr; i++) {
139 struct diff_filepair *p = diff_queued_diff.queue[i];
140 struct notes_merge_pair *mp;
141 int occupied;
142 struct object_id obj;
143
144 if (verify_notes_filepair(p, &obj)) {
145 trace_printf("\t\tCannot merge entry '%s' (%c): "
146 "%.7s -> %.7s. Skipping!\n", p->one->path,
147 p->status, oid_to_hex(&p->one->oid),
148 oid_to_hex(&p->two->oid));
149 continue;
150 }
151 mp = find_notes_merge_pair_pos(changes, len, &obj, 1, &occupied);
152 if (occupied) {
153 /* We've found an addition/deletion pair */
154 assert(!oidcmp(&mp->obj, &obj));
155 if (is_null_oid(&p->one->oid)) { /* addition */
156 assert(is_null_oid(&mp->remote));
157 oidcpy(&mp->remote, &p->two->oid);
158 } else if (is_null_oid(&p->two->oid)) { /* deletion */
159 assert(is_null_oid(&mp->base));
160 oidcpy(&mp->base, &p->one->oid);
161 } else
162 assert(!"Invalid existing change recorded");
163 } else {
164 oidcpy(&mp->obj, &obj);
165 oidcpy(&mp->base, &p->one->oid);
166 oidcpy(&mp->local, &uninitialized);
167 oidcpy(&mp->remote, &p->two->oid);
168 len++;
169 }
170 trace_printf("\t\tStored remote change for %s: %.7s -> %.7s\n",
171 oid_to_hex(&mp->obj), oid_to_hex(&mp->base),
172 oid_to_hex(&mp->remote));
173 }
174 diff_flush(&opt);
175 clear_pathspec(&opt.pathspec);
176
177 *num_changes = len;
178 return changes;
179 }
180
181 static void diff_tree_local(struct notes_merge_options *o,
182 struct notes_merge_pair *changes, int len,
183 const struct object_id *base,
184 const struct object_id *local)
185 {
186 struct diff_options opt;
187 int i;
188
189 trace_printf("\tdiff_tree_local(len = %i, base = %.7s, local = %.7s)\n",
190 len, oid_to_hex(base), oid_to_hex(local));
191
192 repo_diff_setup(the_repository, &opt);
193 opt.flags.recursive = 1;
194 opt.output_format = DIFF_FORMAT_NO_OUTPUT;
195 diff_setup_done(&opt);
196 diff_tree_oid(base, local, "", &opt);
197 diffcore_std(&opt);
198
199 for (i = 0; i < diff_queued_diff.nr; i++) {
200 struct diff_filepair *p = diff_queued_diff.queue[i];
201 struct notes_merge_pair *mp;
202 int match;
203 struct object_id obj;
204
205 if (verify_notes_filepair(p, &obj)) {
206 trace_printf("\t\tCannot merge entry '%s' (%c): "
207 "%.7s -> %.7s. Skipping!\n", p->one->path,
208 p->status, oid_to_hex(&p->one->oid),
209 oid_to_hex(&p->two->oid));
210 continue;
211 }
212 mp = find_notes_merge_pair_pos(changes, len, &obj, 0, &match);
213 if (!match) {
214 trace_printf("\t\tIgnoring local-only change for %s: "
215 "%.7s -> %.7s\n", oid_to_hex(&obj),
216 oid_to_hex(&p->one->oid),
217 oid_to_hex(&p->two->oid));
218 continue;
219 }
220
221 assert(!oidcmp(&mp->obj, &obj));
222 if (is_null_oid(&p->two->oid)) { /* deletion */
223 /*
224 * Either this is a true deletion (1), or it is part
225 * of an A/D pair (2), or D/A pair (3):
226 *
227 * (1) mp->local is uninitialized; set it to null_sha1
228 * (2) mp->local is not uninitialized; don't touch it
229 * (3) mp->local is uninitialized; set it to null_sha1
230 * (will be overwritten by following addition)
231 */
232 if (!oidcmp(&mp->local, &uninitialized))
233 oidclr(&mp->local);
234 } else if (is_null_oid(&p->one->oid)) { /* addition */
235 /*
236 * Either this is a true addition (1), or it is part
237 * of an A/D pair (2), or D/A pair (3):
238 *
239 * (1) mp->local is uninitialized; set to p->two->sha1
240 * (2) mp->local is uninitialized; set to p->two->sha1
241 * (3) mp->local is null_sha1; set to p->two->sha1
242 */
243 assert(is_null_oid(&mp->local) ||
244 !oidcmp(&mp->local, &uninitialized));
245 oidcpy(&mp->local, &p->two->oid);
246 } else { /* modification */
247 /*
248 * This is a true modification. p->one->sha1 shall
249 * match mp->base, and mp->local shall be uninitialized.
250 * Set mp->local to p->two->sha1.
251 */
252 assert(!oidcmp(&p->one->oid, &mp->base));
253 assert(!oidcmp(&mp->local, &uninitialized));
254 oidcpy(&mp->local, &p->two->oid);
255 }
256 trace_printf("\t\tStored local change for %s: %.7s -> %.7s\n",
257 oid_to_hex(&mp->obj), oid_to_hex(&mp->base),
258 oid_to_hex(&mp->local));
259 }
260 diff_flush(&opt);
261 clear_pathspec(&opt.pathspec);
262 }
263
264 static void check_notes_merge_worktree(struct notes_merge_options *o)
265 {
266 if (!o->has_worktree) {
267 /*
268 * Must establish NOTES_MERGE_WORKTREE.
269 * Abort if NOTES_MERGE_WORKTREE already exists
270 */
271 if (file_exists(git_path(NOTES_MERGE_WORKTREE)) &&
272 !is_empty_dir(git_path(NOTES_MERGE_WORKTREE))) {
273 if (advice_resolve_conflict)
274 die(_("You have not concluded your previous "
275 "notes merge (%s exists).\nPlease, use "
276 "'git notes merge --commit' or 'git notes "
277 "merge --abort' to commit/abort the "
278 "previous merge before you start a new "
279 "notes merge."), git_path("NOTES_MERGE_*"));
280 else
281 die(_("You have not concluded your notes merge "
282 "(%s exists)."), git_path("NOTES_MERGE_*"));
283 }
284
285 if (safe_create_leading_directories_const(git_path(
286 NOTES_MERGE_WORKTREE "/.test")))
287 die_errno("unable to create directory %s",
288 git_path(NOTES_MERGE_WORKTREE));
289 o->has_worktree = 1;
290 } else if (!file_exists(git_path(NOTES_MERGE_WORKTREE)))
291 /* NOTES_MERGE_WORKTREE should already be established */
292 die("missing '%s'. This should not happen",
293 git_path(NOTES_MERGE_WORKTREE));
294 }
295
296 static void write_buf_to_worktree(const struct object_id *obj,
297 const char *buf, unsigned long size)
298 {
299 int fd;
300 char *path = git_pathdup(NOTES_MERGE_WORKTREE "/%s", oid_to_hex(obj));
301 if (safe_create_leading_directories_const(path))
302 die_errno("unable to create directory for '%s'", path);
303
304 fd = xopen(path, O_WRONLY | O_EXCL | O_CREAT, 0666);
305
306 while (size > 0) {
307 ssize_t ret = write_in_full(fd, buf, size);
308 if (ret < 0) {
309 /* Ignore epipe */
310 if (errno == EPIPE)
311 break;
312 die_errno("notes-merge");
313 }
314 size -= ret;
315 buf += ret;
316 }
317
318 close(fd);
319 free(path);
320 }
321
322 static void write_note_to_worktree(const struct object_id *obj,
323 const struct object_id *note)
324 {
325 enum object_type type;
326 unsigned long size;
327 void *buf = read_object_file(note, &type, &size);
328
329 if (!buf)
330 die("cannot read note %s for object %s",
331 oid_to_hex(note), oid_to_hex(obj));
332 if (type != OBJ_BLOB)
333 die("blob expected in note %s for object %s",
334 oid_to_hex(note), oid_to_hex(obj));
335 write_buf_to_worktree(obj, buf, size);
336 free(buf);
337 }
338
339 static int ll_merge_in_worktree(struct notes_merge_options *o,
340 struct notes_merge_pair *p)
341 {
342 mmbuffer_t result_buf;
343 mmfile_t base, local, remote;
344 int status;
345
346 read_mmblob(&base, &p->base);
347 read_mmblob(&local, &p->local);
348 read_mmblob(&remote, &p->remote);
349
350 status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL,
351 &local, o->local_ref, &remote, o->remote_ref,
352 &the_index, NULL);
353
354 free(base.ptr);
355 free(local.ptr);
356 free(remote.ptr);
357
358 if ((status < 0) || !result_buf.ptr)
359 die("Failed to execute internal merge");
360
361 write_buf_to_worktree(&p->obj, result_buf.ptr, result_buf.size);
362 free(result_buf.ptr);
363
364 return status;
365 }
366
367 static int merge_one_change_manual(struct notes_merge_options *o,
368 struct notes_merge_pair *p,
369 struct notes_tree *t)
370 {
371 const char *lref = o->local_ref ? o->local_ref : "local version";
372 const char *rref = o->remote_ref ? o->remote_ref : "remote version";
373
374 trace_printf("\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, "
375 "local = %.7s, remote = %.7s)\n",
376 oid_to_hex(&p->obj), oid_to_hex(&p->base),
377 oid_to_hex(&p->local), oid_to_hex(&p->remote));
378
379 /* add "Conflicts:" section to commit message first time through */
380 if (!o->has_worktree)
381 strbuf_addstr(&(o->commit_msg), "\n\nConflicts:\n");
382
383 strbuf_addf(&(o->commit_msg), "\t%s\n", oid_to_hex(&p->obj));
384
385 if (o->verbosity >= 2)
386 printf("Auto-merging notes for %s\n", oid_to_hex(&p->obj));
387 check_notes_merge_worktree(o);
388 if (is_null_oid(&p->local)) {
389 /* D/F conflict, checkout p->remote */
390 assert(!is_null_oid(&p->remote));
391 if (o->verbosity >= 1)
392 printf("CONFLICT (delete/modify): Notes for object %s "
393 "deleted in %s and modified in %s. Version from %s "
394 "left in tree.\n",
395 oid_to_hex(&p->obj), lref, rref, rref);
396 write_note_to_worktree(&p->obj, &p->remote);
397 } else if (is_null_oid(&p->remote)) {
398 /* D/F conflict, checkout p->local */
399 assert(!is_null_oid(&p->local));
400 if (o->verbosity >= 1)
401 printf("CONFLICT (delete/modify): Notes for object %s "
402 "deleted in %s and modified in %s. Version from %s "
403 "left in tree.\n",
404 oid_to_hex(&p->obj), rref, lref, lref);
405 write_note_to_worktree(&p->obj, &p->local);
406 } else {
407 /* "regular" conflict, checkout result of ll_merge() */
408 const char *reason = "content";
409 if (is_null_oid(&p->base))
410 reason = "add/add";
411 assert(!is_null_oid(&p->local));
412 assert(!is_null_oid(&p->remote));
413 if (o->verbosity >= 1)
414 printf("CONFLICT (%s): Merge conflict in notes for "
415 "object %s\n", reason,
416 oid_to_hex(&p->obj));
417 ll_merge_in_worktree(o, p);
418 }
419
420 trace_printf("\t\t\tremoving from partial merge result\n");
421 remove_note(t, p->obj.hash);
422
423 return 1;
424 }
425
426 static int merge_one_change(struct notes_merge_options *o,
427 struct notes_merge_pair *p, struct notes_tree *t)
428 {
429 /*
430 * Return 0 if change is successfully resolved (stored in notes_tree).
431 * Return 1 is change results in a conflict (NOT stored in notes_tree,
432 * but instead written to NOTES_MERGE_WORKTREE with conflict markers).
433 */
434 switch (o->strategy) {
435 case NOTES_MERGE_RESOLVE_MANUAL:
436 return merge_one_change_manual(o, p, t);
437 case NOTES_MERGE_RESOLVE_OURS:
438 if (o->verbosity >= 2)
439 printf("Using local notes for %s\n",
440 oid_to_hex(&p->obj));
441 /* nothing to do */
442 return 0;
443 case NOTES_MERGE_RESOLVE_THEIRS:
444 if (o->verbosity >= 2)
445 printf("Using remote notes for %s\n",
446 oid_to_hex(&p->obj));
447 if (add_note(t, &p->obj, &p->remote, combine_notes_overwrite))
448 BUG("combine_notes_overwrite failed");
449 return 0;
450 case NOTES_MERGE_RESOLVE_UNION:
451 if (o->verbosity >= 2)
452 printf("Concatenating local and remote notes for %s\n",
453 oid_to_hex(&p->obj));
454 if (add_note(t, &p->obj, &p->remote, combine_notes_concatenate))
455 die("failed to concatenate notes "
456 "(combine_notes_concatenate)");
457 return 0;
458 case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ:
459 if (o->verbosity >= 2)
460 printf("Concatenating unique lines in local and remote "
461 "notes for %s\n", oid_to_hex(&p->obj));
462 if (add_note(t, &p->obj, &p->remote, combine_notes_cat_sort_uniq))
463 die("failed to concatenate notes "
464 "(combine_notes_cat_sort_uniq)");
465 return 0;
466 }
467 die("Unknown strategy (%i).", o->strategy);
468 }
469
470 static int merge_changes(struct notes_merge_options *o,
471 struct notes_merge_pair *changes, int *num_changes,
472 struct notes_tree *t)
473 {
474 int i, conflicts = 0;
475
476 trace_printf("\tmerge_changes(num_changes = %i)\n", *num_changes);
477 for (i = 0; i < *num_changes; i++) {
478 struct notes_merge_pair *p = changes + i;
479 trace_printf("\t\t%.7s: %.7s -> %.7s/%.7s\n",
480 oid_to_hex(&p->obj), oid_to_hex(&p->base),
481 oid_to_hex(&p->local),
482 oid_to_hex(&p->remote));
483
484 if (!oidcmp(&p->base, &p->remote)) {
485 /* no remote change; nothing to do */
486 trace_printf("\t\t\tskipping (no remote change)\n");
487 } else if (!oidcmp(&p->local, &p->remote)) {
488 /* same change in local and remote; nothing to do */
489 trace_printf("\t\t\tskipping (local == remote)\n");
490 } else if (!oidcmp(&p->local, &uninitialized) ||
491 !oidcmp(&p->local, &p->base)) {
492 /* no local change; adopt remote change */
493 trace_printf("\t\t\tno local change, adopted remote\n");
494 if (add_note(t, &p->obj, &p->remote,
495 combine_notes_overwrite))
496 BUG("combine_notes_overwrite failed");
497 } else {
498 /* need file-level merge between local and remote */
499 trace_printf("\t\t\tneed content-level merge\n");
500 conflicts += merge_one_change(o, p, t);
501 }
502 }
503
504 return conflicts;
505 }
506
507 static int merge_from_diffs(struct notes_merge_options *o,
508 const struct object_id *base,
509 const struct object_id *local,
510 const struct object_id *remote,
511 struct notes_tree *t)
512 {
513 struct notes_merge_pair *changes;
514 int num_changes, conflicts;
515
516 trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, "
517 "remote = %.7s)\n", oid_to_hex(base), oid_to_hex(local),
518 oid_to_hex(remote));
519
520 changes = diff_tree_remote(o, base, remote, &num_changes);
521 diff_tree_local(o, changes, num_changes, base, local);
522
523 conflicts = merge_changes(o, changes, &num_changes, t);
524 free(changes);
525
526 if (o->verbosity >= 4)
527 printf(t->dirty ?
528 "Merge result: %i unmerged notes and a dirty notes tree\n" :
529 "Merge result: %i unmerged notes and a clean notes tree\n",
530 conflicts);
531
532 return conflicts ? -1 : 1;
533 }
534
535 int notes_merge(struct notes_merge_options *o,
536 struct notes_tree *local_tree,
537 struct object_id *result_oid)
538 {
539 struct object_id local_oid, remote_oid;
540 struct commit *local, *remote;
541 struct commit_list *bases = NULL;
542 const struct object_id *base_oid, *base_tree_oid;
543 int result = 0;
544
545 assert(o->local_ref && o->remote_ref);
546 assert(!strcmp(o->local_ref, local_tree->ref));
547 oidclr(result_oid);
548
549 trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n",
550 o->local_ref, o->remote_ref);
551
552 /* Dereference o->local_ref into local_sha1 */
553 if (read_ref_full(o->local_ref, 0, &local_oid, NULL))
554 die("Failed to resolve local notes ref '%s'", o->local_ref);
555 else if (!check_refname_format(o->local_ref, 0) &&
556 is_null_oid(&local_oid))
557 local = NULL; /* local_oid == null_oid indicates unborn ref */
558 else if (!(local = lookup_commit_reference(the_repository, &local_oid)))
559 die("Could not parse local commit %s (%s)",
560 oid_to_hex(&local_oid), o->local_ref);
561 trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid));
562
563 /* Dereference o->remote_ref into remote_oid */
564 if (get_oid(o->remote_ref, &remote_oid)) {
565 /*
566 * Failed to get remote_oid. If o->remote_ref looks like an
567 * unborn ref, perform the merge using an empty notes tree.
568 */
569 if (!check_refname_format(o->remote_ref, 0)) {
570 oidclr(&remote_oid);
571 remote = NULL;
572 } else {
573 die("Failed to resolve remote notes ref '%s'",
574 o->remote_ref);
575 }
576 } else if (!(remote = lookup_commit_reference(the_repository, &remote_oid))) {
577 die("Could not parse remote commit %s (%s)",
578 oid_to_hex(&remote_oid), o->remote_ref);
579 }
580 trace_printf("\tremote commit: %.7s\n", oid_to_hex(&remote_oid));
581
582 if (!local && !remote)
583 die("Cannot merge empty notes ref (%s) into empty notes ref "
584 "(%s)", o->remote_ref, o->local_ref);
585 if (!local) {
586 /* result == remote commit */
587 oidcpy(result_oid, &remote_oid);
588 goto found_result;
589 }
590 if (!remote) {
591 /* result == local commit */
592 oidcpy(result_oid, &local_oid);
593 goto found_result;
594 }
595 assert(local && remote);
596
597 /* Find merge bases */
598 bases = get_merge_bases(local, remote);
599 if (!bases) {
600 base_oid = &null_oid;
601 base_tree_oid = the_hash_algo->empty_tree;
602 if (o->verbosity >= 4)
603 printf("No merge base found; doing history-less merge\n");
604 } else if (!bases->next) {
605 base_oid = &bases->item->object.oid;
606 base_tree_oid = get_commit_tree_oid(bases->item);
607 if (o->verbosity >= 4)
608 printf("One merge base found (%.7s)\n",
609 oid_to_hex(base_oid));
610 } else {
611 /* TODO: How to handle multiple merge-bases? */
612 base_oid = &bases->item->object.oid;
613 base_tree_oid = get_commit_tree_oid(bases->item);
614 if (o->verbosity >= 3)
615 printf("Multiple merge bases found. Using the first "
616 "(%.7s)\n", oid_to_hex(base_oid));
617 }
618
619 if (o->verbosity >= 4)
620 printf("Merging remote commit %.7s into local commit %.7s with "
621 "merge-base %.7s\n", oid_to_hex(&remote->object.oid),
622 oid_to_hex(&local->object.oid),
623 oid_to_hex(base_oid));
624
625 if (!oidcmp(&remote->object.oid, base_oid)) {
626 /* Already merged; result == local commit */
627 if (o->verbosity >= 2)
628 printf("Already up to date!\n");
629 oidcpy(result_oid, &local->object.oid);
630 goto found_result;
631 }
632 if (!oidcmp(&local->object.oid, base_oid)) {
633 /* Fast-forward; result == remote commit */
634 if (o->verbosity >= 2)
635 printf("Fast-forward\n");
636 oidcpy(result_oid, &remote->object.oid);
637 goto found_result;
638 }
639
640 result = merge_from_diffs(o, base_tree_oid,
641 get_commit_tree_oid(local),
642 get_commit_tree_oid(remote), local_tree);
643
644 if (result != 0) { /* non-trivial merge (with or without conflicts) */
645 /* Commit (partial) result */
646 struct commit_list *parents = NULL;
647 commit_list_insert(remote, &parents); /* LIFO order */
648 commit_list_insert(local, &parents);
649 create_notes_commit(local_tree, parents, o->commit_msg.buf,
650 o->commit_msg.len, result_oid);
651 }
652
653 found_result:
654 free_commit_list(bases);
655 strbuf_release(&(o->commit_msg));
656 trace_printf("notes_merge(): result = %i, result_oid = %.7s\n",
657 result, oid_to_hex(result_oid));
658 return result;
659 }
660
661 int notes_merge_commit(struct notes_merge_options *o,
662 struct notes_tree *partial_tree,
663 struct commit *partial_commit,
664 struct object_id *result_oid)
665 {
666 /*
667 * Iterate through files in .git/NOTES_MERGE_WORKTREE and add all
668 * found notes to 'partial_tree'. Write the updated notes tree to
669 * the DB, and commit the resulting tree object while reusing the
670 * commit message and parents from 'partial_commit'.
671 * Finally store the new commit object OID into 'result_oid'.
672 */
673 DIR *dir;
674 struct dirent *e;
675 struct strbuf path = STRBUF_INIT;
676 const char *buffer = get_commit_buffer(partial_commit, NULL);
677 const char *msg = strstr(buffer, "\n\n");
678 int baselen;
679
680 git_path_buf(&path, NOTES_MERGE_WORKTREE);
681 if (o->verbosity >= 3)
682 printf("Committing notes in notes merge worktree at %s\n",
683 path.buf);
684
685 if (!msg || msg[2] == '\0')
686 die("partial notes commit has empty message");
687 msg += 2;
688
689 dir = opendir(path.buf);
690 if (!dir)
691 die_errno("could not open %s", path.buf);
692
693 strbuf_addch(&path, '/');
694 baselen = path.len;
695 while ((e = readdir(dir)) != NULL) {
696 struct stat st;
697 struct object_id obj_oid, blob_oid;
698
699 if (is_dot_or_dotdot(e->d_name))
700 continue;
701
702 if (get_oid_hex(e->d_name, &obj_oid)) {
703 if (o->verbosity >= 3)
704 printf("Skipping non-SHA1 entry '%s%s'\n",
705 path.buf, e->d_name);
706 continue;
707 }
708
709 strbuf_addstr(&path, e->d_name);
710 /* write file as blob, and add to partial_tree */
711 if (stat(path.buf, &st))
712 die_errno("Failed to stat '%s'", path.buf);
713 if (index_path(&blob_oid, path.buf, &st, HASH_WRITE_OBJECT))
714 die("Failed to write blob object from '%s'", path.buf);
715 if (add_note(partial_tree, &obj_oid, &blob_oid, NULL))
716 die("Failed to add resolved note '%s' to notes tree",
717 path.buf);
718 if (o->verbosity >= 4)
719 printf("Added resolved note for object %s: %s\n",
720 oid_to_hex(&obj_oid), oid_to_hex(&blob_oid));
721 strbuf_setlen(&path, baselen);
722 }
723
724 create_notes_commit(partial_tree, partial_commit->parents, msg,
725 strlen(msg), result_oid);
726 unuse_commit_buffer(partial_commit, buffer);
727 if (o->verbosity >= 4)
728 printf("Finalized notes merge commit: %s\n",
729 oid_to_hex(result_oid));
730 strbuf_release(&path);
731 closedir(dir);
732 return 0;
733 }
734
735 int notes_merge_abort(struct notes_merge_options *o)
736 {
737 /*
738 * Remove all files within .git/NOTES_MERGE_WORKTREE. We do not remove
739 * the .git/NOTES_MERGE_WORKTREE directory itself, since it might be
740 * the current working directory of the user.
741 */
742 struct strbuf buf = STRBUF_INIT;
743 int ret;
744
745 git_path_buf(&buf, NOTES_MERGE_WORKTREE);
746 if (o->verbosity >= 3)
747 printf("Removing notes merge worktree at %s/*\n", buf.buf);
748 ret = remove_dir_recursively(&buf, REMOVE_DIR_KEEP_TOPLEVEL);
749 strbuf_release(&buf);
750 return ret;
751 }