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