From 4043486a652566923b27d1a90eedcdc8d9b0b3ea Mon Sep 17 00:00:00 2001 From: Runxi Yu Date: Sun, 8 Mar 2026 03:46:13 +0800 Subject: *: Reformat --- format/pack/ingest/ingest.go | 4 ++++ format/pack/ingest/resolve_all.go | 3 +++ format/pack/ingest/scan.go | 4 +++- format/pack/ingest/thin_fix.go | 1 + receivepack/int_test.go | 3 +++ receivepack/service/apply.go | 4 ++++ receivepack/service/execute.go | 1 + receivepack/service/ingest_quarantine.go | 2 ++ 8 files changed, 21 insertions(+), 1 deletion(-) diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go index e503b285..0e4352e1 100644 --- a/format/pack/ingest/ingest.go +++ b/format/pack/ingest/ingest.go @@ -52,6 +52,7 @@ func ingest(state *ingestState) (out Result, err error) { } utils.WriteProgressf(state.opts.Progress, "writing index...\r") + err = state.packFile.Sync() if err != nil { return Result{}, &DestinationWriteError{Op: fmt.Sprintf("sync pack: %v", err)} @@ -61,15 +62,18 @@ func ingest(state *ingestState) (out Result, err error) { if err != nil { return Result{}, err } + utils.WriteProgressf(state.opts.Progress, "writing index: done.\n") if state.opts.WriteRev { utils.WriteProgressf(state.opts.Progress, "writing reverse index...\r") } + err = writeRev(state) if err != nil { return Result{}, err } + if state.opts.WriteRev { utils.WriteProgressf(state.opts.Progress, "writing reverse index: done.\n") } diff --git a/format/pack/ingest/resolve_all.go b/format/pack/ingest/resolve_all.go index e71d38d1..ec14748f 100644 --- a/format/pack/ingest/resolve_all.go +++ b/format/pack/ingest/resolve_all.go @@ -11,6 +11,7 @@ func resolveAll(state *ingestState) error { state.unresolvedRefDeltas = state.unresolvedRefDeltas[:0] var pending uint32 + for idx := range state.records { if !state.records[idx].resolved { pending++ @@ -22,7 +23,9 @@ func resolveAll(state *ingestState) error { } step := progressStep(pending) + var done uint32 + utils.WriteProgressf(state.opts.Progress, "resolving deltas: 0%% (0/%d)\r", pending) for idx := range state.records { diff --git a/format/pack/ingest/scan.go b/format/pack/ingest/scan.go index 94251cb9..2fa88b51 100644 --- a/format/pack/ingest/scan.go +++ b/format/pack/ingest/scan.go @@ -22,10 +22,12 @@ func streamPackAndScan(state *ingestState) error { ) utils.WriteProgressf(state.opts.Progress, "validating pack header...\r") + err = readAndValidatePackHeader(state) if err != nil { return err } + utils.WriteProgressf(state.opts.Progress, "validating pack header: done.\n") state.records = make([]objectRecord, 0, state.objectCountHeader) @@ -36,7 +38,7 @@ func streamPackAndScan(state *ingestState) error { step := progressStep(total) utils.WriteProgressf(state.opts.Progress, "receiving objects: 0%% (0/%d)\r", total) - for i := uint32(0); i < total; i++ { + for i := range total { nextOffset, err := scanOneEntry(state, state.stream.consumed) if err != nil { return err diff --git a/format/pack/ingest/thin_fix.go b/format/pack/ingest/thin_fix.go index 35068079..b1d8ae7c 100644 --- a/format/pack/ingest/thin_fix.go +++ b/format/pack/ingest/thin_fix.go @@ -54,6 +54,7 @@ func maybeFixThin(state *ingestState) error { state.stream.consumed = consumed baseIDs := unresolvedThinBaseIDs(state) + total := len(baseIDs) if total > 0 { utils.WriteProgressf(state.opts.Progress, "fixing thin pack: 0%% (0/%d)\r", total) diff --git a/receivepack/int_test.go b/receivepack/int_test.go index 729857b9..a5cd29ab 100644 --- a/receivepack/int_test.go +++ b/receivepack/int_test.go @@ -606,9 +606,12 @@ func TestReceivePackHookProgressUsesSideBand64K(t *testing.T) { dec := sideband64k.NewDecoder(strings.NewReader(sidebandWire), sideband64k.ReadOptions{}) sawHookProgress := false + var frame sideband64k.Frame + for { var err error + frame, err = dec.ReadFrame() if err != nil { t.Fatalf("ReadFrame: %v", err) diff --git a/receivepack/service/apply.go b/receivepack/service/apply.go index 0f9e07f9..e432141b 100644 --- a/receivepack/service/apply.go +++ b/receivepack/service/apply.go @@ -41,6 +41,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error { for _, command := range commands { result.Commands = append(result.Commands, successCommandResult(command)) } + utils.WriteProgressf(service.opts.Progress, "updating refs: done.\n") return nil @@ -48,6 +49,7 @@ func (service *Service) applyAtomic(result *Result, commands []Command) error { func (service *Service) applyBatch(result *Result, commands []Command) error { total := len(commands) + utils.WriteProgressf(service.opts.Progress, "updating refs...\r") batch, err := service.opts.Refs.BeginBatch() @@ -77,10 +79,12 @@ func (service *Service) applyBatch(result *Result, commands []Command) error { } result.Commands = append(result.Commands, item) + utils.WriteProgressf(service.opts.Progress, "updating refs: %d/%d\r", i+1, total) } result.Applied = appliedAny + utils.WriteProgressf(service.opts.Progress, "updating refs: done.\n") return nil diff --git a/receivepack/service/execute.go b/receivepack/service/execute.go index 20a67763..faedff49 100644 --- a/receivepack/service/execute.go +++ b/receivepack/service/execute.go @@ -81,6 +81,7 @@ func (service *Service) Execute(ctx context.Context, req *Request) (*Result, err // Git migrates quarantined objects into permanent storage immediately // before starting ref updates. utils.WriteProgressf(service.opts.Progress, "promoting quarantine...\r") + err = service.promoteQuarantine(quarantineName, quarantineRoot) if err != nil { utils.WriteProgressf(service.opts.Progress, "promoting quarantine: failed: %v\n", err) diff --git a/receivepack/service/ingest_quarantine.go b/receivepack/service/ingest_quarantine.go index 8bc7c1c3..ad6ce852 100644 --- a/receivepack/service/ingest_quarantine.go +++ b/receivepack/service/ingest_quarantine.go @@ -35,6 +35,7 @@ func (service *Service) ingestQuarantine( } utils.WriteProgressf(service.opts.Progress, "creating quarantine...\r") + quarantineName, quarantineRoot, err := service.createQuarantineRoot() if err != nil { utils.WriteProgressf(service.opts.Progress, "unpack failed: %v\n", err) @@ -57,6 +58,7 @@ func (service *Service) ingestQuarantine( return "", nil, false } + utils.WriteProgressf(service.opts.Progress, "creating quarantine: done.\n") utils.WriteProgressf(service.opts.Progress, "unpacking...\r") -- cgit v1.3.1-10-gc9f91