]>
Commit | Line | Data |
---|---|---|
ed09aef0 | 1 | #include "cache.h" |
3f5787f8 | 2 | #include "repository.h" |
6e122b44 | 3 | #include "tempfile.h" |
697cc8ef | 4 | #include "lockfile.h" |
cbd53a21 | 5 | #include "object-store.h" |
ed09aef0 | 6 | #include "commit.h" |
abef3a16 | 7 | #include "tag.h" |
3125fe52 | 8 | #include "pkt-line.h" |
58babfff NTND |
9 | #include "remote.h" |
10 | #include "refs.h" | |
11 | #include "sha1-array.h" | |
12 | #include "diff.h" | |
13 | #include "revision.h" | |
14 | #include "commit-slab.h" | |
3d9ff4d7 NTND |
15 | #include "revision.h" |
16 | #include "list-objects.h" | |
ed09aef0 JS |
17 | |
18 | static int is_shallow = -1; | |
0cc77c38 | 19 | static struct stat_validity shallow_stat; |
6035d6aa NTND |
20 | static char *alternate_shallow_file; |
21 | ||
6a2df51c | 22 | void set_alternate_shallow_file_the_repository(const char *path, int override) |
6035d6aa NTND |
23 | { |
24 | if (is_shallow != -1) | |
25 | die("BUG: is_repository_shallow must not be called before set_alternate_shallow_file"); | |
069c0532 NTND |
26 | if (alternate_shallow_file && !override) |
27 | return; | |
6035d6aa | 28 | free(alternate_shallow_file); |
8c53f071 | 29 | alternate_shallow_file = xstrdup_or_null(path); |
6035d6aa | 30 | } |
ed09aef0 | 31 | |
19143f13 | 32 | int register_shallow_the_repository(const struct object_id *oid) |
ed09aef0 JS |
33 | { |
34 | struct commit_graft *graft = | |
35 | xmalloc(sizeof(struct commit_graft)); | |
bc83266a | 36 | struct commit *commit = lookup_commit(oid); |
ed09aef0 | 37 | |
e92b848c | 38 | oidcpy(&graft->oid, oid); |
ed09aef0 JS |
39 | graft->nr_parent = -1; |
40 | if (commit && commit->object.parsed) | |
41 | commit->parents = NULL; | |
3f5787f8 | 42 | return register_commit_graft(the_repository, graft, 0); |
ed09aef0 JS |
43 | } |
44 | ||
f43117a6 | 45 | int is_repository_shallow(void) |
ed09aef0 JS |
46 | { |
47 | FILE *fp; | |
48 | char buf[1024]; | |
6035d6aa | 49 | const char *path = alternate_shallow_file; |
ed09aef0 JS |
50 | |
51 | if (is_shallow >= 0) | |
52 | return is_shallow; | |
53 | ||
6035d6aa | 54 | if (!path) |
f932729c | 55 | path = git_path_shallow(); |
6035d6aa NTND |
56 | /* |
57 | * fetch-pack sets '--shallow-file ""' as an indicator that no | |
58 | * shallow file should be used. We could just open it and it | |
59 | * will likely fail. But let's do an explicit check instead. | |
60 | */ | |
0cc77c38 JK |
61 | if (!*path || (fp = fopen(path, "r")) == NULL) { |
62 | stat_validity_clear(&shallow_stat); | |
ed09aef0 JS |
63 | is_shallow = 0; |
64 | return is_shallow; | |
65 | } | |
0cc77c38 | 66 | stat_validity_update(&shallow_stat, fileno(fp)); |
ed09aef0 JS |
67 | is_shallow = 1; |
68 | ||
69 | while (fgets(buf, sizeof(buf), fp)) { | |
e92b848c | 70 | struct object_id oid; |
71 | if (get_oid_hex(buf, &oid)) | |
ed09aef0 | 72 | die("bad shallow line: %s", buf); |
19143f13 | 73 | register_shallow(the_repository, &oid); |
ed09aef0 JS |
74 | } |
75 | fclose(fp); | |
76 | return is_shallow; | |
77 | } | |
78 | ||
f53514bc JS |
79 | struct commit_list *get_shallow_commits(struct object_array *heads, int depth, |
80 | int shallow_flag, int not_shallow_flag) | |
ed09aef0 JS |
81 | { |
82 | int i = 0, cur_depth = 0; | |
83 | struct commit_list *result = NULL; | |
3cd47459 | 84 | struct object_array stack = OBJECT_ARRAY_INIT; |
ed09aef0 | 85 | struct commit *commit = NULL; |
79d3a236 | 86 | struct commit_graft *graft; |
ed09aef0 JS |
87 | |
88 | while (commit || i < heads->nr || stack.nr) { | |
89 | struct commit_list *p; | |
90 | if (!commit) { | |
91 | if (i < heads->nr) { | |
92 | commit = (struct commit *) | |
abef3a16 | 93 | deref_tag(heads->objects[i++].item, NULL, 0); |
affeef12 | 94 | if (!commit || commit->object.type != OBJ_COMMIT) { |
ed09aef0 JS |
95 | commit = NULL; |
96 | continue; | |
97 | } | |
d64d6c9f AJ |
98 | if (!commit->util) |
99 | commit->util = xmalloc(sizeof(int)); | |
100 | *(int *)commit->util = 0; | |
ed09aef0 JS |
101 | cur_depth = 0; |
102 | } else { | |
103 | commit = (struct commit *) | |
71992039 | 104 | object_array_pop(&stack); |
ed09aef0 JS |
105 | cur_depth = *(int *)commit->util; |
106 | } | |
107 | } | |
367068e0 | 108 | parse_commit_or_die(commit); |
ed09aef0 | 109 | cur_depth++; |
79d3a236 NTND |
110 | if ((depth != INFINITE_DEPTH && cur_depth >= depth) || |
111 | (is_repository_shallow() && !commit->parents && | |
1f93ecd1 | 112 | (graft = lookup_commit_graft(the_repository, &commit->object.oid)) != NULL && |
79d3a236 | 113 | graft->nr_parent < 0)) { |
682c7d2f NTND |
114 | commit_list_insert(commit, &result); |
115 | commit->object.flags |= shallow_flag; | |
116 | commit = NULL; | |
117 | continue; | |
118 | } | |
119 | commit->object.flags |= not_shallow_flag; | |
ed09aef0 JS |
120 | for (p = commit->parents, commit = NULL; p; p = p->next) { |
121 | if (!p->item->util) { | |
122 | int *pointer = xmalloc(sizeof(int)); | |
123 | p->item->util = pointer; | |
124 | *pointer = cur_depth; | |
125 | } else { | |
126 | int *pointer = p->item->util; | |
127 | if (cur_depth >= *pointer) | |
128 | continue; | |
129 | *pointer = cur_depth; | |
130 | } | |
4b796951 MK |
131 | if (p->next) |
132 | add_object_array(&p->item->object, | |
133 | NULL, &stack); | |
134 | else { | |
135 | commit = p->item; | |
136 | cur_depth = *(int *)commit->util; | |
f53514bc | 137 | } |
ed09aef0 JS |
138 | } |
139 | } | |
140 | ||
141 | return result; | |
142 | } | |
6035d6aa | 143 | |
3d9ff4d7 NTND |
144 | static void show_commit(struct commit *commit, void *data) |
145 | { | |
146 | commit_list_insert(commit, data); | |
147 | } | |
148 | ||
149 | /* | |
150 | * Given rev-list arguments, run rev-list. All reachable commits | |
151 | * except border ones are marked with not_shallow_flag. Border commits | |
152 | * are marked with shallow_flag. The list of border/shallow commits | |
153 | * are also returned. | |
154 | */ | |
155 | struct commit_list *get_shallow_commits_by_rev_list(int ac, const char **av, | |
156 | int shallow_flag, | |
157 | int not_shallow_flag) | |
158 | { | |
159 | struct commit_list *result = NULL, *p; | |
160 | struct commit_list *not_shallow_list = NULL; | |
161 | struct rev_info revs; | |
162 | int both_flags = shallow_flag | not_shallow_flag; | |
163 | ||
164 | /* | |
165 | * SHALLOW (excluded) and NOT_SHALLOW (included) should not be | |
166 | * set at this point. But better be safe than sorry. | |
167 | */ | |
168 | clear_object_flags(both_flags); | |
169 | ||
170 | is_repository_shallow(); /* make sure shallows are read */ | |
171 | ||
172 | init_revisions(&revs, NULL); | |
173 | save_commit_buffer = 0; | |
174 | setup_revisions(ac, av, &revs, NULL); | |
175 | ||
176 | if (prepare_revision_walk(&revs)) | |
177 | die("revision walk setup failed"); | |
178 | traverse_commit_list(&revs, show_commit, NULL, ¬_shallow_list); | |
179 | ||
180 | /* Mark all reachable commits as NOT_SHALLOW */ | |
181 | for (p = not_shallow_list; p; p = p->next) | |
182 | p->item->object.flags |= not_shallow_flag; | |
183 | ||
184 | /* | |
185 | * mark border commits SHALLOW + NOT_SHALLOW. | |
186 | * We cannot clear NOT_SHALLOW right now. Imagine border | |
187 | * commit A is processed first, then commit B, whose parent is | |
188 | * A, later. If NOT_SHALLOW on A is cleared at step 1, B | |
189 | * itself is considered border at step 2, which is incorrect. | |
190 | */ | |
191 | for (p = not_shallow_list; p; p = p->next) { | |
192 | struct commit *c = p->item; | |
193 | struct commit_list *parent; | |
194 | ||
195 | if (parse_commit(c)) | |
196 | die("unable to parse commit %s", | |
197 | oid_to_hex(&c->object.oid)); | |
198 | ||
199 | for (parent = c->parents; parent; parent = parent->next) | |
200 | if (!(parent->item->object.flags & not_shallow_flag)) { | |
201 | c->object.flags |= shallow_flag; | |
202 | commit_list_insert(c, &result); | |
203 | break; | |
204 | } | |
205 | } | |
206 | free_commit_list(not_shallow_list); | |
207 | ||
208 | /* | |
209 | * Now we can clean up NOT_SHALLOW on border commits. Having | |
210 | * both flags set can confuse the caller. | |
211 | */ | |
212 | for (p = result; p; p = p->next) { | |
213 | struct object *o = &p->item->object; | |
214 | if ((o->flags & both_flags) == both_flags) | |
215 | o->flags &= ~not_shallow_flag; | |
216 | } | |
217 | return result; | |
218 | } | |
219 | ||
22bdc7c4 SB |
220 | #define check_shallow_file_for_update(r) check_shallow_file_for_update_##r() |
221 | static void check_shallow_file_for_update_the_repository(void) | |
6035d6aa | 222 | { |
0cc77c38 | 223 | if (is_shallow == -1) |
6035d6aa NTND |
224 | die("BUG: shallow must be initialized by now"); |
225 | ||
f932729c | 226 | if (!stat_validity_check(&shallow_stat, git_path_shallow())) |
0cc77c38 | 227 | die("shallow file has changed since we read it"); |
6035d6aa | 228 | } |
3125fe52 | 229 | |
eab3296c NTND |
230 | #define SEEN_ONLY 1 |
231 | #define VERBOSE 2 | |
232 | ||
3125fe52 NTND |
233 | struct write_shallow_data { |
234 | struct strbuf *out; | |
235 | int use_pack_protocol; | |
236 | int count; | |
eab3296c | 237 | unsigned flags; |
3125fe52 NTND |
238 | }; |
239 | ||
240 | static int write_one_shallow(const struct commit_graft *graft, void *cb_data) | |
241 | { | |
242 | struct write_shallow_data *data = cb_data; | |
7683e2e6 | 243 | const char *hex = oid_to_hex(&graft->oid); |
6a3bbb4d NTND |
244 | if (graft->nr_parent != -1) |
245 | return 0; | |
eab3296c | 246 | if (data->flags & SEEN_ONLY) { |
bc83266a | 247 | struct commit *c = lookup_commit(&graft->oid); |
eab3296c NTND |
248 | if (!c || !(c->object.flags & SEEN)) { |
249 | if (data->flags & VERBOSE) | |
250 | printf("Removing %s from .git/shallow\n", | |
f2fd0760 | 251 | oid_to_hex(&c->object.oid)); |
eab3296c NTND |
252 | return 0; |
253 | } | |
254 | } | |
3125fe52 NTND |
255 | data->count++; |
256 | if (data->use_pack_protocol) | |
257 | packet_buf_write(data->out, "shallow %s", hex); | |
258 | else { | |
259 | strbuf_addstr(data->out, hex); | |
260 | strbuf_addch(data->out, '\n'); | |
261 | } | |
262 | return 0; | |
263 | } | |
264 | ||
eab3296c | 265 | static int write_shallow_commits_1(struct strbuf *out, int use_pack_protocol, |
910650d2 | 266 | const struct oid_array *extra, |
eab3296c | 267 | unsigned flags) |
3125fe52 NTND |
268 | { |
269 | struct write_shallow_data data; | |
1a30f5a2 | 270 | int i; |
3125fe52 NTND |
271 | data.out = out; |
272 | data.use_pack_protocol = use_pack_protocol; | |
273 | data.count = 0; | |
eab3296c | 274 | data.flags = flags; |
3125fe52 | 275 | for_each_commit_graft(write_one_shallow, &data); |
1a30f5a2 NTND |
276 | if (!extra) |
277 | return data.count; | |
278 | for (i = 0; i < extra->nr; i++) { | |
ee3051bd | 279 | strbuf_addstr(out, oid_to_hex(extra->oid + i)); |
1a30f5a2 NTND |
280 | strbuf_addch(out, '\n'); |
281 | data.count++; | |
282 | } | |
3125fe52 NTND |
283 | return data.count; |
284 | } | |
285 | ||
eab3296c | 286 | int write_shallow_commits(struct strbuf *out, int use_pack_protocol, |
910650d2 | 287 | const struct oid_array *extra) |
eab3296c NTND |
288 | { |
289 | return write_shallow_commits_1(out, use_pack_protocol, extra, 0); | |
290 | } | |
291 | ||
910650d2 | 292 | const char *setup_temporary_shallow(const struct oid_array *extra) |
08ea65ad | 293 | { |
076aa2cb | 294 | struct tempfile *temp; |
08ea65ad | 295 | struct strbuf sb = STRBUF_INIT; |
08ea65ad | 296 | |
1a30f5a2 | 297 | if (write_shallow_commits(&sb, 0, extra)) { |
076aa2cb | 298 | temp = xmks_tempfile(git_path("shallow_XXXXXX")); |
0179c945 | 299 | |
c50424a6 | 300 | if (write_in_full(temp->fd, sb.buf, sb.len) < 0 || |
076aa2cb | 301 | close_tempfile_gently(temp) < 0) |
08ea65ad | 302 | die_errno("failed to write to %s", |
076aa2cb | 303 | get_tempfile_path(temp)); |
08ea65ad | 304 | strbuf_release(&sb); |
076aa2cb | 305 | return get_tempfile_path(temp); |
08ea65ad NTND |
306 | } |
307 | /* | |
308 | * is_repository_shallow() sees empty string as "no shallow | |
309 | * file". | |
310 | */ | |
08990139 | 311 | return ""; |
08ea65ad NTND |
312 | } |
313 | ||
3125fe52 | 314 | void setup_alternate_shallow(struct lock_file *shallow_lock, |
1a30f5a2 | 315 | const char **alternate_shallow_file, |
910650d2 | 316 | const struct oid_array *extra) |
3125fe52 NTND |
317 | { |
318 | struct strbuf sb = STRBUF_INIT; | |
319 | int fd; | |
320 | ||
f932729c | 321 | fd = hold_lock_file_for_update(shallow_lock, git_path_shallow(), |
3125fe52 | 322 | LOCK_DIE_ON_ERROR); |
22bdc7c4 | 323 | check_shallow_file_for_update(the_repository); |
1a30f5a2 | 324 | if (write_shallow_commits(&sb, 0, extra)) { |
06f46f23 | 325 | if (write_in_full(fd, sb.buf, sb.len) < 0) |
3125fe52 | 326 | die_errno("failed to write to %s", |
b4fb09e4 MH |
327 | get_lock_file_path(shallow_lock)); |
328 | *alternate_shallow_file = get_lock_file_path(shallow_lock); | |
3125fe52 NTND |
329 | } else |
330 | /* | |
331 | * is_repository_shallow() sees empty string as "no | |
332 | * shallow file". | |
333 | */ | |
334 | *alternate_shallow_file = ""; | |
335 | strbuf_release(&sb); | |
336 | } | |
ad491366 NTND |
337 | |
338 | static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb) | |
339 | { | |
340 | int fd = *(int *)cb; | |
341 | if (graft->nr_parent == -1) | |
81c634e9 | 342 | packet_write_fmt(fd, "shallow %s\n", oid_to_hex(&graft->oid)); |
ad491366 NTND |
343 | return 0; |
344 | } | |
345 | ||
346 | void advertise_shallow_grafts(int fd) | |
347 | { | |
348 | if (!is_repository_shallow()) | |
349 | return; | |
350 | for_each_commit_graft(advertise_shallow_grafts_cb, &fd); | |
351 | } | |
58babfff | 352 | |
eab3296c NTND |
353 | /* |
354 | * mark_reachable_objects() should have been run prior to this and all | |
355 | * reachable commits marked as "SEEN". | |
356 | */ | |
357 | void prune_shallow(int show_only) | |
358 | { | |
359 | static struct lock_file shallow_lock; | |
360 | struct strbuf sb = STRBUF_INIT; | |
361 | int fd; | |
362 | ||
363 | if (show_only) { | |
364 | write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY | VERBOSE); | |
365 | strbuf_release(&sb); | |
366 | return; | |
367 | } | |
f932729c | 368 | fd = hold_lock_file_for_update(&shallow_lock, git_path_shallow(), |
eab3296c | 369 | LOCK_DIE_ON_ERROR); |
22bdc7c4 | 370 | check_shallow_file_for_update(the_repository); |
eab3296c | 371 | if (write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY)) { |
06f46f23 | 372 | if (write_in_full(fd, sb.buf, sb.len) < 0) |
eab3296c | 373 | die_errno("failed to write to %s", |
b4fb09e4 | 374 | get_lock_file_path(&shallow_lock)); |
eab3296c NTND |
375 | commit_lock_file(&shallow_lock); |
376 | } else { | |
f932729c | 377 | unlink(git_path_shallow()); |
eab3296c NTND |
378 | rollback_lock_file(&shallow_lock); |
379 | } | |
380 | strbuf_release(&sb); | |
381 | } | |
382 | ||
6aa30857 | 383 | struct trace_key trace_shallow = TRACE_KEY_INIT(SHALLOW); |
58babfff NTND |
384 | |
385 | /* | |
386 | * Step 1, split sender shallow commits into "ours" and "theirs" | |
387 | * Step 2, clean "ours" based on .git/shallow | |
388 | */ | |
910650d2 | 389 | void prepare_shallow_info(struct shallow_info *info, struct oid_array *sa) |
58babfff NTND |
390 | { |
391 | int i; | |
6aa30857 | 392 | trace_printf_key(&trace_shallow, "shallow: prepare_shallow_info\n"); |
58babfff NTND |
393 | memset(info, 0, sizeof(*info)); |
394 | info->shallow = sa; | |
395 | if (!sa) | |
396 | return; | |
b32fa95f JK |
397 | ALLOC_ARRAY(info->ours, sa->nr); |
398 | ALLOC_ARRAY(info->theirs, sa->nr); | |
58babfff | 399 | for (i = 0; i < sa->nr; i++) { |
ee3051bd | 400 | if (has_object_file(sa->oid + i)) { |
58babfff | 401 | struct commit_graft *graft; |
1f93ecd1 JN |
402 | graft = lookup_commit_graft(the_repository, |
403 | &sa->oid[i]); | |
58babfff NTND |
404 | if (graft && graft->nr_parent < 0) |
405 | continue; | |
406 | info->ours[info->nr_ours++] = i; | |
407 | } else | |
408 | info->theirs[info->nr_theirs++] = i; | |
409 | } | |
410 | } | |
411 | ||
412 | void clear_shallow_info(struct shallow_info *info) | |
413 | { | |
414 | free(info->ours); | |
415 | free(info->theirs); | |
416 | } | |
417 | ||
418 | /* Step 4, remove non-existent ones in "theirs" after getting the pack */ | |
419 | ||
420 | void remove_nonexistent_theirs_shallow(struct shallow_info *info) | |
421 | { | |
ee3051bd | 422 | struct object_id *oid = info->shallow->oid; |
58babfff | 423 | int i, dst; |
6aa30857 | 424 | trace_printf_key(&trace_shallow, "shallow: remove_nonexistent_theirs_shallow\n"); |
58babfff NTND |
425 | for (i = dst = 0; i < info->nr_theirs; i++) { |
426 | if (i != dst) | |
427 | info->theirs[dst] = info->theirs[i]; | |
ee3051bd | 428 | if (has_object_file(oid + info->theirs[i])) |
58babfff NTND |
429 | dst++; |
430 | } | |
431 | info->nr_theirs = dst; | |
432 | } | |
433 | ||
8e277383 NTND |
434 | define_commit_slab(ref_bitmap, uint32_t *); |
435 | ||
6bc3d8c5 NTND |
436 | #define POOL_SIZE (512 * 1024) |
437 | ||
8e277383 NTND |
438 | struct paint_info { |
439 | struct ref_bitmap ref_bitmap; | |
440 | unsigned nr_bits; | |
0afd307a | 441 | char **pools; |
8e277383 | 442 | char *free, *end; |
0afd307a | 443 | unsigned pool_count; |
8e277383 NTND |
444 | }; |
445 | ||
446 | static uint32_t *paint_alloc(struct paint_info *info) | |
447 | { | |
42c78a21 | 448 | unsigned nr = DIV_ROUND_UP(info->nr_bits, 32); |
8e277383 NTND |
449 | unsigned size = nr * sizeof(uint32_t); |
450 | void *p; | |
381aa8e7 | 451 | if (!info->pool_count || size > info->end - info->free) { |
f2386c6b NTND |
452 | if (size > POOL_SIZE) |
453 | die("BUG: pool size too small for %d in paint_alloc()", | |
454 | size); | |
0afd307a NTND |
455 | info->pool_count++; |
456 | REALLOC_ARRAY(info->pools, info->pool_count); | |
6bc3d8c5 | 457 | info->free = xmalloc(POOL_SIZE); |
0afd307a | 458 | info->pools[info->pool_count - 1] = info->free; |
6bc3d8c5 | 459 | info->end = info->free + POOL_SIZE; |
8e277383 NTND |
460 | } |
461 | p = info->free; | |
462 | info->free += size; | |
463 | return p; | |
464 | } | |
465 | ||
466 | /* | |
467 | * Given a commit SHA-1, walk down to parents until either SEEN, | |
468 | * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for | |
469 | * all walked commits. | |
470 | */ | |
1e43ed98 | 471 | static void paint_down(struct paint_info *info, const struct object_id *oid, |
1127b3ce | 472 | unsigned int id) |
8e277383 NTND |
473 | { |
474 | unsigned int i, nr; | |
475 | struct commit_list *head = NULL; | |
42c78a21 | 476 | int bitmap_nr = DIV_ROUND_UP(info->nr_bits, 32); |
50492f7b | 477 | size_t bitmap_size = st_mult(sizeof(uint32_t), bitmap_nr); |
bc83266a | 478 | struct commit *c = lookup_commit_reference_gently(oid, 1); |
7c565a6b JS |
479 | uint32_t *tmp; /* to be freed before return */ |
480 | uint32_t *bitmap; | |
481 | ||
8e277383 NTND |
482 | if (!c) |
483 | return; | |
7c565a6b JS |
484 | |
485 | tmp = xmalloc(bitmap_size); | |
486 | bitmap = paint_alloc(info); | |
8e277383 | 487 | memset(bitmap, 0, bitmap_size); |
1127b3ce | 488 | bitmap[id / 32] |= (1U << (id % 32)); |
8e277383 NTND |
489 | commit_list_insert(c, &head); |
490 | while (head) { | |
491 | struct commit_list *p; | |
e510ab89 | 492 | struct commit *c = pop_commit(&head); |
8e277383 NTND |
493 | uint32_t **refs = ref_bitmap_at(&info->ref_bitmap, c); |
494 | ||
8e277383 NTND |
495 | /* XXX check "UNINTERESTING" from pack bitmaps if available */ |
496 | if (c->object.flags & (SEEN | UNINTERESTING)) | |
497 | continue; | |
498 | else | |
499 | c->object.flags |= SEEN; | |
500 | ||
501 | if (*refs == NULL) | |
502 | *refs = bitmap; | |
503 | else { | |
504 | memcpy(tmp, *refs, bitmap_size); | |
505 | for (i = 0; i < bitmap_nr; i++) | |
506 | tmp[i] |= bitmap[i]; | |
507 | if (memcmp(tmp, *refs, bitmap_size)) { | |
508 | *refs = paint_alloc(info); | |
509 | memcpy(*refs, tmp, bitmap_size); | |
510 | } | |
511 | } | |
512 | ||
513 | if (c->object.flags & BOTTOM) | |
514 | continue; | |
515 | ||
516 | if (parse_commit(c)) | |
517 | die("unable to parse commit %s", | |
f2fd0760 | 518 | oid_to_hex(&c->object.oid)); |
8e277383 NTND |
519 | |
520 | for (p = c->parents; p; p = p->next) { | |
8e277383 NTND |
521 | if (p->item->object.flags & SEEN) |
522 | continue; | |
8e277383 NTND |
523 | commit_list_insert(p->item, &head); |
524 | } | |
525 | } | |
526 | ||
527 | nr = get_max_object_index(); | |
528 | for (i = 0; i < nr; i++) { | |
529 | struct object *o = get_indexed_object(i); | |
530 | if (o && o->type == OBJ_COMMIT) | |
531 | o->flags &= ~SEEN; | |
532 | } | |
533 | ||
534 | free(tmp); | |
535 | } | |
536 | ||
580b04ef | 537 | static int mark_uninteresting(const char *refname, const struct object_id *oid, |
8e277383 NTND |
538 | int flags, void *cb_data) |
539 | { | |
bc83266a | 540 | struct commit *commit = lookup_commit_reference_gently(oid, 1); |
8e277383 NTND |
541 | if (!commit) |
542 | return 0; | |
543 | commit->object.flags |= UNINTERESTING; | |
544 | mark_parents_uninteresting(commit); | |
545 | return 0; | |
546 | } | |
547 | ||
548 | static void post_assign_shallow(struct shallow_info *info, | |
549 | struct ref_bitmap *ref_bitmap, | |
550 | int *ref_status); | |
551 | /* | |
552 | * Step 6(+7), associate shallow commits with new refs | |
553 | * | |
554 | * info->ref must be initialized before calling this function. | |
555 | * | |
556 | * If used is not NULL, it's an array of info->shallow->nr | |
557 | * bitmaps. The n-th bit set in the m-th bitmap if ref[n] needs the | |
558 | * m-th shallow commit from info->shallow. | |
559 | * | |
560 | * If used is NULL, "ours" and "theirs" are updated. And if ref_status | |
561 | * is not NULL it's an array of ref->nr ints. ref_status[i] is true if | |
562 | * the ref needs some shallow commits from either info->ours or | |
563 | * info->theirs. | |
564 | */ | |
565 | void assign_shallow_commits_to_refs(struct shallow_info *info, | |
566 | uint32_t **used, int *ref_status) | |
567 | { | |
ee3051bd | 568 | struct object_id *oid = info->shallow->oid; |
910650d2 | 569 | struct oid_array *ref = info->ref; |
8e277383 NTND |
570 | unsigned int i, nr; |
571 | int *shallow, nr_shallow = 0; | |
572 | struct paint_info pi; | |
573 | ||
6aa30857 | 574 | trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n"); |
b32fa95f | 575 | ALLOC_ARRAY(shallow, info->nr_ours + info->nr_theirs); |
8e277383 NTND |
576 | for (i = 0; i < info->nr_ours; i++) |
577 | shallow[nr_shallow++] = info->ours[i]; | |
578 | for (i = 0; i < info->nr_theirs; i++) | |
579 | shallow[nr_shallow++] = info->theirs[i]; | |
580 | ||
581 | /* | |
582 | * Prepare the commit graph to track what refs can reach what | |
583 | * (new) shallow commits. | |
584 | */ | |
585 | nr = get_max_object_index(); | |
586 | for (i = 0; i < nr; i++) { | |
587 | struct object *o = get_indexed_object(i); | |
588 | if (!o || o->type != OBJ_COMMIT) | |
589 | continue; | |
590 | ||
591 | o->flags &= ~(UNINTERESTING | BOTTOM | SEEN); | |
592 | } | |
593 | ||
594 | memset(&pi, 0, sizeof(pi)); | |
595 | init_ref_bitmap(&pi.ref_bitmap); | |
596 | pi.nr_bits = ref->nr; | |
597 | ||
598 | /* | |
599 | * "--not --all" to cut short the traversal if new refs | |
600 | * connect to old refs. If not (e.g. force ref updates) it'll | |
601 | * have to go down to the current shallow commits. | |
602 | */ | |
580b04ef MH |
603 | head_ref(mark_uninteresting, NULL); |
604 | for_each_ref(mark_uninteresting, NULL); | |
8e277383 NTND |
605 | |
606 | /* Mark potential bottoms so we won't go out of bound */ | |
607 | for (i = 0; i < nr_shallow; i++) { | |
bc83266a | 608 | struct commit *c = lookup_commit(&oid[shallow[i]]); |
8e277383 NTND |
609 | c->object.flags |= BOTTOM; |
610 | } | |
611 | ||
612 | for (i = 0; i < ref->nr; i++) | |
1e43ed98 | 613 | paint_down(&pi, ref->oid + i, i); |
8e277383 NTND |
614 | |
615 | if (used) { | |
42c78a21 | 616 | int bitmap_size = DIV_ROUND_UP(pi.nr_bits, 32) * sizeof(uint32_t); |
8e277383 NTND |
617 | memset(used, 0, sizeof(*used) * info->shallow->nr); |
618 | for (i = 0; i < nr_shallow; i++) { | |
bc83266a | 619 | const struct commit *c = lookup_commit(&oid[shallow[i]]); |
8e277383 NTND |
620 | uint32_t **map = ref_bitmap_at(&pi.ref_bitmap, c); |
621 | if (*map) | |
622 | used[shallow[i]] = xmemdupz(*map, bitmap_size); | |
623 | } | |
624 | /* | |
625 | * unreachable shallow commits are not removed from | |
626 | * "ours" and "theirs". The user is supposed to run | |
627 | * step 7 on every ref separately and not trust "ours" | |
628 | * and "theirs" any more. | |
629 | */ | |
630 | } else | |
631 | post_assign_shallow(info, &pi.ref_bitmap, ref_status); | |
632 | ||
633 | clear_ref_bitmap(&pi.ref_bitmap); | |
0afd307a NTND |
634 | for (i = 0; i < pi.pool_count; i++) |
635 | free(pi.pools[i]); | |
636 | free(pi.pools); | |
8e277383 NTND |
637 | free(shallow); |
638 | } | |
639 | ||
640 | struct commit_array { | |
641 | struct commit **commits; | |
642 | int nr, alloc; | |
643 | }; | |
644 | ||
580b04ef MH |
645 | static int add_ref(const char *refname, const struct object_id *oid, |
646 | int flags, void *cb_data) | |
8e277383 NTND |
647 | { |
648 | struct commit_array *ca = cb_data; | |
649 | ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc); | |
bc83266a | 650 | ca->commits[ca->nr] = lookup_commit_reference_gently(oid, 1); |
8e277383 NTND |
651 | if (ca->commits[ca->nr]) |
652 | ca->nr++; | |
653 | return 0; | |
654 | } | |
655 | ||
656 | static void update_refstatus(int *ref_status, int nr, uint32_t *bitmap) | |
657 | { | |
1127b3ce | 658 | unsigned int i; |
8e277383 NTND |
659 | if (!ref_status) |
660 | return; | |
661 | for (i = 0; i < nr; i++) | |
1127b3ce | 662 | if (bitmap[i / 32] & (1U << (i % 32))) |
8e277383 NTND |
663 | ref_status[i]++; |
664 | } | |
665 | ||
666 | /* | |
667 | * Step 7, reachability test on "ours" at commit level | |
668 | */ | |
669 | static void post_assign_shallow(struct shallow_info *info, | |
670 | struct ref_bitmap *ref_bitmap, | |
671 | int *ref_status) | |
672 | { | |
ee3051bd | 673 | struct object_id *oid = info->shallow->oid; |
8e277383 NTND |
674 | struct commit *c; |
675 | uint32_t **bitmap; | |
676 | int dst, i, j; | |
42c78a21 | 677 | int bitmap_nr = DIV_ROUND_UP(info->ref->nr, 32); |
8e277383 NTND |
678 | struct commit_array ca; |
679 | ||
6aa30857 | 680 | trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n"); |
8e277383 NTND |
681 | if (ref_status) |
682 | memset(ref_status, 0, sizeof(*ref_status) * info->ref->nr); | |
683 | ||
684 | /* Remove unreachable shallow commits from "theirs" */ | |
685 | for (i = dst = 0; i < info->nr_theirs; i++) { | |
686 | if (i != dst) | |
687 | info->theirs[dst] = info->theirs[i]; | |
bc83266a | 688 | c = lookup_commit(&oid[info->theirs[i]]); |
8e277383 NTND |
689 | bitmap = ref_bitmap_at(ref_bitmap, c); |
690 | if (!*bitmap) | |
691 | continue; | |
692 | for (j = 0; j < bitmap_nr; j++) | |
693 | if (bitmap[0][j]) { | |
694 | update_refstatus(ref_status, info->ref->nr, *bitmap); | |
695 | dst++; | |
696 | break; | |
697 | } | |
698 | } | |
699 | info->nr_theirs = dst; | |
700 | ||
701 | memset(&ca, 0, sizeof(ca)); | |
580b04ef MH |
702 | head_ref(add_ref, &ca); |
703 | for_each_ref(add_ref, &ca); | |
8e277383 NTND |
704 | |
705 | /* Remove unreachable shallow commits from "ours" */ | |
706 | for (i = dst = 0; i < info->nr_ours; i++) { | |
707 | if (i != dst) | |
708 | info->ours[dst] = info->ours[i]; | |
bc83266a | 709 | c = lookup_commit(&oid[info->ours[i]]); |
8e277383 NTND |
710 | bitmap = ref_bitmap_at(ref_bitmap, c); |
711 | if (!*bitmap) | |
712 | continue; | |
713 | for (j = 0; j < bitmap_nr; j++) | |
714 | if (bitmap[0][j] && | |
715 | /* Step 7, reachability test at commit level */ | |
716 | !in_merge_bases_many(c, ca.nr, ca.commits)) { | |
717 | update_refstatus(ref_status, info->ref->nr, *bitmap); | |
718 | dst++; | |
719 | break; | |
720 | } | |
721 | } | |
722 | info->nr_ours = dst; | |
723 | ||
724 | free(ca.commits); | |
725 | } | |
0a1bc12b NTND |
726 | |
727 | /* (Delayed) step 7, reachability test at commit level */ | |
728 | int delayed_reachability_test(struct shallow_info *si, int c) | |
729 | { | |
730 | if (si->need_reachability_test[c]) { | |
bc83266a | 731 | struct commit *commit = lookup_commit(&si->shallow->oid[c]); |
0a1bc12b NTND |
732 | |
733 | if (!si->commits) { | |
734 | struct commit_array ca; | |
2b2a5be3 | 735 | |
0a1bc12b | 736 | memset(&ca, 0, sizeof(ca)); |
580b04ef MH |
737 | head_ref(add_ref, &ca); |
738 | for_each_ref(add_ref, &ca); | |
0a1bc12b NTND |
739 | si->commits = ca.commits; |
740 | si->nr_commits = ca.nr; | |
741 | } | |
742 | ||
743 | si->reachable[c] = in_merge_bases_many(commit, | |
744 | si->nr_commits, | |
745 | si->commits); | |
746 | si->need_reachability_test[c] = 0; | |
747 | } | |
748 | return si->reachable[c]; | |
749 | } |