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