Skip to content

Commit 898f565

Browse files
committed
Fix delay with flicking through files or commits when git diff is very slow
One reason why git diff can be very slow is when "diff.algorithm = histogram" is being used. In this case, showing a very long single-file diff can take seconds to load, and you'll see the "loading..." message in the main view until we got the first lines of the diff to show. There's nothing really we can do about this delay; however, when switching to another, shorter file (or commit) while the "loading..." message is still showing, this switch should be instantaneous. And it was before 0.54.0, but we broke this in 0.54.0 with 8d7740a (#4782); now users have to wait for the slow git diff command to output more text before the switch occurs. To fix this, don't block waiting for the process to terminate if we just stopped it.
1 parent e5acbed commit 898f565

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

pkg/tasks/tasks.go

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,15 @@ func (self *ViewBufferManager) NewCmdTask(start func() (*exec.Cmd, io.Reader), p
291291

292292
refreshViewIfStale()
293293

294-
if err := cmd.Wait(); err != nil {
295-
select {
296-
case <-opts.Stop:
297-
// it's fine if we've killed this program ourselves
298-
default:
294+
select {
295+
case <-opts.Stop:
296+
// If we stopped the task, don't block waiting for it; this could cause a delay if
297+
// the process takes a while until it actually terminates. We still want to call
298+
// Wait to reclaim any resources, but do it on a background goroutine, and ignore
299+
// any errors.
300+
go func() { _ = cmd.Wait() }()
301+
default:
302+
if err := cmd.Wait(); err != nil {
299303
self.Log.Errorf("Unexpected error when running cmd task: %v; Failed command: %v %v", err, cmd.Path, cmd.Args)
300304
}
301305
}

0 commit comments

Comments
 (0)