@matheusbsbs / matheus-bagliano / commits / fb546d6e43

reachable: report precise timestamps from objects in cruft packs

When generating a cruft pack, the caller within pack-objects will want to know the precise timestamps of cruft objects (i.e., their corresponding values in the .mtimes table) rather than the mtime of the cruft pack itself. Teach add_recent_packed() to lookup each object's precise mtime from the .mtimes file if one exists (indicated by the is_cruft bit on the packed_git structure). A couple of small things worth noting here: - load_pack_mtimes() needs to be called before asking for nth_packed_mtime(), and that call is done lazily here. That function exits early if the .mtimes file has already been opened and parsed, so only the first call is slow. - Checking the is_cruft bit can be done without any extra work on the caller's behalf, since it is set up for us automatically as a side-effect of calling add_packed_git() (just like the 'pack_keep' and 'pack_promisor' bits). Signed-off-by: Taylor Blau <me@ttaylorr.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Taylor Blau committed May 20, 2022 at 19:17 UTC fb546d6e4395cedf46a81ce91213b61992b14ff5

1 file changed +8 -1

reachable.c

+8 -1

@@ -13,6 +13,7 @@

13 #include "worktree.h"

14 #include "object-store.h"

15 #include "pack-bitmap.h"

16 +#include "pack-mtimes.h"

18 struct connectivity_progress {

19 struct progress *progress;

@@ -155,6 +156,7 @@ static int add_recent_packed(const struct object_id *oid,

156 void *data)

157 {

158 struct object *obj;

159 + timestamp_t mtime = p->mtime;

160

161 if (!want_recent_object(data, oid))

162 return 0;

@@ -163,7 +165,12 @@ static int add_recent_packed(const struct object_id *oid,

165

166 if (obj && obj->flags & SEEN)

167 return 0;

166 - add_recent_object(oid, p, nth_packed_object_offset(p, pos), p->mtime, data);

168 + if (p->is_cruft) {

169 + if (load_pack_mtimes(p) < 0)

170 + die(_("could not load cruft pack .mtimes"));

171 + mtime = nth_packed_mtime(p, pos);

172 + }

173 + add_recent_object(oid, p, nth_packed_object_offset(p, pos), mtime, data);

174 return 0;

175 }

176