add deadlock mutex package

write to deadlock stderr after closing gocui

more deadlock checking

pkg/commands/git.go

@@ -5,9 +5,9 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"sync"
 
 	"github.com/go-errors/errors"
+	"github.com/sasha-s/go-deadlock"
 
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
@@ -57,7 +57,7 @@ func NewGitCommand(
 	cmn *common.Common,
 	osCommand *oscommands.OSCommand,
 	gitConfig git_config.IGitConfig,
-	syncMutex *sync.Mutex,
+	syncMutex *deadlock.Mutex,
 ) (*GitCommand, error) {
 	if err := navigateToRepoRootDirectory(os.Stat, os.Chdir); err != nil {
 		return nil, err
@@ -89,7 +89,7 @@ func NewGitCommandAux(
 	gitConfig git_config.IGitConfig,
 	dotGitDir string,
 	repo *gogit.Repository,
-	syncMutex *sync.Mutex,
+	syncMutex *deadlock.Mutex,
 ) *GitCommand {
 	cmd := NewGitCmdObjBuilder(cmn.Log, osCommand.Cmd)
 

pkg/commands/git_commands/common.go

@@ -1,11 +1,10 @@
 package git_commands
 
 import (
-	"sync"
-
 	gogit "github.com/jesseduffield/go-git/v5"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"github.com/sasha-s/go-deadlock"
 )
 
 type GitCommon struct {
@@ -16,7 +15,7 @@ type GitCommon struct {
 	repo      *gogit.Repository
 	config    *ConfigCommands
 	// mutex for doing things like push/pull/fetch
-	syncMutex *sync.Mutex
+	syncMutex *deadlock.Mutex
 }
 
 func NewGitCommon(
@@ -26,7 +25,7 @@ func NewGitCommon(
 	dotGitDir string,
 	repo *gogit.Repository,
 	config *ConfigCommands,
-	syncMutex *sync.Mutex,
+	syncMutex *deadlock.Mutex,
 ) *GitCommon {
 	return &GitCommon{
 		Common:    cmn,

pkg/commands/git_test.go

@@ -3,7 +3,6 @@ package commands
 import (
 	"fmt"
 	"os"
-	"sync"
 	"testing"
 	"time"
 
@@ -12,6 +11,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/git_config"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/utils"
+	"github.com/sasha-s/go-deadlock"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -220,7 +220,7 @@ func TestNewGitCommand(t *testing.T) {
 				NewGitCommand(utils.NewDummyCommon(),
 					oscommands.NewDummyOSCommand(),
 					git_config.NewFakeGitConfig(nil),
-					&sync.Mutex{},
+					&deadlock.Mutex{},
 				))
 		})
 	}

pkg/commands/oscommands/cmd_obj.go

@@ -2,7 +2,8 @@ package oscommands
 
 import (
 	"os/exec"
-	"sync"
+
+	"github.com/sasha-s/go-deadlock"
 )
 
 // A command object is a general way to represent a command to be run on the
@@ -51,8 +52,8 @@ type ICmdObj interface {
 	PromptOnCredentialRequest() ICmdObj
 	FailOnCredentialRequest() ICmdObj
 
-	WithMutex(mutex *sync.Mutex) ICmdObj
-	Mutex() *sync.Mutex
+	WithMutex(mutex *deadlock.Mutex) ICmdObj
+	Mutex() *deadlock.Mutex
 
 	GetCredentialStrategy() CredentialStrategy
 }
@@ -76,7 +77,7 @@ type CmdObj struct {
 	credentialStrategy CredentialStrategy
 
 	// can be set so that we don't run certain commands simultaneously
-	mutex *sync.Mutex
+	mutex *deadlock.Mutex
 }
 
 type CredentialStrategy int
@@ -139,11 +140,11 @@ func (self *CmdObj) IgnoreEmptyError() ICmdObj {
 	return self
 }
 
-func (self *CmdObj) Mutex() *sync.Mutex {
+func (self *CmdObj) Mutex() *deadlock.Mutex {
 	return self.mutex
 }
 
-func (self *CmdObj) WithMutex(mutex *sync.Mutex) ICmdObj {
+func (self *CmdObj) WithMutex(mutex *deadlock.Mutex) ICmdObj {
 	self.mutex = mutex
 
 	return self

pkg/commands/oscommands/cmd_obj_runner_win.go

@@ -13,7 +13,7 @@ import (
 
 type Buffer struct {
 	b bytes.Buffer
-	m sync.Mutex
+	m deadlock.Mutex
 }
 
 func (b *Buffer) Read(p []byte) (n int, err error) {