commit 5bdf77473e318055df46b3a615e1db9a4ba27f32c9744426b5a1cdb69f740030 from: Stefan Sperling date: Thu Jan 30 21:15:35 2025 UTC handle missing parent commits while coloring commits in got-read-pack When a parent is not present in the pack file, handle this situation gracefully rather than erroring out. Fixes a regression introduced with recent got-read-pack coloring changes where commands such as 'got send' could fail with 'got-read-pack: object not found'. commit - 05c041efa065bfbf199159907cdf00275c62e958e672d29ddfe8b1ea77e1ae9f commit + 5bdf77473e318055df46b3a615e1db9a4ba27f32c9744426b5a1cdb69f740030 blob - 1a1a88e8c99433f188ca00b10b35513ad1979c4467a6ebc75593df7412b5bb41 blob + 32ffb3dd3918573f19755aa809112157473faa28b1ea82a838c72fdbed2b77ec --- lib/pack_create_privsep.c +++ lib/pack_create_privsep.c @@ -258,24 +258,29 @@ recv_painted_commit(void *arg, struct got_object_id *i if (err) return err; } - switch (color) { case COLOR_KEEP: - err = got_object_idset_add(a->keep, id, NULL); - if (err) - return err; - (*a->ncolored)++; + if (!got_object_idset_contains(a->keep, id)) { + err = got_object_idset_add(a->keep, id, NULL); + if (err) + return err; + (*a->ncolored)++; + } break; case COLOR_DROP: - err = got_object_idset_add(a->drop, id, NULL); - if (err) - return err; - (*a->ncolored)++; + if (!got_object_idset_contains(a->drop, id)) { + err = got_object_idset_add(a->drop, id, NULL); + if (err) + return err; + (*a->ncolored)++; + } break; case COLOR_SKIP: - err = got_object_idset_add(a->skip, id, NULL); - if (err) - return err; + if (!got_object_idset_contains(a->skip, id)) { + err = got_object_idset_add(a->skip, id, NULL); + if (err) + return err; + } break; default: /* should not happen */ blob - 81a7e22f00754c9a7e422c153992c65bdca978a64503c89813616339b09b69c8 blob + deec3b6590375dae3efb56f4926bb0b823b04c2ae2b110a66b27ccf0a643b640 --- libexec/got-read-pack/got-read-pack.c +++ libexec/got-read-pack/got-read-pack.c @@ -1681,45 +1681,48 @@ queue_commit_id(struct got_object_id_queue *ids, struc } static const struct got_error * -repaint_parent_commits(struct got_object_id *commit_id, int color, - struct got_object_idset *set, struct got_object_idset *skip, +repaint_parent_commits(struct got_object_id *commit_id, int commit_idx, + int color, struct got_object_idset *set, struct got_object_idset *skip, + struct got_object_id_queue *ids, int *nids, + struct got_object_id_queue *painted, int *npainted, struct got_pack *pack, struct got_packidx *packidx, struct got_object_cache *objcache) { const struct got_error *err; - struct got_object_id_queue ids; - struct got_object_qid *qid = NULL; + const struct got_object_id_queue *parents; struct got_commit_object *commit; - const struct got_object_id_queue *parents; - int idx; + struct got_object_id_queue repaint; - STAILQ_INIT(&ids); + STAILQ_INIT(&repaint); - idx = got_packidx_get_object_idx(packidx, commit_id); - if (idx == -1) - return got_error(GOT_ERR_NO_OBJ); - - err = open_commit(&commit, pack, packidx, idx, commit_id, objcache); + err = open_commit(&commit, pack, packidx, commit_idx, commit_id, + objcache); if (err) return err; while (commit) { + struct got_object_qid *pid; + int idx; + parents = got_object_commit_get_parent_ids(commit); if (parents) { - struct got_object_qid *pid; STAILQ_FOREACH(pid, parents, entry) { + idx = got_packidx_get_object_idx(packidx, + &pid->id); /* - * No need to traverse parents which are - * already in the desired set or are - * marked for skipping already. + * No need to traverse parents which are not in + * the pack file, are already in the desired + * set, or are marked for skipping already. */ + if (idx == -1) + continue; if (got_object_idset_contains(set, &pid->id)) continue; - if (skip != set && + if (set != skip && got_object_idset_contains(skip, &pid->id)) continue; - err = queue_commit_id(&ids, &pid->id, color); + err = queue_commit_id(&repaint, &pid->id, color); if (err) break; } @@ -1727,40 +1730,71 @@ repaint_parent_commits(struct got_object_id *commit_id got_object_commit_close(commit); commit = NULL; - qid = STAILQ_FIRST(&ids); - if (qid) { - STAILQ_REMOVE_HEAD(&ids, entry); - if (!got_object_idset_contains(set, &qid->id)) { - err = got_object_idset_add(set, &qid->id, - NULL); + pid = STAILQ_FIRST(&repaint); + if (pid) { + struct got_object_qid *qid, *tmp; + + err = paint_commit(pid, color); + if (err) + break; + + if (!got_object_idset_contains(set, &pid->id)) { + err = got_object_idset_add(set, &pid->id, NULL); if (err) break; } - idx = got_packidx_get_object_idx(packidx, &qid->id); + STAILQ_REMOVE_HEAD(&repaint, entry); + + /* Insert or replace this commit on the painted list. */ + STAILQ_FOREACH(qid, painted, entry) { + if (got_object_id_cmp(&qid->id, &pid->id) != 0) + continue; + paint_commit(qid, color); + got_object_qid_free(pid); + pid = qid; + break; + } + if (qid == NULL) { + STAILQ_INSERT_TAIL(painted, pid, entry); + (*npainted)++; + } + + /* + * In case this commit is on the caller's list of + * pending commits to traverse, repaint it there. + */ + STAILQ_FOREACH_SAFE(qid, ids, entry, tmp) { + if (got_object_id_cmp(&qid->id, &pid->id) != 0) + continue; + paint_commit(qid, color); + break; + } + + idx = got_packidx_get_object_idx(packidx, &pid->id); if (idx == -1) { + /* + * Should not happen because we only queue + * parents which exist in our pack file. + */ err = got_error(GOT_ERR_NO_OBJ); break; } err = open_commit(&commit, pack, packidx, idx, - &qid->id, objcache); + &pid->id, objcache); if (err) break; - - got_object_qid_free(qid); - qid = NULL; } } if (commit) got_object_commit_close(commit); - if (qid) - got_object_qid_free(qid); - got_object_id_queue_free(&ids); + got_object_id_queue_free(&repaint); return err; } + static const struct got_error * paint_commits(struct got_object_id_queue *ids, int *nids, struct got_object_idset *keep, struct got_object_idset *drop, @@ -1807,11 +1841,6 @@ paint_commits(struct got_object_id_queue *ids, int *ni switch (color) { case COLOR_KEEP: - if (got_object_idset_contains(keep, &qid->id)) { - got_object_qid_free(qid); - qid = NULL; - continue; - } if (got_object_idset_contains(drop, &qid->id)) { err = paint_commit(qid, COLOR_SKIP); if (err) @@ -1820,22 +1849,22 @@ paint_commits(struct got_object_id_queue *ids, int *ni NULL); if (err) goto done; - err = repaint_parent_commits(&qid->id, - COLOR_SKIP, skip, skip, pack, packidx, + err = repaint_parent_commits(&qid->id, idx, + COLOR_SKIP, skip, skip, ids, nids, + &painted, &npainted, pack, packidx, objcache); if (err) goto done; + break; } - err = got_object_idset_add(keep, &qid->id, NULL); - if (err) - goto done; + if (!got_object_idset_contains(keep, &qid->id)) { + err = got_object_idset_add(keep, &qid->id, + NULL); + if (err) + goto done; + } break; case COLOR_DROP: - if (got_object_idset_contains(drop, &qid->id)) { - got_object_qid_free(qid); - qid = NULL; - continue; - } if (got_object_idset_contains(keep, &qid->id)) { err = paint_commit(qid, COLOR_SKIP); if (err) @@ -1844,23 +1873,26 @@ paint_commits(struct got_object_id_queue *ids, int *ni NULL); if (err) goto done; - err = repaint_parent_commits(&qid->id, - COLOR_SKIP, skip, skip, pack, packidx, + err = repaint_parent_commits(&qid->id, idx, + COLOR_SKIP, skip, skip, ids, nids, + &painted, &npainted, pack, packidx, objcache); if (err) goto done; + break; } - err = got_object_idset_add(drop, &qid->id, NULL); - if (err) - goto done; + if (!got_object_idset_contains(drop, &qid->id)) { + err = got_object_idset_add(drop, &qid->id, + NULL); + if (err) + goto done; + } break; case COLOR_SKIP: - if (!got_object_idset_contains(skip, &qid->id)) { - err = got_object_idset_add(skip, &qid->id, - NULL); - if (err) - goto done; - } + err = got_object_idset_add(skip, &qid->id, + NULL); + if (err) + goto done; break; default: /* should not happen */ blob - 9b3bc59b7abaf5d2aeb22463b67d62ae6a61045f2c6d3cc4c7a3b257783db41d blob + a23390e3103042db7da9294edc879ee1ac29a96016c980afafd66250415403c8 --- regress/cmdline/pack.sh +++ regress/cmdline/pack.sh @@ -799,10 +799,24 @@ test_pack_exclude_via_ancestor_commit_packed() { return 1 fi - for i in 1 2 3 4 5 6 7; do + for i in 1 2 3; do echo a new line >> $testroot/wt/alpha (cd $testroot/wt && got commit -m "edit alpha" >/dev/null) done + + # pack the repository's current history + gotadmin pack -q -r $testroot/repo > /dev/null 2> $testroot/stderr + ret=$? + if [ $ret -ne 0 ]; then + echo "gotadmin pack failed unexpectedly" >&2 + test_done "$testroot" "$ret" + return 1 + fi + + for i in 4 5 6; do + echo a new line >> $testroot/wt/alpha + (cd $testroot/wt && got commit -m "edit alpha" >/dev/null) + done local parent_commit=`git_show_head $testroot/repo` echo a new line >> $testroot/wt/alpha @@ -810,11 +824,13 @@ test_pack_exclude_via_ancestor_commit_packed() { got ref -r $testroot/repo -c $parent_commit refs/heads/pleasepackthis - # pack the repository and remove loose objects - gotadmin cleanup -aq -r $testroot/repo > /dev/null 2> $testroot/stderr + # Pack the next batch of repository history. This test is designed + # to# trigger a code path where got-read-pack cannot find a parent + # commit in its pack file. + gotadmin pack -q -r $testroot/repo > /dev/null 2> $testroot/stderr ret=$? if [ $ret -ne 0 ]; then - echo "gotadmin cleanup failed unexpectedly" >&2 + echo "gotadmin pack failed unexpectedly" >&2 test_done "$testroot" "$ret" return 1 fi