ref: 4043486a652566923b27d1a90eedcdc8d9b0b3ea
parent: e4659ebee6f2e51ba4c6bf653d66fd7947b031f7
author: Runxi Yu <me@runxiyu.org>
date: Sat Mar 7 22:46:13 EST 2026
*: Reformat
--- a/format/pack/ingest/ingest.go
+++ b/format/pack/ingest/ingest.go
@@ -52,6 +52,7 @@
}
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 @@
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")
}
--- a/format/pack/ingest/resolve_all.go
+++ b/format/pack/ingest/resolve_all.go
@@ -11,6 +11,7 @@
state.unresolvedRefDeltas = state.unresolvedRefDeltas[:0]
var pending uint32
+
for idx := range state.records { if !state.records[idx].resolved {pending++
@@ -22,7 +23,9 @@
}
step := progressStep(pending)
+
var done uint32
+
utils.WriteProgressf(state.opts.Progress, "resolving deltas: 0%% (0/%d)\r", pending)
for idx := range state.records {--- a/format/pack/ingest/scan.go
+++ b/format/pack/ingest/scan.go
@@ -22,10 +22,12 @@
)
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 @@
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
--- a/format/pack/ingest/thin_fix.go
+++ b/format/pack/ingest/thin_fix.go
@@ -54,6 +54,7 @@
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)
--- a/receivepack/int_test.go
+++ b/receivepack/int_test.go
@@ -606,9 +606,12 @@
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)--- a/receivepack/service/apply.go
+++ b/receivepack/service/apply.go
@@ -41,6 +41,7 @@
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) 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 @@
}
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
--- a/receivepack/service/execute.go
+++ b/receivepack/service/execute.go
@@ -81,6 +81,7 @@
// 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)
--- a/receivepack/service/ingest_quarantine.go
+++ b/receivepack/service/ingest_quarantine.go
@@ -35,6 +35,7 @@
}
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 @@
return "", nil, false
}
+
utils.WriteProgressf(service.opts.Progress, "creating quarantine: done.\n")
utils.WriteProgressf(service.opts.Progress, "unpacking...\r")
--
⑨