sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-07-30 03:23:08 +03:00
Code Activity

only re-use repo state when jumping in and out of submodules

Browse Source
This commit is contained in:
Jesse Duffield
2021-04-05 13:22:03 +10:00
parent 2d7452bfaa
commit 7178bab6b4
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/gui/gui.go
View File

@ -352,16 +352,28 @@ type guiState struct {
ViewsSetup bool
}
func (gui *Gui) resetState(filterPath string) {
// reuseState determines if we pull the repo state from our repo state map or
// just re-initialize it. For now we're only re-using state when we're going
// in and out of submodules, for the sake of having the cursor back on the submodule
// when we return.
//
// I tried out always reverting to the repo's original state but found that in fact
// it gets a bit confusing to land back in the status panel when visiting a repo
// you've already switched from. There's no doubt some easy way to make the UX
// optimal for all cases but I'm too lazy to think about what that is right now
func (gui *Gui) resetState(filterPath string, reuseState bool) {
currentDir, err := os.Getwd()
if err == nil {
if state := gui.RepoStateMap[Repo(currentDir)]; state != nil {
gui.State = state
gui.State.ViewsSetup = false
return
if reuseState {
if err == nil {
if state := gui.RepoStateMap[Repo(currentDir)]; state != nil {
gui.State = state
gui.State.ViewsSetup = false
return
}
} else {
gui.Log.Error(err)
}
} else {
gui.Log.Error(err)
}
showTree := gui.Config.GetUserConfig().Gui.ShowFileTree
@ -443,7 +455,7 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *oscom
RepoStateMap: map[Repo]*guiState{},
}
gui.resetState(filterPath)
gui.resetState(filterPath, false)
gui.watchFilesForChanges()