Jonathan Tan <jonathanta...@google.com> writes:
> Move the setting of oi->whence to sha1_loose_object_info() and
> packed_object_info().
>
> This allows sha1_object_info_extended() to not need to know about the
> delta base cache. This will be useful during a future refactoring in
> which packfile-related functions, including the handling of the delta
> base cache, will be moved to a separate file.
>
> Signed-off-by: Jonathan Tan <jonathanta...@google.com>
> ---
Output from
git grep -E -e '(\.|->)whence'
makes me wonder if the oi->whence thing is a bit over-engineered,
though. The only real user of this information is the streaming
code, which wants to see if it can grab an undeltified deflated data
directly out of the pack file (and if so from which packfile at what
offset), or if it can open a loose object file and slurp deflated
data out of it.
But that is totally outside the scope of this patch. This looks
like a safe no-op conversion to me.
Thanks.
> sha1_file.c | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
> diff --git a/sha1_file.c b/sha1_file.c
> index b60ae15f7..910109fd9 100644
> --- a/sha1_file.c
> +++ b/sha1_file.c
> @@ -2444,6 +2444,9 @@ int packed_object_info(struct packed_git *p, off_t
> obj_offset,
> hashclr(oi->delta_base_sha1);
> }
>
> + oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
> + OI_PACKED;
> +
> out:
> unuse_pack(&w_curs);
> return type;
> @@ -2973,6 +2976,7 @@ static int sha1_loose_object_info(const unsigned char
> *sha1,
> if (oi->sizep == &size_scratch)
> oi->sizep = NULL;
> strbuf_release(&hdrbuf);
> + oi->whence = OI_LOOSE;
> return (status < 0) ? status : 0;
> }
>
> @@ -3010,10 +3014,8 @@ int sha1_object_info_extended(const unsigned char
> *sha1, struct object_info *oi,
>
> if (!find_pack_entry(real, &e)) {
> /* Most likely it's a loose object. */
> - if (!sha1_loose_object_info(real, oi, flags)) {
> - oi->whence = OI_LOOSE;
> + if (!sha1_loose_object_info(real, oi, flags))
> return 0;
> - }
>
> /* Not a loose object; someone else may have just packed it. */
> if (flags & OBJECT_INFO_QUICK) {
> @@ -3036,10 +3038,7 @@ int sha1_object_info_extended(const unsigned char
> *sha1, struct object_info *oi,
> if (rtype < 0) {
> mark_bad_packed_object(e.p, real);
> return sha1_object_info_extended(real, oi, 0);
> - } else if (in_delta_base_cache(e.p, e.offset)) {
> - oi->whence = OI_DBCACHED;
> - } else {
> - oi->whence = OI_PACKED;
> + } else if (oi->whence == OI_PACKED) {
> oi->u.packed.offset = e.offset;
> oi->u.packed.pack = e.p;
> oi->u.packed.is_delta = (rtype == OBJ_REF_DELTA ||
