]>
Commit | Line | Data |
---|---|---|
75ef3f4a JH |
1 | #include "cache.h" |
2 | #include "commit.h" | |
3 | #include "refs.h" | |
cbd53a21 | 4 | #include "object-store.h" |
2085b16a JH |
5 | #include "diff.h" |
6 | #include "diffcore.h" | |
809f38c8 JH |
7 | #include "xdiff-interface.h" |
8 | #include "ll-merge.h" | |
9 | #include "dir.h" | |
56881843 | 10 | #include "notes.h" |
75ef3f4a | 11 | #include "notes-merge.h" |
443259cf | 12 | #include "strbuf.h" |
bf9a05ba | 13 | #include "notes-utils.h" |
75ef3f4a | 14 | |
2085b16a | 15 | struct notes_merge_pair { |
e910bb1e | 16 | struct object_id obj, base, local, remote; |
2085b16a JH |
17 | }; |
18 | ||
75ef3f4a JH |
19 | void init_notes_merge_options(struct notes_merge_options *o) |
20 | { | |
21 | memset(o, 0, sizeof(struct notes_merge_options)); | |
443259cf | 22 | strbuf_init(&(o->commit_msg), 0); |
75ef3f4a JH |
23 | o->verbosity = NOTES_MERGE_VERBOSITY_DEFAULT; |
24 | } | |
25 | ||
4d77896e | 26 | static int path_to_oid(const char *path, struct object_id *oid) |
2085b16a | 27 | { |
4d77896e | 28 | char hex_oid[GIT_SHA1_HEXSZ]; |
2085b16a | 29 | int i = 0; |
4d77896e | 30 | while (*path && i < GIT_SHA1_HEXSZ) { |
2085b16a | 31 | if (*path != '/') |
4d77896e | 32 | hex_oid[i++] = *path; |
2085b16a JH |
33 | path++; |
34 | } | |
4d77896e | 35 | if (*path || i != GIT_SHA1_HEXSZ) |
2085b16a | 36 | return -1; |
4d77896e | 37 | return get_oid_hex(hex_oid, oid); |
2085b16a JH |
38 | } |
39 | ||
4d77896e | 40 | static int verify_notes_filepair(struct diff_filepair *p, struct object_id *oid) |
2085b16a JH |
41 | { |
42 | switch (p->status) { | |
43 | case DIFF_STATUS_MODIFIED: | |
44 | assert(p->one->mode == p->two->mode); | |
a0d12c44 | 45 | assert(!is_null_oid(&p->one->oid)); |
46 | assert(!is_null_oid(&p->two->oid)); | |
2085b16a JH |
47 | break; |
48 | case DIFF_STATUS_ADDED: | |
a0d12c44 | 49 | assert(is_null_oid(&p->one->oid)); |
2085b16a JH |
50 | break; |
51 | case DIFF_STATUS_DELETED: | |
a0d12c44 | 52 | assert(is_null_oid(&p->two->oid)); |
2085b16a JH |
53 | break; |
54 | default: | |
55 | return -1; | |
56 | } | |
57 | assert(!strcmp(p->one->path, p->two->path)); | |
4d77896e | 58 | return path_to_oid(p->one->path, oid); |
2085b16a JH |
59 | } |
60 | ||
61 | static struct notes_merge_pair *find_notes_merge_pair_pos( | |
d7a7c708 | 62 | struct notes_merge_pair *list, int len, struct object_id *obj, |
2085b16a JH |
63 | int insert_new, int *occupied) |
64 | { | |
65 | /* | |
66 | * Both diff_tree_remote() and diff_tree_local() tend to process | |
67 | * merge_pairs in ascending order. Therefore, cache last returned | |
68 | * index, and search sequentially from there until the appropriate | |
69 | * position is found. | |
70 | * | |
71 | * Since inserts only happen from diff_tree_remote() (which mainly | |
72 | * _appends_), we don't care that inserting into the middle of the | |
73 | * list is expensive (using memmove()). | |
74 | */ | |
75 | static int last_index; | |
76 | int i = last_index < len ? last_index : len - 1; | |
77 | int prev_cmp = 0, cmp = -1; | |
78 | while (i >= 0 && i < len) { | |
d7a7c708 | 79 | cmp = oidcmp(obj, &list[i].obj); |
2085b16a JH |
80 | if (!cmp) /* obj belongs @ i */ |
81 | break; | |
82 | else if (cmp < 0 && prev_cmp <= 0) /* obj belongs < i */ | |
83 | i--; | |
84 | else if (cmp < 0) /* obj belongs between i-1 and i */ | |
85 | break; | |
86 | else if (cmp > 0 && prev_cmp >= 0) /* obj belongs > i */ | |
87 | i++; | |
88 | else /* if (cmp > 0) */ { /* obj belongs between i and i+1 */ | |
89 | i++; | |
90 | break; | |
91 | } | |
92 | prev_cmp = cmp; | |
93 | } | |
94 | if (i < 0) | |
95 | i = 0; | |
96 | /* obj belongs at, or immediately preceding, index i (0 <= i <= len) */ | |
97 | ||
98 | if (!cmp) | |
99 | *occupied = 1; | |
100 | else { | |
101 | *occupied = 0; | |
102 | if (insert_new && i < len) { | |
f331ab9d | 103 | MOVE_ARRAY(list + i + 1, list + i, len - i); |
2085b16a JH |
104 | memset(list + i, 0, sizeof(struct notes_merge_pair)); |
105 | } | |
106 | } | |
107 | last_index = i; | |
108 | return list + i; | |
109 | } | |
110 | ||
e910bb1e | 111 | static 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 | |
116 | static 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); | |
0d1e0e78 | 129 | opt.flags.recursive = 1; |
2085b16a | 130 | opt.output_format = DIFF_FORMAT_NO_OUTPUT; |
28452655 | 131 | diff_setup_done(&opt); |
66f414f8 | 132 | diff_tree_oid(base, remote, "", &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; | |
d7a7c708 | 141 | struct object_id obj; |
2085b16a | 142 | |
4d77896e | 143 | if (verify_notes_filepair(p, &obj)) { |
2085b16a JH |
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 | } | |
d7a7c708 | 150 | mp = find_notes_merge_pair_pos(changes, len, &obj, 1, &occupied); |
2085b16a JH |
151 | if (occupied) { |
152 | /* We've found an addition/deletion pair */ | |
d7a7c708 | 153 | assert(!oidcmp(&mp->obj, &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 { | |
d7a7c708 | 163 | oidcpy(&mp->obj, &obj); |
e910bb1e | 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 | ||
180 | static 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); | |
0d1e0e78 | 192 | opt.flags.recursive = 1; |
2085b16a | 193 | opt.output_format = DIFF_FORMAT_NO_OUTPUT; |
28452655 | 194 | diff_setup_done(&opt); |
66f414f8 | 195 | diff_tree_oid(base, local, "", &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; | |
d7a7c708 | 202 | struct object_id obj; |
2085b16a | 203 | |
4d77896e | 204 | if (verify_notes_filepair(p, &obj)) { |
2085b16a JH |
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 | } | |
d7a7c708 | 211 | mp = find_notes_merge_pair_pos(changes, len, &obj, 0, &match); |
2085b16a JH |
212 | if (!match) { |
213 | trace_printf("\t\tIgnoring local-only change for %s: " | |
d7a7c708 | 214 | "%.7s -> %.7s\n", oid_to_hex(&obj), |
a0d12c44 | 215 | oid_to_hex(&p->one->oid), |
216 | oid_to_hex(&p->two->oid)); | |
2085b16a JH |
217 | continue; |
218 | } | |
219 | ||
d7a7c708 | 220 | assert(!oidcmp(&mp->obj, &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 |
263 | static 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 | ||
9e5e0c28 | 295 | static void write_buf_to_worktree(const struct object_id *obj, |
809f38c8 JH |
296 | const char *buf, unsigned long size) |
297 | { | |
298 | int fd; | |
9e5e0c28 | 299 | char *path = git_pathdup(NOTES_MERGE_WORKTREE "/%s", oid_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) { | |
634eb82b | 306 | ssize_t ret = write_in_full(fd, buf, size); |
809f38c8 JH |
307 | if (ret < 0) { |
308 | /* Ignore epipe */ | |
309 | if (errno == EPIPE) | |
310 | break; | |
311 | die_errno("notes-merge"); | |
809f38c8 JH |
312 | } |
313 | size -= ret; | |
314 | buf += ret; | |
315 | } | |
316 | ||
317 | close(fd); | |
fcd12db6 | 318 | free(path); |
809f38c8 JH |
319 | } |
320 | ||
9e5e0c28 BW |
321 | static void write_note_to_worktree(const struct object_id *obj, |
322 | const struct object_id *note) | |
809f38c8 JH |
323 | { |
324 | enum object_type type; | |
325 | unsigned long size; | |
b4f5aca4 | 326 | void *buf = read_object_file(note, &type, &size); |
809f38c8 JH |
327 | |
328 | if (!buf) | |
329 | die("cannot read note %s for object %s", | |
9e5e0c28 | 330 | oid_to_hex(note), oid_to_hex(obj)); |
809f38c8 JH |
331 | if (type != OBJ_BLOB) |
332 | die("blob expected in note %s for object %s", | |
9e5e0c28 | 333 | oid_to_hex(note), oid_to_hex(obj)); |
809f38c8 JH |
334 | write_buf_to_worktree(obj, buf, size); |
335 | free(buf); | |
336 | } | |
337 | ||
338 | static int ll_merge_in_worktree(struct notes_merge_options *o, | |
339 | struct notes_merge_pair *p) | |
340 | { | |
341 | mmbuffer_t result_buf; | |
342 | mmfile_t base, local, remote; | |
343 | int status; | |
344 | ||
d449347d | 345 | read_mmblob(&base, &p->base); |
346 | read_mmblob(&local, &p->local); | |
347 | read_mmblob(&remote, &p->remote); | |
809f38c8 | 348 | |
e910bb1e | 349 | status = ll_merge(&result_buf, oid_to_hex(&p->obj), &base, NULL, |
c2e86add | 350 | &local, o->local_ref, &remote, o->remote_ref, NULL); |
809f38c8 JH |
351 | |
352 | free(base.ptr); | |
353 | free(local.ptr); | |
354 | free(remote.ptr); | |
355 | ||
356 | if ((status < 0) || !result_buf.ptr) | |
357 | die("Failed to execute internal merge"); | |
358 | ||
9e5e0c28 | 359 | write_buf_to_worktree(&p->obj, result_buf.ptr, result_buf.size); |
809f38c8 JH |
360 | free(result_buf.ptr); |
361 | ||
362 | return status; | |
363 | } | |
364 | ||
365 | static int merge_one_change_manual(struct notes_merge_options *o, | |
366 | struct notes_merge_pair *p, | |
367 | struct notes_tree *t) | |
368 | { | |
369 | const char *lref = o->local_ref ? o->local_ref : "local version"; | |
370 | const char *rref = o->remote_ref ? o->remote_ref : "remote version"; | |
371 | ||
372 | trace_printf("\t\t\tmerge_one_change_manual(obj = %.7s, base = %.7s, " | |
373 | "local = %.7s, remote = %.7s)\n", | |
e910bb1e | 374 | oid_to_hex(&p->obj), oid_to_hex(&p->base), |
375 | oid_to_hex(&p->local), oid_to_hex(&p->remote)); | |
809f38c8 | 376 | |
443259cf JH |
377 | /* add "Conflicts:" section to commit message first time through */ |
378 | if (!o->has_worktree) | |
379 | strbuf_addstr(&(o->commit_msg), "\n\nConflicts:\n"); | |
380 | ||
e910bb1e | 381 | strbuf_addf(&(o->commit_msg), "\t%s\n", oid_to_hex(&p->obj)); |
443259cf | 382 | |
5f9f8d15 | 383 | if (o->verbosity >= 2) |
e910bb1e | 384 | printf("Auto-merging notes for %s\n", oid_to_hex(&p->obj)); |
809f38c8 | 385 | check_notes_merge_worktree(o); |
e910bb1e | 386 | if (is_null_oid(&p->local)) { |
809f38c8 | 387 | /* D/F conflict, checkout p->remote */ |
e910bb1e | 388 | assert(!is_null_oid(&p->remote)); |
5f9f8d15 JN |
389 | if (o->verbosity >= 1) |
390 | printf("CONFLICT (delete/modify): Notes for object %s " | |
391 | "deleted in %s and modified in %s. Version from %s " | |
392 | "left in tree.\n", | |
e910bb1e | 393 | oid_to_hex(&p->obj), lref, rref, rref); |
9e5e0c28 | 394 | write_note_to_worktree(&p->obj, &p->remote); |
e910bb1e | 395 | } else if (is_null_oid(&p->remote)) { |
809f38c8 | 396 | /* D/F conflict, checkout p->local */ |
e910bb1e | 397 | assert(!is_null_oid(&p->local)); |
5f9f8d15 JN |
398 | if (o->verbosity >= 1) |
399 | printf("CONFLICT (delete/modify): Notes for object %s " | |
400 | "deleted in %s and modified in %s. Version from %s " | |
401 | "left in tree.\n", | |
e910bb1e | 402 | oid_to_hex(&p->obj), rref, lref, lref); |
9e5e0c28 | 403 | write_note_to_worktree(&p->obj, &p->local); |
809f38c8 JH |
404 | } else { |
405 | /* "regular" conflict, checkout result of ll_merge() */ | |
406 | const char *reason = "content"; | |
e910bb1e | 407 | if (is_null_oid(&p->base)) |
809f38c8 | 408 | reason = "add/add"; |
e910bb1e | 409 | assert(!is_null_oid(&p->local)); |
410 | assert(!is_null_oid(&p->remote)); | |
5f9f8d15 JN |
411 | if (o->verbosity >= 1) |
412 | printf("CONFLICT (%s): Merge conflict in notes for " | |
e910bb1e | 413 | "object %s\n", reason, |
414 | oid_to_hex(&p->obj)); | |
809f38c8 JH |
415 | ll_merge_in_worktree(o, p); |
416 | } | |
417 | ||
418 | trace_printf("\t\t\tremoving from partial merge result\n"); | |
e910bb1e | 419 | remove_note(t, p->obj.hash); |
809f38c8 JH |
420 | |
421 | return 1; | |
422 | } | |
423 | ||
3228e671 JH |
424 | static int merge_one_change(struct notes_merge_options *o, |
425 | struct notes_merge_pair *p, struct notes_tree *t) | |
426 | { | |
427 | /* | |
809f38c8 JH |
428 | * Return 0 if change is successfully resolved (stored in notes_tree). |
429 | * Return 1 is change results in a conflict (NOT stored in notes_tree, | |
430 | * but instead written to NOTES_MERGE_WORKTREE with conflict markers). | |
3228e671 JH |
431 | */ |
432 | switch (o->strategy) { | |
433 | case NOTES_MERGE_RESOLVE_MANUAL: | |
809f38c8 | 434 | return merge_one_change_manual(o, p, t); |
3228e671 | 435 | case NOTES_MERGE_RESOLVE_OURS: |
5f9f8d15 JN |
436 | if (o->verbosity >= 2) |
437 | printf("Using local notes for %s\n", | |
e910bb1e | 438 | oid_to_hex(&p->obj)); |
3228e671 JH |
439 | /* nothing to do */ |
440 | return 0; | |
441 | case NOTES_MERGE_RESOLVE_THEIRS: | |
5f9f8d15 JN |
442 | if (o->verbosity >= 2) |
443 | printf("Using remote notes for %s\n", | |
e910bb1e | 444 | oid_to_hex(&p->obj)); |
5ee8a954 | 445 | if (add_note(t, &p->obj, &p->remote, combine_notes_overwrite)) |
033abf97 | 446 | BUG("combine_notes_overwrite failed"); |
3228e671 JH |
447 | return 0; |
448 | case NOTES_MERGE_RESOLVE_UNION: | |
5f9f8d15 JN |
449 | if (o->verbosity >= 2) |
450 | printf("Concatenating local and remote notes for %s\n", | |
e910bb1e | 451 | oid_to_hex(&p->obj)); |
5ee8a954 | 452 | if (add_note(t, &p->obj, &p->remote, combine_notes_concatenate)) |
3228e671 JH |
453 | die("failed to concatenate notes " |
454 | "(combine_notes_concatenate)"); | |
455 | return 0; | |
a6a09095 | 456 | case NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ: |
5f9f8d15 JN |
457 | if (o->verbosity >= 2) |
458 | printf("Concatenating unique lines in local and remote " | |
e910bb1e | 459 | "notes for %s\n", oid_to_hex(&p->obj)); |
5ee8a954 | 460 | if (add_note(t, &p->obj, &p->remote, combine_notes_cat_sort_uniq)) |
a6a09095 JH |
461 | die("failed to concatenate notes " |
462 | "(combine_notes_cat_sort_uniq)"); | |
463 | return 0; | |
3228e671 JH |
464 | } |
465 | die("Unknown strategy (%i).", o->strategy); | |
466 | } | |
467 | ||
2085b16a JH |
468 | static int merge_changes(struct notes_merge_options *o, |
469 | struct notes_merge_pair *changes, int *num_changes, | |
470 | struct notes_tree *t) | |
471 | { | |
472 | int i, conflicts = 0; | |
473 | ||
474 | trace_printf("\tmerge_changes(num_changes = %i)\n", *num_changes); | |
475 | for (i = 0; i < *num_changes; i++) { | |
476 | struct notes_merge_pair *p = changes + i; | |
477 | trace_printf("\t\t%.7s: %.7s -> %.7s/%.7s\n", | |
e910bb1e | 478 | oid_to_hex(&p->obj), oid_to_hex(&p->base), |
479 | oid_to_hex(&p->local), | |
480 | oid_to_hex(&p->remote)); | |
2085b16a | 481 | |
e910bb1e | 482 | if (!oidcmp(&p->base, &p->remote)) { |
2085b16a JH |
483 | /* no remote change; nothing to do */ |
484 | trace_printf("\t\t\tskipping (no remote change)\n"); | |
e910bb1e | 485 | } else if (!oidcmp(&p->local, &p->remote)) { |
2085b16a JH |
486 | /* same change in local and remote; nothing to do */ |
487 | trace_printf("\t\t\tskipping (local == remote)\n"); | |
e910bb1e | 488 | } else if (!oidcmp(&p->local, &uninitialized) || |
489 | !oidcmp(&p->local, &p->base)) { | |
2085b16a JH |
490 | /* no local change; adopt remote change */ |
491 | trace_printf("\t\t\tno local change, adopted remote\n"); | |
5ee8a954 | 492 | if (add_note(t, &p->obj, &p->remote, |
2085b16a | 493 | combine_notes_overwrite)) |
033abf97 | 494 | BUG("combine_notes_overwrite failed"); |
2085b16a JH |
495 | } else { |
496 | /* need file-level merge between local and remote */ | |
497 | trace_printf("\t\t\tneed content-level merge\n"); | |
3228e671 | 498 | conflicts += merge_one_change(o, p, t); |
2085b16a JH |
499 | } |
500 | } | |
501 | ||
502 | return conflicts; | |
503 | } | |
504 | ||
505 | static int merge_from_diffs(struct notes_merge_options *o, | |
9d6babb2 BW |
506 | const struct object_id *base, |
507 | const struct object_id *local, | |
508 | const struct object_id *remote, | |
509 | struct notes_tree *t) | |
2085b16a JH |
510 | { |
511 | struct notes_merge_pair *changes; | |
512 | int num_changes, conflicts; | |
513 | ||
514 | trace_printf("\tmerge_from_diffs(base = %.7s, local = %.7s, " | |
9d6babb2 BW |
515 | "remote = %.7s)\n", oid_to_hex(base), oid_to_hex(local), |
516 | oid_to_hex(remote)); | |
2085b16a JH |
517 | |
518 | changes = diff_tree_remote(o, base, remote, &num_changes); | |
519 | diff_tree_local(o, changes, num_changes, base, local); | |
520 | ||
521 | conflicts = merge_changes(o, changes, &num_changes, t); | |
522 | free(changes); | |
523 | ||
5f9f8d15 | 524 | if (o->verbosity >= 4) |
2ca0c53b NTND |
525 | printf(t->dirty ? |
526 | "Merge result: %i unmerged notes and a dirty notes tree\n" : | |
527 | "Merge result: %i unmerged notes and a clean notes tree\n", | |
528 | conflicts); | |
2085b16a JH |
529 | |
530 | return conflicts ? -1 : 1; | |
531 | } | |
532 | ||
75ef3f4a | 533 | int notes_merge(struct notes_merge_options *o, |
2085b16a | 534 | struct notes_tree *local_tree, |
5237e0eb | 535 | struct object_id *result_oid) |
75ef3f4a | 536 | { |
1e43ed98 | 537 | struct object_id local_oid, remote_oid; |
75ef3f4a JH |
538 | struct commit *local, *remote; |
539 | struct commit_list *bases = NULL; | |
5237e0eb | 540 | const struct object_id *base_oid, *base_tree_oid; |
75ef3f4a JH |
541 | int result = 0; |
542 | ||
543 | assert(o->local_ref && o->remote_ref); | |
2085b16a | 544 | assert(!strcmp(o->local_ref, local_tree->ref)); |
5237e0eb | 545 | oidclr(result_oid); |
75ef3f4a JH |
546 | |
547 | trace_printf("notes_merge(o->local_ref = %s, o->remote_ref = %s)\n", | |
548 | o->local_ref, o->remote_ref); | |
549 | ||
550 | /* Dereference o->local_ref into local_sha1 */ | |
34c290a6 | 551 | if (read_ref_full(o->local_ref, 0, &local_oid, NULL)) |
75ef3f4a | 552 | die("Failed to resolve local notes ref '%s'", o->local_ref); |
8d9c5010 | 553 | else if (!check_refname_format(o->local_ref, 0) && |
1e43ed98 | 554 | is_null_oid(&local_oid)) |
5237e0eb | 555 | local = NULL; /* local_oid == null_oid indicates unborn ref */ |
bc83266a | 556 | else if (!(local = lookup_commit_reference(&local_oid))) |
75ef3f4a | 557 | die("Could not parse local commit %s (%s)", |
1e43ed98 | 558 | oid_to_hex(&local_oid), o->local_ref); |
559 | trace_printf("\tlocal commit: %.7s\n", oid_to_hex(&local_oid)); | |
75ef3f4a | 560 | |
5237e0eb | 561 | /* Dereference o->remote_ref into remote_oid */ |
1e43ed98 | 562 | if (get_oid(o->remote_ref, &remote_oid)) { |
75ef3f4a | 563 | /* |
5237e0eb | 564 | * Failed to get remote_oid. If o->remote_ref looks like an |
75ef3f4a JH |
565 | * unborn ref, perform the merge using an empty notes tree. |
566 | */ | |
8d9c5010 | 567 | if (!check_refname_format(o->remote_ref, 0)) { |
1e43ed98 | 568 | oidclr(&remote_oid); |
75ef3f4a JH |
569 | remote = NULL; |
570 | } else { | |
571 | die("Failed to resolve remote notes ref '%s'", | |
572 | o->remote_ref); | |
573 | } | |
bc83266a | 574 | } else if (!(remote = lookup_commit_reference(&remote_oid))) { |
75ef3f4a | 575 | die("Could not parse remote commit %s (%s)", |
1e43ed98 | 576 | oid_to_hex(&remote_oid), o->remote_ref); |
75ef3f4a | 577 | } |
1e43ed98 | 578 | trace_printf("\tremote commit: %.7s\n", oid_to_hex(&remote_oid)); |
75ef3f4a JH |
579 | |
580 | if (!local && !remote) | |
581 | die("Cannot merge empty notes ref (%s) into empty notes ref " | |
582 | "(%s)", o->remote_ref, o->local_ref); | |
583 | if (!local) { | |
584 | /* result == remote commit */ | |
5237e0eb | 585 | oidcpy(result_oid, &remote_oid); |
75ef3f4a JH |
586 | goto found_result; |
587 | } | |
588 | if (!remote) { | |
589 | /* result == local commit */ | |
5237e0eb | 590 | oidcpy(result_oid, &local_oid); |
75ef3f4a JH |
591 | goto found_result; |
592 | } | |
593 | assert(local && remote); | |
594 | ||
595 | /* Find merge bases */ | |
2ce406cc | 596 | bases = get_merge_bases(local, remote); |
75ef3f4a | 597 | if (!bases) { |
5237e0eb | 598 | base_oid = &null_oid; |
eb0ccfd7 | 599 | base_tree_oid = the_hash_algo->empty_tree; |
5f9f8d15 JN |
600 | if (o->verbosity >= 4) |
601 | printf("No merge base found; doing history-less merge\n"); | |
75ef3f4a | 602 | } else if (!bases->next) { |
5237e0eb | 603 | base_oid = &bases->item->object.oid; |
2e27bd77 | 604 | base_tree_oid = get_commit_tree_oid(bases->item); |
5f9f8d15 JN |
605 | if (o->verbosity >= 4) |
606 | printf("One merge base found (%.7s)\n", | |
5237e0eb | 607 | oid_to_hex(base_oid)); |
75ef3f4a JH |
608 | } else { |
609 | /* TODO: How to handle multiple merge-bases? */ | |
5237e0eb | 610 | base_oid = &bases->item->object.oid; |
2e27bd77 | 611 | base_tree_oid = get_commit_tree_oid(bases->item); |
5f9f8d15 JN |
612 | if (o->verbosity >= 3) |
613 | printf("Multiple merge bases found. Using the first " | |
5237e0eb | 614 | "(%.7s)\n", oid_to_hex(base_oid)); |
75ef3f4a JH |
615 | } |
616 | ||
5f9f8d15 JN |
617 | if (o->verbosity >= 4) |
618 | printf("Merging remote commit %.7s into local commit %.7s with " | |
f2fd0760 | 619 | "merge-base %.7s\n", oid_to_hex(&remote->object.oid), |
620 | oid_to_hex(&local->object.oid), | |
5237e0eb | 621 | oid_to_hex(base_oid)); |
75ef3f4a | 622 | |
5237e0eb | 623 | if (!oidcmp(&remote->object.oid, base_oid)) { |
75ef3f4a | 624 | /* Already merged; result == local commit */ |
5f9f8d15 | 625 | if (o->verbosity >= 2) |
7560f547 | 626 | printf("Already up to date!\n"); |
5237e0eb | 627 | oidcpy(result_oid, &local->object.oid); |
75ef3f4a JH |
628 | goto found_result; |
629 | } | |
5237e0eb | 630 | if (!oidcmp(&local->object.oid, base_oid)) { |
75ef3f4a | 631 | /* Fast-forward; result == remote commit */ |
5f9f8d15 JN |
632 | if (o->verbosity >= 2) |
633 | printf("Fast-forward\n"); | |
5237e0eb | 634 | oidcpy(result_oid, &remote->object.oid); |
75ef3f4a JH |
635 | goto found_result; |
636 | } | |
637 | ||
2e27bd77 DS |
638 | result = merge_from_diffs(o, base_tree_oid, |
639 | get_commit_tree_oid(local), | |
640 | get_commit_tree_oid(remote), local_tree); | |
2085b16a | 641 | |
809f38c8 JH |
642 | if (result != 0) { /* non-trivial merge (with or without conflicts) */ |
643 | /* Commit (partial) result */ | |
2085b16a JH |
644 | struct commit_list *parents = NULL; |
645 | commit_list_insert(remote, &parents); /* LIFO order */ | |
646 | commit_list_insert(local, &parents); | |
5078f344 PO |
647 | create_notes_commit(local_tree, parents, o->commit_msg.buf, |
648 | o->commit_msg.len, result_oid); | |
2085b16a | 649 | } |
75ef3f4a JH |
650 | |
651 | found_result: | |
652 | free_commit_list(bases); | |
443259cf | 653 | strbuf_release(&(o->commit_msg)); |
5237e0eb BW |
654 | trace_printf("notes_merge(): result = %i, result_oid = %.7s\n", |
655 | result, oid_to_hex(result_oid)); | |
75ef3f4a JH |
656 | return result; |
657 | } | |
6abb3655 JH |
658 | |
659 | int notes_merge_commit(struct notes_merge_options *o, | |
660 | struct notes_tree *partial_tree, | |
661 | struct commit *partial_commit, | |
5237e0eb | 662 | struct object_id *result_oid) |
6abb3655 JH |
663 | { |
664 | /* | |
665 | * Iterate through files in .git/NOTES_MERGE_WORKTREE and add all | |
a0be62c1 | 666 | * found notes to 'partial_tree'. Write the updated notes tree to |
6abb3655 JH |
667 | * the DB, and commit the resulting tree object while reusing the |
668 | * commit message and parents from 'partial_commit'. | |
5237e0eb | 669 | * Finally store the new commit object OID into 'result_oid'. |
6abb3655 | 670 | */ |
a0be62c1 JH |
671 | DIR *dir; |
672 | struct dirent *e; | |
673 | struct strbuf path = STRBUF_INIT; | |
8597ea3a | 674 | const char *buffer = get_commit_buffer(partial_commit, NULL); |
bc6b8fc1 | 675 | const char *msg = strstr(buffer, "\n\n"); |
a0be62c1 | 676 | int baselen; |
6abb3655 | 677 | |
8c2ca3a6 | 678 | git_path_buf(&path, NOTES_MERGE_WORKTREE); |
5f9f8d15 | 679 | if (o->verbosity >= 3) |
a0be62c1 JH |
680 | printf("Committing notes in notes merge worktree at %s\n", |
681 | path.buf); | |
6abb3655 JH |
682 | |
683 | if (!msg || msg[2] == '\0') | |
684 | die("partial notes commit has empty message"); | |
685 | msg += 2; | |
686 | ||
a0be62c1 JH |
687 | dir = opendir(path.buf); |
688 | if (!dir) | |
689 | die_errno("could not open %s", path.buf); | |
690 | ||
691 | strbuf_addch(&path, '/'); | |
692 | baselen = path.len; | |
693 | while ((e = readdir(dir)) != NULL) { | |
6abb3655 | 694 | struct stat st; |
5ee8a954 | 695 | struct object_id obj_oid, blob_oid; |
6abb3655 | 696 | |
a0be62c1 JH |
697 | if (is_dot_or_dotdot(e->d_name)) |
698 | continue; | |
699 | ||
5ee8a954 | 700 | if (get_oid_hex(e->d_name, &obj_oid)) { |
5f9f8d15 | 701 | if (o->verbosity >= 3) |
a0be62c1 JH |
702 | printf("Skipping non-SHA1 entry '%s%s'\n", |
703 | path.buf, e->d_name); | |
6abb3655 JH |
704 | continue; |
705 | } | |
706 | ||
a0be62c1 | 707 | strbuf_addstr(&path, e->d_name); |
6abb3655 | 708 | /* write file as blob, and add to partial_tree */ |
a0be62c1 JH |
709 | if (stat(path.buf, &st)) |
710 | die_errno("Failed to stat '%s'", path.buf); | |
98e019b0 | 711 | if (index_path(&blob_oid, path.buf, &st, HASH_WRITE_OBJECT)) |
a0be62c1 | 712 | die("Failed to write blob object from '%s'", path.buf); |
5ee8a954 | 713 | if (add_note(partial_tree, &obj_oid, &blob_oid, NULL)) |
6abb3655 | 714 | die("Failed to add resolved note '%s' to notes tree", |
a0be62c1 | 715 | path.buf); |
5f9f8d15 JN |
716 | if (o->verbosity >= 4) |
717 | printf("Added resolved note for object %s: %s\n", | |
5ee8a954 | 718 | oid_to_hex(&obj_oid), oid_to_hex(&blob_oid)); |
a0be62c1 | 719 | strbuf_setlen(&path, baselen); |
6abb3655 JH |
720 | } |
721 | ||
5078f344 PO |
722 | create_notes_commit(partial_tree, partial_commit->parents, msg, |
723 | strlen(msg), result_oid); | |
bc6b8fc1 | 724 | unuse_commit_buffer(partial_commit, buffer); |
5f9f8d15 JN |
725 | if (o->verbosity >= 4) |
726 | printf("Finalized notes merge commit: %s\n", | |
5237e0eb | 727 | oid_to_hex(result_oid)); |
a0be62c1 JH |
728 | strbuf_release(&path); |
729 | closedir(dir); | |
6abb3655 JH |
730 | return 0; |
731 | } | |
732 | ||
733 | int notes_merge_abort(struct notes_merge_options *o) | |
734 | { | |
dabba590 JH |
735 | /* |
736 | * Remove all files within .git/NOTES_MERGE_WORKTREE. We do not remove | |
737 | * the .git/NOTES_MERGE_WORKTREE directory itself, since it might be | |
738 | * the current working directory of the user. | |
739 | */ | |
6abb3655 JH |
740 | struct strbuf buf = STRBUF_INIT; |
741 | int ret; | |
742 | ||
8c2ca3a6 | 743 | git_path_buf(&buf, NOTES_MERGE_WORKTREE); |
5f9f8d15 | 744 | if (o->verbosity >= 3) |
dabba590 JH |
745 | printf("Removing notes merge worktree at %s/*\n", buf.buf); |
746 | ret = remove_dir_recursively(&buf, REMOVE_DIR_KEEP_TOPLEVEL); | |
6abb3655 JH |
747 | strbuf_release(&buf); |
748 | return ret; | |
749 | } |