mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-11 12:25:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

allow opening lazygit to a specific panel

Browse source
This commit is contained in:
Jesse Duffield 2022-06-09 19:52:08 +10:00
parent 36aa01c3ac
commit b1e4968d0b
22 changed files with 152 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

57
pkg/gui/gui.go
View file

@ -249,7 +249,7 @@ type guiMutexes struct {
PopupMutex *sync.Mutex
}
func (gui *Gui) onNewRepo(filterPath string, reuseState bool) error {
func (gui *Gui) onNewRepo(startArgs types.StartArgs, reuseState bool) error {
var err error
gui.git, err = commands.NewGitCommand(
gui.Common,
@ -261,7 +261,7 @@ func (gui *Gui) onNewRepo(filterPath string, reuseState bool) error {
return err
}
gui.resetState(filterPath, reuseState)
gui.resetState(startArgs, reuseState)
gui.resetControllers()
@ -281,7 +281,7 @@ func (gui *Gui) onNewRepo(filterPath string, reuseState bool) error {
// 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) {
func (gui *Gui) resetState(startArgs types.StartArgs, reuseState bool) {
currentDir, err := os.Getwd()
if reuseState {
@ -306,12 +306,8 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
contextTree := gui.contextTree()
screenMode := SCREEN_NORMAL
var initialContext types.IListContext = contextTree.Files
if filterPath != "" {
screenMode = SCREEN_HALF
initialContext = contextTree.LocalCommits
}
initialContext := initialContext(contextTree, startArgs)
initialScreenMode := initialScreenMode(startArgs)
viewContextMap := context.NewViewContextMap()
for viewName, context := range initialViewContextMapping(contextTree) {
@ -338,13 +334,13 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
},
Ptmx: nil,
Modes: &types.Modes{
Filtering: filtering.New(filterPath),
Filtering: filtering.New(startArgs.FilterPath),
CherryPicking: cherrypicking.New(),
Diffing: diffing.New(),
},
ViewContextMap: viewContextMap,
ViewTabContextMap: gui.initialViewTabContextMap(contextTree),
ScreenMode: screenMode,
ScreenMode: initialScreenMode,
// TODO: put contexts in the context manager
ContextManager: NewContextManager(initialContext),
Contexts: contextTree,
@ -355,6 +351,37 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
gui.RepoStateMap[Repo(currentDir)] = gui.State
}
func initialScreenMode(startArgs types.StartArgs) WindowMaximisation {
if startArgs.FilterPath != "" || startArgs.GitArg != types.GitArgNone {
return SCREEN_HALF
} else {
return SCREEN_NORMAL
}
}
func initialContext(contextTree *context.ContextTree, startArgs types.StartArgs) types.IListContext {
var initialContext types.IListContext = contextTree.Files
if startArgs.FilterPath != "" {
initialContext = contextTree.LocalCommits
} else if startArgs.GitArg != types.GitArgNone {
switch startArgs.GitArg {
case types.GitArgStatus:
initialContext = contextTree.Files
case types.GitArgBranch:
initialContext = contextTree.Branches
case types.GitArgLog:
initialContext = contextTree.LocalCommits
case types.GitArgStash:
initialContext = contextTree.Stash
default:
panic("unhandled git arg")
}
}
return initialContext
}
func (gui *Gui) syncViewContexts() {
for viewName, context := range gui.State.ViewContextMap.Entries() {
view, err := gui.g.View(viewName)
@ -506,7 +533,7 @@ func (gui *Gui) initialViewTabContextMap(contextTree *context.ContextTree) map[s
}
// Run: setup the gui with keybindings and start the mainloop
func (gui *Gui) Run(filterPath string) error {
func (gui *Gui) Run(startArgs types.StartArgs) error {
g, err := gui.initGocui()
if err != nil {
return err
@ -559,7 +586,7 @@ func (gui *Gui) Run(filterPath string) error {
}
// onNewRepo must be called after g.SetManager because SetManager deletes keybindings
if err := gui.onNewRepo(filterPath, false); err != nil {
if err := gui.onNewRepo(startArgs, false); err != nil {
return err
}
@ -592,10 +619,10 @@ func (gui *Gui) Run(filterPath string) error {
return gui.g.MainLoop()
}
func (gui *Gui) RunAndHandleError(filterPath string) error {
func (gui *Gui) RunAndHandleError(startArgs types.StartArgs) error {
gui.stopChan = make(chan struct{})
return utils.SafeWithError(func() error {
if err := gui.Run(filterPath); err != nil {
if err := gui.Run(startArgs); err != nil {
for _, manager := range gui.viewBufferManagerMap {
manager.Close()
}