ref: 2f427535c637279de022ceb5690690ff0e234b52
parent: 3fe07dd316bde2ea625166176b2285bf0c631889
author: Runxi Yu <me@runxiyu.org>
date: Sun Mar 8 13:54:20 EDT 2026
format/pack/ingest: Call it writeProgressf TODO: Check for how flushing works
--- a/format/pack/ingest/idx_write.go
+++ b/format/pack/ingest/idx_write.go
@@ -45,7 +45,7 @@
fanout [256]uint32
)
- writeProgress(state, "writing index fanout...\r")
+ writeProgressf(state, "writing index fanout...\r")
for _, recordIdx := range order {idRaw := state.records[recordIdx].objectID.Bytes()
@@ -71,7 +71,7 @@
}
}
- writeProgress(state, "writing index fanout: done.\n")
+ writeProgressf(state, "writing index fanout: done.\n")
largeOffsetCount := 0
@@ -196,7 +196,7 @@
largeOffsetMeter.Stop("done")}
- writeProgress(state, "writing index trailer...\r")
+ writeProgressf(state, "writing index trailer...\r")
err = write(state.packHash.Bytes())
if err != nil {@@ -215,7 +215,7 @@
return err
}
- writeProgress(state, "writing index trailer: done.\n")
+ writeProgressf(state, "writing index trailer: done.\n")
return nil
}
--- a/format/pack/ingest/progress_write.go
+++ b/format/pack/ingest/progress_write.go
@@ -2,7 +2,7 @@
import "codeberg.org/lindenii/furgit/internal/utils"
-func writeProgress(state *ingestState, format string, args ...any) {+func writeProgressf(state *ingestState, format string, args ...any) {utils.BestEffortFprintf(state.opts.Progress, format, args...)
if state.opts.ProgressFlush != nil {--- a/format/pack/ingest/rev_write.go
+++ b/format/pack/ingest/rev_write.go
@@ -35,7 +35,7 @@
var scratch [8]byte
- writeProgress(state, "writing reverse index header...\r")
+ writeProgressf(state, "writing reverse index header...\r")
binary.BigEndian.PutUint32(scratch[:4], revMagic)
err = writeAndHash(state.revFile, hashImpl, scratch[:4])
@@ -57,7 +57,7 @@
return err
}
- writeProgress(state, "writing reverse index header: done.\n")
+ writeProgressf(state, "writing reverse index header: done.\n")
entriesMeter := progress.New(progress.Options{Writer: state.opts.Progress,
@@ -89,7 +89,7 @@
entriesMeter.Stop("done")}
- writeProgress(state, "writing reverse index trailer...\r")
+ writeProgressf(state, "writing reverse index trailer...\r")
err = writeAndHash(state.revFile, hashImpl, state.packHash.Bytes())
if err != nil {@@ -108,7 +108,7 @@
return err
}
- writeProgress(state, "writing reverse index trailer: done.\n")
+ writeProgressf(state, "writing reverse index trailer: done.\n")
return nil
}
--- a/format/pack/ingest/scan.go
+++ b/format/pack/ingest/scan.go
@@ -21,7 +21,7 @@
state.algo.Size(),
)
- writeProgress(state, "validating pack header...\r")
+ writeProgressf(state, "validating pack header...\r")
err = seedStreamWithPackHeader(state)
if err != nil {@@ -28,7 +28,7 @@
return err
}
- writeProgress(state, "validating pack header: done.\n")
+ writeProgressf(state, "validating pack header: done.\n")
state.records = make([]objectRecord, 0, state.objectCountHeader)
state.ofsDeltas = make([]ofsDeltaRef, 0, state.objectCountHeader)
--- a/format/pack/ingest/thin_fix.go
+++ b/format/pack/ingest/thin_fix.go
@@ -15,7 +15,7 @@
return nil
}
- writeProgress(
+ writeProgressf(
state,
"fixing thin pack: %d unresolved bases\r",
len(state.unresolvedRefDeltas),
--
⑨