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