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