diff --git a/commands/command_fetch.go b/commands/command_fetch.go index 2c821a0b..c4d64fb4 100644 --- a/commands/command_fetch.go +++ b/commands/command_fetch.go @@ -154,18 +154,16 @@ func fetchRef(ref string, filter *filepathfilter.Filter) bool { func pointersToFetchForRefs(refs []string) ([]*lfs.WrappedPointer, error) { // This could be a long process so use the chan version & report progress - task := tasklog.NewSimpleTask() - defer task.Complete() - logger := tasklog.NewLogger(OutputWriter, tasklog.ForceProgress(cfg.ForceProgress()), ) - logger.Enqueue(task) - var numObjs int64 + task := logger.Simple() + defer task.Complete() // use temp gitscanner to collect pointers var pointers []*lfs.WrappedPointer var multiErr error + var numObjs int64 tempgitscanner := lfs.NewGitScanner(cfg, func(p *lfs.WrappedPointer, err error) { if err != nil { if multiErr != nil { @@ -293,18 +291,16 @@ func fetchAll() bool { func scanAll() []*lfs.WrappedPointer { // This could be a long process so use the chan version & report progress - task := tasklog.NewSimpleTask() - defer task.Complete() - logger := tasklog.NewLogger(OutputWriter, tasklog.ForceProgress(cfg.ForceProgress()), ) - logger.Enqueue(task) - var numObjs int64 + task := logger.Simple() + defer task.Complete() // use temp gitscanner to collect pointers var pointers []*lfs.WrappedPointer var multiErr error + var numObjs int64 tempgitscanner := lfs.NewGitScanner(cfg, func(p *lfs.WrappedPointer, err error) { if err != nil { if multiErr != nil { diff --git a/commands/command_prune.go b/commands/command_prune.go index 1ae2ef78..90e6d297 100644 --- a/commands/command_prune.go +++ b/commands/command_prune.go @@ -197,8 +197,7 @@ func prune(fetchPruneConfig lfs.FetchPruneConfig, verifyRemote, dryRun, verbose return } - info := tasklog.NewSimpleTask() - logger.Enqueue(info) + info := logger.Simple() if dryRun { info.Logf("prune: %s", tr.Tr.GetN( "%d file would be pruned (%s)", @@ -255,11 +254,9 @@ func pruneCheckErrors(taskErrors []error) { func pruneTaskDisplayProgress(progressChan PruneProgressChan, waitg *sync.WaitGroup, logger *tasklog.Logger) { defer waitg.Done() - task := tasklog.NewSimpleTask() + task := logger.Simple() defer task.Complete() - logger.Enqueue(task) - localCount := 0 retainCount := 0 verifyCount := 0