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