diff options
Diffstat (limited to 'format')
| -rw-r--r-- | format/pack/ingest/ingest.go | 8 | ||||
| -rw-r--r-- | format/pack/ingest/resolve_all.go | 6 | ||||
| -rw-r--r-- | format/pack/ingest/scan.go | 10 | ||||
| -rw-r--r-- | format/pack/ingest/thin_fix.go | 8 |
4 files changed, 16 insertions, 16 deletions
diff --git a/format/pack/ingest/ingest.go b/format/pack/ingest/ingest.go index 0e4352e1..926a8c6a 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.WriteProgressf(state.opts.Progress, "writing index...\r") + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "writing index: done.\n") + utils.FprintfBestEffort(state.opts.Progress, "writing index: done.\n") if state.opts.WriteRev { - utils.WriteProgressf(state.opts.Progress, "writing reverse index...\r") + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "writing reverse index: done.\n") + utils.FprintfBestEffort(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 ec14748f..f172028c 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.WriteProgressf(state.opts.Progress, "resolving deltas: 0%% (0/%d)\r", pending) + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "resolving deltas: %3d%% (%d/%d)\r", percent, done, pending) + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "resolving deltas: 100%% (%d/%d), done.\n", pending, pending) + utils.FprintfBestEffort(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 b5d683a8..906149ba 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.WriteProgressf(state.opts.Progress, "validating pack header...\r") + utils.FprintfBestEffort(state.opts.Progress, "validating pack header...\r") err = seedStreamWithPackHeader(state) if err != nil { return err } - utils.WriteProgressf(state.opts.Progress, "validating pack header: done.\n") + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "receiving objects: 0%% (0/%d)\r", total) + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total) + utils.FprintfBestEffort(state.opts.Progress, "receiving objects: %3d%% (%d/%d)\r", percent, done, total) } } - utils.WriteProgressf(state.opts.Progress, "receiving objects: 100%% (%d/%d), done.\n", total, total) + utils.FprintfBestEffort(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 b1d8ae7c..f97c0776 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.WriteProgressf( + utils.FprintfBestEffort( 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.WriteProgressf(state.opts.Progress, "fixing thin pack: 0%% (0/%d)\r", total) + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "fixing thin pack: %3d%% (%d/%d)\r", percent, done, total) + utils.FprintfBestEffort(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.WriteProgressf(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total) + utils.FprintfBestEffort(state.opts.Progress, "fixing thin pack: 100%% (%d/%d), done.\n", total, total) } return nil |