From 9d7ccb0106499f22fb0c215e149e9ed63af891fc Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 8 Mar 2026 13:30:25 +0800 Subject: receivepack: Period punctuate progress messages --- receivepack/service/apply.go | 8 ++++---- receivepack/service/execute.go | 2 +- receivepack/service/ingest_quarantine.go | 14 +++++++------- receivepack/service/run_hook.go | 6 +++--- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/receivepack/service/apply.go b/receivepack/service/apply.go index bd4dc6e6..84fc63e3 100644 --- a/receivepack/service/apply.go +++ b/receivepack/service/apply.go @@ -21,7 +21,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error { _ = tx.Abort() fillCommandErrors(result, commands, err.Error()) - utils.WriteProgressf(service.opts.Progress, "updating refs: failed at %d/%d\n", i+1, total) + utils.WriteProgressf(service.opts.Progress, "updating refs: failed at %d/%d.\n", i+1, total) return nil } @@ -32,7 +32,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error { err = tx.Commit() if err != nil { fillCommandErrors(result, commands, err.Error()) - utils.WriteProgressf(service.opts.Progress, "updating refs: failed at commit\n") + utils.WriteProgressf(service.opts.Progress, "updating refs: failed at commit.\n") return 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.WriteProgressf(service.opts.Progress, "updating refs: failed at apply\n") + utils.WriteProgressf(service.opts.Progress, "updating refs: failed at apply.\n") return err } @@ -90,7 +90,7 @@ func (service *Service) applyBatch(result *Result, commands []Command) error { if failedCount == 0 { utils.WriteProgressf(service.opts.Progress, "updating refs: done.\n") } else { - utils.WriteProgressf(service.opts.Progress, "updating refs: failed (%d/%d)\n", failedCount, total) + utils.WriteProgressf(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 8f70fb83..28c0587c 100644 --- a/receivepack/service/execute.go +++ b/receivepack/service/execute.go @@ -84,7 +84,7 @@ func (service *Service) Execute(ctx context.Context, req *Request) (*Result, err err = service.promoteQuarantine(quarantineName, quarantineRoot) if err != nil { - utils.WriteProgressf(service.opts.Progress, "promoting quarantine: failed: %v\n", err) + utils.WriteProgressf(service.opts.Progress, "promoting quarantine: failed: %v.\n", err) result.UnpackError = err.Error() fillCommandErrors(result, req.Commands, err.Error()) diff --git a/receivepack/service/ingest_quarantine.go b/receivepack/service/ingest_quarantine.go index 48815fa8..7d83ee7f 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.WriteProgressf(service.opts.Progress, "unpack failed: missing pack stream\n") + utils.WriteProgressf(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.WriteProgressf(service.opts.Progress, "unpack failed: objects root not configured\n") + utils.WriteProgressf(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.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) + utils.WriteProgressf(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.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) + utils.WriteProgressf(service.opts.Progress, "unpack failed: %v.\n", err) result.UnpackError = err.Error() fillCommandErrors(result, commands, err.Error()) @@ -83,7 +83,7 @@ func (service *Service) ingestQuarantine( quarantineName, quarantineRoot, err := service.createQuarantineRoot() if err != nil { - utils.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) + utils.WriteProgressf(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.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) + utils.WriteProgressf(service.opts.Progress, "unpack failed: %v.\n", err) result.UnpackError = err.Error() fillCommandErrors(result, commands, err.Error()) @@ -112,7 +112,7 @@ func (service *Service) ingestQuarantine( _ = quarantinePackRoot.Close() if err != nil { - utils.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) + utils.WriteProgressf(service.opts.Progress, "unpack failed: %v.\n", err) result.UnpackError = err.Error() fillCommandErrors(result, commands, err.Error()) diff --git a/receivepack/service/run_hook.go b/receivepack/service/run_hook.go index 1c265f52..6800db59 100644 --- a/receivepack/service/run_hook.go +++ b/receivepack/service/run_hook.go @@ -34,7 +34,7 @@ func (service *Service) runHook( quarantinedObjects, err := service.openQuarantinedObjects(quarantineName) if err != nil { - utils.WriteProgressf(service.opts.Progress, "running hooks: failed: %v\n", err) + utils.WriteProgressf(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.WriteProgressf(service.opts.Progress, "running hooks: failed: %v\n", err) + utils.WriteProgressf(service.opts.Progress, "running hooks: failed: %v.\n", err) return nil, nil, nil, false, err.Error() } if len(decisions) != len(commands) { - utils.WriteProgressf(service.opts.Progress, "running hooks: failed: wrong decision count\n") + utils.WriteProgressf(service.opts.Progress, "running hooks: failed: wrong decision count.\n") return nil, nil, nil, false, "hook returned wrong number of update decisions" } -- cgit v1.3.1-10-gc9f91