aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--format/pack/ingest/ingest.go8
-rw-r--r--format/pack/ingest/resolve_all.go6
-rw-r--r--format/pack/ingest/scan.go10
-rw-r--r--format/pack/ingest/thin_fix.go8
-rw-r--r--internal/utils/progress.go4
-rw-r--r--receivepack/service/apply.go20
-rw-r--r--receivepack/service/execute.go6
-rw-r--r--receivepack/service/ingest_quarantine.go24
-rw-r--r--receivepack/service/run_hook.go10
9 files changed, 48 insertions, 48 deletions
diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go
index 926a8c6a..e593510b 100644
--- a/format/pack/ingest/ingest.go
+++ b/format/pack/ingest/ingest.go
@@ -51,7 +51,7 @@ func ingest(state *ingestState) (out Result, err error) {
return Result{}, err
}
- utils.FprintfBestEffort(state.opts.Progress, "writing index...\r")
+ utils.BestEffortFprintf(state.opts.Progress, "writing index...\r")
err = state.packFile.Sync()
if err != nil {
@@ -63,10 +63,10 @@ func ingest(state *ingestState) (out Result, err error) {
return Result{}, err
}
- utils.FprintfBestEffort(state.opts.Progress, "writing index: done.\n")
+ utils.BestEffortFprintf(state.opts.Progress, "writing index: done.\n")
if state.opts.WriteRev {
- utils.FprintfBestEffort(state.opts.Progress, "writing reverse index...\r")
+ utils.BestEffortFprintf(state.opts.Progress, "writing reverse index...\r")
}
err = writeRev(state)
@@ -75,7 +75,7 @@ func ingest(state *ingestState) (out Result, err error) {
}
if state.opts.WriteRev {
- utils.FprintfBestEffort(state.opts.Progress, "writing reverse index: done.\n")
+ utils.BestEffortFprintf(state.opts.Progress, "writing reverse index: done.\n")
}
return finalizeArtifacts(state)
diff --git a/format/pack/ingest/resolve_all.go b/format/pack/ingest/resolve_all.go
index f172028c..65cfe44b 100644
--- a/format/pack/ingest/resolve_all.go
+++ b/format/pack/ingest/resolve_all.go
@@ -26,7 +26,7 @@ func resolveAll(state *ingestState) error {
var done uint32
- utils.FprintfBestEffort(state.opts.Progress, "resolving deltas: 0%% (0/%d)\r", pending)
+ utils.BestEffortFprintf(state.opts.Progress, "resolving deltas: 0%% (0/%d)\r", pending)
for idx := range state.records {
if state.records[idx].resolved {
@@ -36,7 +36,7 @@ func resolveAll(state *ingestState) error {
done++
if done%step == 0 || done == pending {
percent := done * 100 / pending
- utils.FprintfBestEffort(state.opts.Progress, "resolving deltas: %3d%% (%d/%d)\r", percent, done, pending)
+ utils.BestEffortFprintf(state.opts.Progress, "resolving deltas: %3d%% (%d/%d)\r", percent, done, pending)
}
visiting := make(map[int]struct{})
@@ -65,7 +65,7 @@ func resolveAll(state *ingestState) error {
state.baseCache.add(idx, ty, content)
}
- utils.FprintfBestEffort(state.opts.Progress, "resolving deltas: 100%% (%d/%d), done.\n", pending, pending)
+ utils.BestEffortFprintf(state.opts.Progress, "resolving deltas: 100%% (%d/%d), done.\n", pending, pending)
return nil
}
diff --git a/format/pack/ingest/scan.go b/format/pack/ingest/scan.go
index 906149ba..bb94ebc3 100644
--- a/format/pack/ingest/scan.go
+++ b/format/pack/ingest/scan.go
@@ -21,14 +21,14 @@ func streamPackAndScan(state *ingestState) error {
state.algo.Size(),
)
- utils.FprintfBestEffort(state.opts.Progress, "validating pack header...\r")
+ utils.BestEffortFprintf(state.opts.Progress, "validating pack header...\r")
err = seedStreamWithPackHeader(state)
if err != nil {
return err
}
- utils.FprintfBestEffort(state.opts.Progress, "validating pack header: done.\n")
+ utils.BestEffortFprintf(state.opts.Progress, "validating pack header: done.\n")
state.records = make([]objectRecord, 0, state.objectCountHeader)
state.ofsDeltas = make([]ofsDeltaRef, 0, state.objectCountHeader)
@@ -36,7 +36,7 @@ func streamPackAndScan(state *ingestState) error {
total := state.objectCountHeader
step := progressStep(total)
- utils.FprintfBestEffort(state.opts.Progress, "receiving objects: 0%% (0/%d)\r", total)
+ utils.BestEffortFprintf(state.opts.Progress, "receiving objects: 0%% (0/%d)\r", total)
for i := range total {
nextOffset, err := scanOneEntry(state, state.stream.consumed)
@@ -51,11 +51,11 @@ func streamPackAndScan(state *ingestState) error {
done := i + 1
if done%step == 0 || done == total {
percent := done * 100 / total
- utils.FprintfBestEffort(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total)
+ utils.BestEffortFprintf(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total)
}
}
- utils.FprintfBestEffort(state.opts.Progress, "receiving objects: 100%% (%d/%d), done.\n", total, total)
+ utils.BestEffortFprintf(state.opts.Progress, "receiving objects: 100%% (%d/%d), done.\n", total, total)
err = state.stream.finishAndFlushTrailer(state.opts.RequireTrailingEOF)
if err != nil {
diff --git a/format/pack/ingest/thin_fix.go b/format/pack/ingest/thin_fix.go
index f97c0776..634f0367 100644
--- a/format/pack/ingest/thin_fix.go
+++ b/format/pack/ingest/thin_fix.go
@@ -13,7 +13,7 @@ func maybeFixThin(state *ingestState) error {
return nil
}
- utils.FprintfBestEffort(
+ utils.BestEffortFprintf(
state.opts.Progress,
"fixing thin pack: %d unresolved bases\r",
len(state.unresolvedRefDeltas),
@@ -57,7 +57,7 @@ func maybeFixThin(state *ingestState) error {
total := len(baseIDs)
if total > 0 {
- utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: 0%% (0/%d)\r", total)
+ utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack: 0%% (0/%d)\r", total)
}
for i, id := range baseIDs {
@@ -75,7 +75,7 @@ func maybeFixThin(state *ingestState) error {
done := i + 1
percent := done * 100 / total
- utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: %3d%% (%d/%d)\r", percent, done, total)
+ utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack: %3d%% (%d/%d)\r", percent, done, total)
}
err = rewritePackHeaderAndTrailer(state)
@@ -84,7 +84,7 @@ func maybeFixThin(state *ingestState) error {
}
if state.thinFixed {
- utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total)
+ utils.BestEffortFprintf(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total)
}
return nil
diff --git a/internal/utils/progress.go b/internal/utils/progress.go
index acb763ac..2adcb26a 100644
--- a/internal/utils/progress.go
+++ b/internal/utils/progress.go
@@ -6,10 +6,10 @@ import (
"io"
)
-// FprintfBestEffort writes one formatted message to w.
+// BestEffortFprintf writes one formatted message to w.
//
// It is nil-safe and ignores write errors by design.
-func FprintfBestEffort(w io.Writer, format string, args ...any) {
+func BestEffortFprintf(w io.Writer, format string, args ...any) {
if w == nil {
return
}
diff --git a/receivepack/service/apply.go b/receivepack/service/apply.go
index 4b61cf3d..cfd59165 100644
--- a/receivepack/service/apply.go
+++ b/receivepack/service/apply.go
@@ -8,7 +8,7 @@ import (
func (service *Service) applyAtomic(result *Result, commands []Command) error {
total := len(commands)
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: 0/%d\r", total)
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: 0/%d\r", total)
tx, err := service.opts.Refs.BeginTransaction()
if err != nil {
@@ -21,18 +21,18 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error {
_ = tx.Abort()
fillCommandErrors(result, commands, err.Error())
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: failed at %d/%d.\n", i+1, total)
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: failed at %d/%d.\n", i+1, total)
return nil
}
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: %d/%d\r", i+1, total)
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: %d/%d\r", i+1, total)
}
err = tx.Commit()
if err != nil {
fillCommandErrors(result, commands, err.Error())
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: failed at commit.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: failed at commit.\n")
return nil
}
@@ -42,7 +42,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error {
result.Commands = append(result.Commands, successCommandResult(command))
}
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: done.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: done.\n")
return nil
}
@@ -50,7 +50,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error {
func (service *Service) applyBatch(result *Result, commands []Command) error {
total := len(commands)
- utils.FprintfBestEffort(service.opts.Progress, "updating refs...\r")
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs...\r")
batch, err := service.opts.Refs.BeginBatch()
if err != nil {
@@ -63,7 +63,7 @@ func (service *Service) applyBatch(result *Result, commands []Command) error {
batchResults, err := batch.Apply()
if err != nil && len(batchResults) == 0 {
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: failed at apply.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: failed at apply.\n")
return err
}
@@ -82,15 +82,15 @@ func (service *Service) applyBatch(result *Result, commands []Command) error {
result.Commands = append(result.Commands, item)
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: %d/%d\r", i+1, total)
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: %d/%d\r", i+1, total)
}
result.Applied = appliedAny
if failedCount == 0 {
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: done.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: done.\n")
} else {
- utils.FprintfBestEffort(service.opts.Progress, "updating refs: failed (%d/%d).\n", failedCount, total)
+ utils.BestEffortFprintf(service.opts.Progress, "updating refs: failed (%d/%d).\n", failedCount, total)
}
return nil
diff --git a/receivepack/service/execute.go b/receivepack/service/execute.go
index c5c41efd..9f373e0d 100644
--- a/receivepack/service/execute.go
+++ b/receivepack/service/execute.go
@@ -80,11 +80,11 @@ func (service *Service) Execute(ctx context.Context, req *Request) (*Result, err
if req.PackExpected && quarantineRoot != nil {
// Git migrates quarantined objects into permanent storage immediately
// before starting ref updates.
- utils.FprintfBestEffort(service.opts.Progress, "promoting quarantine...\r")
+ utils.BestEffortFprintf(service.opts.Progress, "promoting quarantine...\r")
err = service.promoteQuarantine(quarantineName, quarantineRoot)
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "promoting quarantine: failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "promoting quarantine: failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, req.Commands, err.Error())
@@ -92,7 +92,7 @@ func (service *Service) Execute(ctx context.Context, req *Request) (*Result, err
return result, nil
}
- utils.FprintfBestEffort(service.opts.Progress, "promoting quarantine: done.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "promoting quarantine: done.\n")
}
if req.Atomic {
diff --git a/receivepack/service/ingest_quarantine.go b/receivepack/service/ingest_quarantine.go
index 47161df6..6cc4c3e3 100644
--- a/receivepack/service/ingest_quarantine.go
+++ b/receivepack/service/ingest_quarantine.go
@@ -17,7 +17,7 @@ func (service *Service) ingestQuarantine(
}
if req.Pack == nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: missing pack stream.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: missing pack stream.\n")
result.UnpackError = "missing pack stream"
fillCommandErrors(result, commands, "missing pack stream")
@@ -26,7 +26,7 @@ func (service *Service) ingestQuarantine(
}
if service.opts.ObjectsRoot == nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: objects root not configured.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: objects root not configured.\n")
result.UnpackError = "objects root not configured"
fillCommandErrors(result, commands, "objects root not configured")
@@ -45,7 +45,7 @@ func (service *Service) ingestQuarantine(
},
)
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, commands, err.Error())
@@ -56,7 +56,7 @@ func (service *Service) ingestQuarantine(
if pending.Header().ObjectCount == 0 {
discarded, err := pending.Discard()
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, commands, err.Error())
@@ -69,7 +69,7 @@ func (service *Service) ingestQuarantine(
ObjectCount: discarded.ObjectCount,
}
- utils.FprintfBestEffort(
+ utils.BestEffortFprintf(
service.opts.Progress,
"unpacking: done (%d objects, %s).\n",
discarded.ObjectCount,
@@ -79,11 +79,11 @@ func (service *Service) ingestQuarantine(
return "", nil, true
}
- utils.FprintfBestEffort(service.opts.Progress, "creating quarantine...\r")
+ utils.BestEffortFprintf(service.opts.Progress, "creating quarantine...\r")
quarantineName, quarantineRoot, err := service.createQuarantineRoot()
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, commands, err.Error())
@@ -93,7 +93,7 @@ func (service *Service) ingestQuarantine(
quarantinePackRoot, err := service.openQuarantinePackRoot(quarantineRoot)
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, commands, err.Error())
@@ -104,15 +104,15 @@ func (service *Service) ingestQuarantine(
return "", nil, false
}
- utils.FprintfBestEffort(service.opts.Progress, "creating quarantine: done.\n")
- utils.FprintfBestEffort(service.opts.Progress, "unpacking...\r")
+ utils.BestEffortFprintf(service.opts.Progress, "creating quarantine: done.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "unpacking...\r")
ingested, err := pending.Continue(quarantinePackRoot)
_ = quarantinePackRoot.Close()
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "unpack failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "unpack failed: %v.\n", err)
result.UnpackError = err.Error()
fillCommandErrors(result, commands, err.Error())
@@ -123,7 +123,7 @@ func (service *Service) ingestQuarantine(
return "", nil, false
}
- utils.FprintfBestEffort(service.opts.Progress, "unpacking: done (%d objects, %s).\n", ingested.ObjectCount, ingested.PackHash)
+ utils.BestEffortFprintf(service.opts.Progress, "unpacking: done (%d objects, %s).\n", ingested.ObjectCount, ingested.PackHash)
result.Ingest = &ingested
diff --git a/receivepack/service/run_hook.go b/receivepack/service/run_hook.go
index 90ab2e78..1270a833 100644
--- a/receivepack/service/run_hook.go
+++ b/receivepack/service/run_hook.go
@@ -30,11 +30,11 @@ func (service *Service) runHook(
return allowedCommands, allowedIndices, rejected, true, ""
}
- utils.FprintfBestEffort(service.opts.Progress, "running hooks...\r")
+ utils.BestEffortFprintf(service.opts.Progress, "running hooks...\r")
quarantinedObjects, err := service.openQuarantinedObjects(quarantineName)
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "running hooks: failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "running hooks: failed: %v.\n", err)
return nil, nil, nil, false, err.Error()
}
@@ -52,13 +52,13 @@ func (service *Service) runHook(
IO: service.opts.HookIO,
})
if err != nil {
- utils.FprintfBestEffort(service.opts.Progress, "running hooks: failed: %v.\n", err)
+ utils.BestEffortFprintf(service.opts.Progress, "running hooks: failed: %v.\n", err)
return nil, nil, nil, false, err.Error()
}
if len(decisions) != len(commands) {
- utils.FprintfBestEffort(service.opts.Progress, "running hooks: failed: wrong decision count.\n")
+ utils.BestEffortFprintf(service.opts.Progress, "running hooks: failed: wrong decision count.\n")
return nil, nil, nil, false, "hook returned wrong number of update decisions"
}
@@ -82,7 +82,7 @@ func (service *Service) runHook(
rejected[index] = message
}
- utils.FprintfBestEffort(
+ utils.BestEffortFprintf(
service.opts.Progress,
"running hooks: done (%d/%d accepted).\n",
len(allowedCommands),
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-05-25 15:43:08 +0000