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