On Sun, Jul 01, 2018 at 06:21:40PM +0200, Toralf Förster wrote:
> as "git fsck" does it already for "Checking objects:"
>
> Is this a valid feature request?
It's actually hard to do accurately. We don't know how many objects are
reachable until we traverse the graph...which is exactly what the
"checking connectivity" operation is doing.
The operation is bounded by the total number of objects in the
repository. We may have duplicates (in multiple packs, or loose/packed),
and objects which aren't reachable at all. But we could make that a
guess, and just "jump" to 100% at the end.
The code might look something like the patch below. I'm not sure if it's
a good idea or not (I mostly copied the counting from
builtin/count-objects.c; it might be nice to factor that out).
-Peff
diff --git a/builtin/fsck.c b/builtin/fsck.c
index 3ad4f160f9..52e79aed76 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -192,17 +192,49 @@ static int traverse_one_object(struct object *obj)
return result;
}
+static int count_loose(const struct object_id *oid, const char *path,
+ void *data)
+{
+ unsigned int *nr = data;
+ nr++;
+ return 0;
+}
+
+static unsigned object_max(void)
+{
+ unsigned max = 0;
+ struct packed_git *p;
+
+ for_each_loose_object(count_loose, , 0);
+
+ for (p = get_packed_git(the_repository); p; p = p->next) {
+ if (open_pack_index(p))
+ continue;
+ max += p->num_objects;
+ }
+
+ return max;
+}
+
static int traverse_reachable(void)
{
struct progress *progress = NULL;
unsigned int nr = 0;
int result = 0;
- if (show_progress)
- progress = start_delayed_progress(_("Checking connectivity"),
0);
+ unsigned int max = 0;
+
+ if (show_progress) {
+ max = object_max();
+ progress = start_delayed_progress(_("Checking connectivity"),
+ max);
+ }
+
while (pending.nr) {
result |= traverse_one_object(object_array_pop());
display_progress(progress, ++nr);
}
+
+ display_progress(progress, max);
stop_progress();
return !!result;
}
