go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-29 23:17:32 +02:00
Code Issues Releases Activity

cleanup

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-23 10:13:56 +10:00
parent 0dd2c869a8
commit ade54b38c1
6 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/commands/patch/patch_manager.go
View File

@ -36,6 +36,7 @@ type PatchManager struct {
Reverse bool
// CanRebase tells us whether we're allowed to modify our commits. CanRebase should be true for commits of the currently checked out branch and false for everything else
// TODO: move this out into a proper mode struct in the gui package: it doesn't really belong here
CanRebase bool
// fileInfoMap starts empty but you add files to it as you go along

16
pkg/gui/context.go
View File

@ -210,7 +210,7 @@ func (gui *Gui) contextTree() ContextTree {
},
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: "normal",
Key: MAIN_NORMAL_CONTEXT_KEY,
},
},
Staging: SimpleContextNode{
@ -222,7 +222,7 @@ func (gui *Gui) contextTree() ContextTree {
},
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: "staging",
Key: MAIN_STAGING_CONTEXT_KEY,
},
},
PatchBuilding: SimpleContextNode{
@ -234,7 +234,7 @@ func (gui *Gui) contextTree() ContextTree {
},
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: "patchBuilding",
Key: MAIN_PATCH_BUILDING_CONTEXT_KEY,
},
},
Merging: SimpleContextNode{
@ -246,7 +246,7 @@ func (gui *Gui) contextTree() ContextTree {
},
Kind: MAIN_CONTEXT,
ViewName: "main",
Key: "merging",
Key: MAIN_MERGING_CONTEXT_KEY,
},
},
Credentials: SimpleContextNode{
@ -254,7 +254,7 @@ func (gui *Gui) contextTree() ContextTree {
OnFocus: func() error { return gui.handleCredentialsViewFocused() },
Kind: PERSISTENT_POPUP,
ViewName: "credentials",
Key: "credentials",
Key: CREDENTIALS_CONTEXT_KEY,
},
},
Confirmation: SimpleContextNode{
@ -262,7 +262,7 @@ func (gui *Gui) contextTree() ContextTree {
OnFocus: func() error { return nil },
Kind: TEMPORARY_POPUP,
ViewName: "confirmation",
Key: "confirmation",
Key: CONFIRMATION_CONTEXT_KEY,
},
},
CommitMessage: SimpleContextNode{
@ -270,7 +270,7 @@ func (gui *Gui) contextTree() ContextTree {
OnFocus: func() error { return gui.handleCommitMessageFocused() },
Kind: PERSISTENT_POPUP,
ViewName: "commitMessage",
Key: "commitMessage",
Key: COMMIT_MESSAGE_CONTEXT_KEY,
},
},
Search: SimpleContextNode{
@ -278,7 +278,7 @@ func (gui *Gui) contextTree() ContextTree {
OnFocus: func() error { return nil },
Kind: PERSISTENT_POPUP,
ViewName: "search",
Key: "search",
Key: SEARCH_CONTEXT_KEY,
},
},
}

13
pkg/gui/list_context.go
View File

@ -232,13 +232,12 @@ func (lc *ListContext) onSearchSelect(selectedLineIdx int) error {
func (gui *Gui) menuListContext() *ListContext {
return &ListContext{
ViewName: "menu",
ContextKey: "menu",
GetItemsLength: func() int { return gui.getMenuView().LinesHeight() },
GetPanelState: func() IListPanelState { return gui.State.Panels.Menu },
OnFocus: gui.handleMenuSelect,
// need to add a layer of indirection here because the callback changes during runtime
OnClickSelectedItem: func() error { return gui.State.Panels.Menu.OnPress() },
ViewName: "menu",
ContextKey: "menu",
GetItemsLength: func() int { return gui.getMenuView().LinesHeight() },
GetPanelState: func() IListPanelState { return gui.State.Panels.Menu },
OnFocus: gui.handleMenuSelect,
OnClickSelectedItem: func() error { return gui.onMenuPress() },
Gui: gui,
ResetMainViewOriginOnFocus: false,
Kind: PERSISTENT_POPUP,

4
pkg/gui/patch_options_panel.go
View File

@ -42,7 +42,7 @@ func (gui *Gui) handleCreatePatchOptionsMenu(g *gocui.Gui, v *gocui.View) error
},
}...)
if gui.currentContext() == gui.Contexts.BranchCommits.Context {
if gui.currentContext().GetKey() == gui.Contexts.BranchCommits.Context.GetKey() {
selectedCommit := gui.getSelectedLocalCommit()
if selectedCommit != nil && gui.GitCommand.PatchManager.To != selectedCommit.Sha {
// adding this option to index 1
@ -84,7 +84,7 @@ func (gui *Gui) validateNormalWorkingTreeState() (bool, error) {
}
func (gui *Gui) returnFocusFromLineByLinePanelIfNecessary() error {
if gui.State.MainContext == "patchBuilding" {
if gui.State.MainContext == MAIN_PATCH_BUILDING_CONTEXT_KEY {
return gui.handleEscapePatchBuildingPanel()
}
return nil

2
pkg/gui/sub_commits_panel.go
View File

@ -107,7 +107,5 @@ func (gui *Gui) handleSwitchToSubCommits() error {
return nil
}
gui.Log.Warn(currentContext.GetKey())
return gui.switchToSubCommitsContext(currentContext.GetSelectedItemId())
}

2
pkg/gui/window.go
View File

@ -4,7 +4,7 @@ package gui
// A view is a box that renders content, and within a window only one view will
// appear at a time. When a view appears within a window, it occupies the whole
// space. Right now most windows are 1:1 with views, except for commitFiles which
// is a view belonging to the 'commits' window, alongside the 'commits' view.
// is a view that moves between windows
func (gui *Gui) getViewNameForWindow(window string) string {
viewName, ok := gui.State.WindowViewNameMap[window]