diff options
| author | 2026-03-08 03:46:13 +0800 | |
|---|---|---|
| committer | 2026-03-08 03:46:13 +0800 | |
| commit | 4043486a652566923b27d1a90eedcdc8d9b0b3ea (patch) | |
| tree | f43cbaae89ffebe95f973b6de142e0f1a0e091b6 /receivepack | |
| parent | format/pack/ingest: Thin pack fixing progress (diff) | |
| signature | No signature | |
*: Reformat v0.1.75
Diffstat (limited to 'receivepack')
| -rw-r--r-- | receivepack/int_test.go | 3 | ||||
| -rw-r--r-- | receivepack/service/apply.go | 4 | ||||
| -rw-r--r-- | receivepack/service/execute.go | 1 | ||||
| -rw-r--r-- | receivepack/service/ingest_quarantine.go | 2 |
4 files changed, 10 insertions, 0 deletions
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") |
