start moving commit panel handlers into controller

more

and more

move rebase commit refreshing into existing abstraction

and more

and more

WIP

and more

handling clicks

properly fix merge conflicts

update cheatsheet

lots more preparation to start moving things into controllers

WIP

better typing

expand on remotes controller

moving more code into controllers

1 files changed, 198 insertions, 553 deletions

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
index 644e4560b..2f7e478b3 100644
--- a/pkg/gui/keybindings.go
+++ b/pkg/gui/keybindings.go
@@ -183,9 +183,24 @@ func (gui *Gui) getKey(key string) interface{} {
 	return nil
 }
 
+func (gui *Gui) noPopupPanel(f func() error) func() error {
+	return func() error {
+		if gui.popupPanelFocused() {
+			return nil
+		}
+
+		return f()
+	}
+}
+
 // GetInitialKeybindings is a function.
 func (gui *Gui) GetInitialKeybindings() []*types.Binding {
-	config := gui.UserConfig.Keybinding
+	config := gui.c.UserConfig.Keybinding
+
+	guards := types.KeybindingGuards{
+		OutsideFilterMode: gui.outsideFilterMode,
+		NoPopupPanel:      gui.noPopupPanel,
+	}
 
 	bindings := []*types.Binding{
 		{
@@ -217,21 +232,21 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Key:         gui.getKey(config.Universal.OpenRecentRepos),
 			Handler:     gui.handleCreateRecentReposMenu,
 			Alternative: "<c-r>",
-			Description: gui.Tr.SwitchRepo,
+			Description: gui.c.Tr.SwitchRepo,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.ScrollUpMain),
 			Handler:     gui.scrollUpMain,
 			Alternative: "fn+up",
-			Description: gui.Tr.LcScrollUpMainPanel,
+			Description: gui.c.Tr.LcScrollUpMainPanel,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.ScrollDownMain),
 			Handler:     gui.scrollDownMain,
 			Alternative: "fn+down",
-			Description: gui.Tr.LcScrollDownMainPanel,
+			Description: gui.c.Tr.LcScrollDownMainPanel,
 		},
 		{
 			ViewName: "",
@@ -261,39 +276,27 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.CreateRebaseOptionsMenu),
 			Handler:     gui.handleCreateRebaseOptionsMenu,
-			Description: gui.Tr.ViewMergeRebaseOptions,
+			Description: gui.c.Tr.ViewMergeRebaseOptions,
 			OpensMenu:   true,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.CreatePatchOptionsMenu),
 			Handler:     gui.handleCreatePatchOptionsMenu,
-			Description: gui.Tr.ViewPatchOptions,
+			Description: gui.c.Tr.ViewPatchOptions,
 			OpensMenu:   true,
 		},
 		{
 			ViewName:    "",
-			Key:         gui.getKey(config.Universal.PushFiles),
-			Handler:     gui.pushFiles,
-			Description: gui.Tr.LcPush,
-		},
-		{
-			ViewName:    "",
-			Key:         gui.getKey(config.Universal.PullFiles),
-			Handler:     gui.handlePullFiles,
-			Description: gui.Tr.LcPull,
-		},
-		{
-			ViewName:    "",
 			Key:         gui.getKey(config.Universal.Refresh),
 			Handler:     gui.handleRefresh,
-			Description: gui.Tr.LcRefresh,
+			Description: gui.c.Tr.LcRefresh,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.OptionMenu),
 			Handler:     gui.handleCreateOptionsMenu,
-			Description: gui.Tr.LcOpenMenu,
+			Description: gui.c.Tr.LcOpenMenu,
 			OpensMenu:   true,
 		},
 		{
@@ -309,235 +312,97 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Handler:  gui.handleCreateOptionsMenu,
 		},
 		{
-			ViewName:    "",
-			Key:         gui.getKey(config.Universal.Undo),
-			Handler:     gui.reflogUndo,
-			Description: gui.Tr.LcUndoReflog,
-		},
-		{
-			ViewName:    "",
-			Key:         gui.getKey(config.Universal.Redo),
-			Handler:     gui.reflogRedo,
-			Description: gui.Tr.LcRedoReflog,
-		},
-		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleEditConfig,
-			Description: gui.Tr.EditConfig,
+			Description: gui.c.Tr.EditConfig,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.NextScreenMode),
 			Handler:     gui.nextScreenMode,
-			Description: gui.Tr.LcNextScreenMode,
+			Description: gui.c.Tr.LcNextScreenMode,
 		},
 		{
 			ViewName:    "",
 			Key:         gui.getKey(config.Universal.PrevScreenMode),
 			Handler:     gui.prevScreenMode,
-			Description: gui.Tr.LcPrevScreenMode,
+			Description: gui.c.Tr.LcPrevScreenMode,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Universal.OpenFile),
 			Handler:     gui.handleOpenConfig,
-			Description: gui.Tr.OpenConfig,
+			Description: gui.c.Tr.OpenConfig,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Status.CheckForUpdate),
 			Handler:     gui.handleCheckForUpdate,
-			Description: gui.Tr.LcCheckForUpdate,
+			Description: gui.c.Tr.LcCheckForUpdate,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Status.RecentRepos),
 			Handler:     gui.handleCreateRecentReposMenu,
-			Description: gui.Tr.SwitchRepo,
+			Description: gui.c.Tr.SwitchRepo,
 		},
 		{
 			ViewName:    "status",
 			Key:         gui.getKey(config.Status.AllBranchesLogGraph),
 			Handler:     gui.handleShowAllBranchLogs,
-			Description: gui.Tr.LcAllBranchesLogGraph,
-		},
-		{
-			ViewName:    "files",
-			Key:         gui.getKey("<c-b>"),
-			Handler:     gui.handleStatusFilterPressed,
-			Description: gui.Tr.LcCommitFileFilter,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.CommitChanges),
-			Handler:     gui.handleCommitPress,
-			Description: gui.Tr.CommitChanges,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.CommitChangesWithoutHook),
-			Handler:     gui.handleWIPCommitPress,
-			Description: gui.Tr.LcCommitChangesWithoutHook,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.AmendLastCommit),
-			Handler:     gui.handleAmendCommitPress,
-			Description: gui.Tr.AmendLastCommit,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.CommitChangesWithEditor),
-			Handler:     gui.handleCommitEditorPress,
-			Description: gui.Tr.CommitChangesWithEditor,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Select),
-			Handler:     gui.handleFilePress,
-			Description: gui.Tr.LcToggleStaged,
+			Description: gui.c.Tr.LcAllBranchesLogGraph,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{string(FILES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleCreateDiscardMenu,
-			Description: gui.Tr.LcViewDiscardOptions,
+			Description: gui.c.Tr.LcViewDiscardOptions,
 			OpensMenu:   true,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Edit),
-			Handler:     gui.handleFileEdit,
-			Description: gui.Tr.LcEditFile,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.OpenFile),
-			Handler:     gui.handleFileOpen,
-			Description: gui.Tr.LcOpenFile,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.IgnoreFile),
-			Handler:     gui.handleIgnoreFile,
-			Description: gui.Tr.LcIgnoreFile,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.RefreshFiles),
-			Handler:     gui.handleRefreshFiles,
-			Description: gui.Tr.LcRefreshFiles,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.StashAllChanges),
-			Handler:     gui.handleStashChanges,
-			Description: gui.Tr.LcStashAllChanges,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.ViewStashOptions),
-			Handler:     gui.handleCreateStashMenu,
-			Description: gui.Tr.LcViewStashOptions,
-			OpensMenu:   true,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.ToggleStagedAll),
-			Handler:     gui.handleStageAll,
-			Description: gui.Tr.LcToggleStagedAll,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Files.ViewResetOptions),
 			Handler:     gui.handleCreateResetMenu,
-			Description: gui.Tr.LcViewResetOptions,
+			Description: gui.c.Tr.LcViewResetOptions,
 			OpensMenu:   true,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.GoInto),
-			Handler:     gui.handleEnterFile,
-			Description: gui.Tr.FileEnter,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Files.Fetch),
 			Handler:     gui.handleGitFetch,
-			Description: gui.Tr.LcFetch,
+			Description: gui.c.Tr.LcFetch,
 		},
 		{
 			ViewName:    "files",
 			Contexts:    []string{string(FILES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyFileNameToClipboard,
-		},
-		{
-			ViewName:    "",
-			Key:         gui.getKey(config.Universal.ExecuteCustomCommand),
-			Handler:     gui.handleCustomCommand,
-			Description: gui.Tr.LcExecuteCustomCommand,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.ViewResetOptions),
-			Handler:     gui.handleCreateResetToUpstreamMenu,
-			Description: gui.Tr.LcViewResetToUpstreamOptions,
-			OpensMenu:   true,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.ToggleTreeView),
-			Handler:     gui.handleToggleFileTreeView,
-			Description: gui.Tr.LcToggleTreeView,
-		},
-		{
-			ViewName:    "files",
-			Contexts:    []string{string(FILES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Files.OpenMergeTool),
-			Handler:     gui.handleOpenMergeTool,
-			Description: gui.Tr.LcOpenMergeTool,
+			Description: gui.c.Tr.LcCopyFileNameToClipboard,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleBranchPress,
-			Description: gui.Tr.LcCheckout,
+			Description: gui.c.Tr.LcCheckout,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.CreatePullRequest),
 			Handler:     gui.handleCreatePullRequestPress,
-			Description: gui.Tr.LcCreatePullRequest,
+			Description: gui.c.Tr.LcCreatePullRequest,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.ViewPullRequestOptions),
 			Handler:     gui.handleCreatePullRequestMenu,
-			Description: gui.Tr.LcCreatePullRequestOptions,
+			Description: gui.c.Tr.LcCreatePullRequestOptions,
 			OpensMenu:   true,
 		},
 		{
@@ -545,56 +410,56 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.CopyPullRequestURL),
 			Handler:     gui.handleCopyPullRequestURLPress,
-			Description: gui.Tr.LcCopyPullRequestURL,
+			Description: gui.c.Tr.LcCopyPullRequestURL,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.CheckoutBranchByName),
 			Handler:     gui.handleCheckoutByName,
-			Description: gui.Tr.LcCheckoutByName,
+			Description: gui.c.Tr.LcCheckoutByName,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.ForceCheckoutBranch),
 			Handler:     gui.handleForceCheckout,
-			Description: gui.Tr.LcForceCheckout,
+			Description: gui.c.Tr.LcForceCheckout,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.handleNewBranchOffCurrentItem,
-			Description: gui.Tr.LcNewBranch,
+			Description: gui.c.Tr.LcNewBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleDeleteBranch,
-			Description: gui.Tr.LcDeleteBranch,
+			Description: gui.c.Tr.LcDeleteBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.RebaseBranch),
-			Handler:     gui.handleRebaseOntoLocalBranch,
-			Description: gui.Tr.LcRebaseBranch,
+			Handler:     guards.OutsideFilterMode(gui.handleRebaseOntoLocalBranch),
+			Description: gui.c.Tr.LcRebaseBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.MergeIntoCurrentBranch),
-			Handler:     gui.handleMerge,
-			Description: gui.Tr.LcMergeIntoCurrentBranch,
+			Handler:     guards.OutsideFilterMode(gui.handleMerge),
+			Description: gui.c.Tr.LcMergeIntoCurrentBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.ViewGitFlowOptions),
 			Handler:     gui.handleCreateGitFlowMenu,
-			Description: gui.Tr.LcGitFlowOptions,
+			Description: gui.c.Tr.LcGitFlowOptions,
 			OpensMenu:   true,
 		},
 		{
@@ -602,14 +467,14 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.FastForward),
 			Handler:     gui.handleFastForward,
-			Description: gui.Tr.FastForward,
+			Description: gui.c.Tr.FastForward,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToBranchMenu,
-			Description: gui.Tr.LcViewResetOptions,
+			Description: gui.c.Tr.LcViewResetOptions,
 			OpensMenu:   true,
 		},
 		{
@@ -617,78 +482,35 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Branches.RenameBranch),
 			Handler:     gui.handleRenameBranch,
-			Description: gui.Tr.LcRenameBranch,
+			Description: gui.c.Tr.LcRenameBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyBranchNameToClipboard,
+			Description: gui.c.Tr.LcCopyBranchNameToClipboard,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(LOCAL_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleSwitchToSubCommits,
-			Description: gui.Tr.LcViewCommits,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Select),
-			Handler:     gui.withSelectedTag(gui.handleCheckoutTag),
-			Description: gui.Tr.LcCheckout,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Remove),
-			Handler:     gui.withSelectedTag(gui.handleDeleteTag),
-			Description: gui.Tr.LcDeleteTag,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Branches.PushTag),
-			Handler:     gui.withSelectedTag(gui.handlePushTag),
-			Description: gui.Tr.LcPushTag,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.New),
-			Handler:     gui.handleCreateTag,
-			Description: gui.Tr.LcCreateTag,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.ViewResetOptions),
-			Handler:     gui.withSelectedTag(gui.handleCreateResetToTagMenu),
-			Description: gui.Tr.LcViewResetOptions,
-			OpensMenu:   true,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(TAGS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.GoInto),
-			Handler:     gui.handleSwitchToSubCommits,
-			Description: gui.Tr.LcViewCommits,
+			Description: gui.c.Tr.LcViewCommits,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(REMOTE_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Return),
 			Handler:     gui.handleRemoteBranchesEscape,
-			Description: gui.Tr.ReturnToRemotesList,
+			Description: gui.c.Tr.ReturnToRemotesList,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(REMOTE_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateResetToRemoteBranchMenu,
-			Description: gui.Tr.LcViewResetOptions,
+			Description: gui.c.Tr.LcViewResetOptions,
 			OpensMenu:   true,
 		},
 		{
@@ -696,162 +518,35 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Contexts:    []string{string(REMOTE_BRANCHES_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleSwitchToSubCommits,
-			Description: gui.Tr.LcViewCommits,
-		},
-		{
-			ViewName:    "branches",
-			Contexts:    []string{string(REMOTES_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Branches.FetchRemote),
-			Handler:     gui.handleFetchRemote,
-			Description: gui.Tr.LcFetchRemote,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.OpenLogMenu),
-			Handler:     gui.handleOpenLogMenu,
-			Description: gui.Tr.LcOpenLogMenu,
-			OpensMenu:   true,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.SquashDown),
-			Handler:     gui.handleCommitSquashDown,
-			Description: gui.Tr.LcSquashDown,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.RenameCommit),
-			Handler:     gui.handleRewordCommit,
-			Description: gui.Tr.LcRewordCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.RenameCommitWithEditor),
-			Handler:     gui.handleRewordCommitEditor,
-			Description: gui.Tr.LcRenameCommitEditor,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.ViewResetOptions),
-			Handler:     gui.handleCreateCommitResetMenu,
-			Description: gui.Tr.LcResetToThisCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.MarkCommitAsFixup),
-			Handler:     gui.handleCommitFixup,
-			Description: gui.Tr.LcFixupCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.CreateFixupCommit),
-			Handler:     gui.handleCreateFixupCommit,
-			Description: gui.Tr.LcCreateFixupCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.SquashAboveCommits),
-			Handler:     gui.handleSquashAllAboveFixupCommits,
-			Description: gui.Tr.LcSquashAboveCommits,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Remove),
-			Handler:     gui.handleCommitDelete,
-			Description: gui.Tr.LcDeleteCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.MoveDownCommit),
-			Handler:     gui.handleCommitMoveDown,
-			Description: gui.Tr.LcMoveDownCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.MoveUpCommit),
-			Handler:     gui.handleCommitMoveUp,
-			Description: gui.Tr.LcMoveUpCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.Edit),
-			Handler:     gui.handleCommitEdit,
-			Description: gui.Tr.LcEditCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.AmendToCommit),
-			Handler:     gui.handleCommitAmendTo,
-			Description: gui.Tr.LcAmendToCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.PickCommit),
-			Handler:     gui.handleCommitPick,
-			Description: gui.Tr.LcPickCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.RevertCommit),
-			Handler:     gui.handleCommitRevert,
-			Description: gui.Tr.LcRevertCommit,
+			Description: gui.c.Tr.LcViewCommits,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
 			Handler:     gui.handleCopyCommit,
-			Description: gui.Tr.LcCherryPickCopy,
+			Description: gui.c.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyCommitShaToClipboard,
+			Description: gui.c.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
 			Handler:     gui.handleCopyCommitRange,
-			Description: gui.Tr.LcCherryPickCopyRange,
+			Description: gui.c.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.PasteCommits),
-			Handler:     gui.HandlePasteCommits,
-			Description: gui.Tr.LcPasteCommits,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Universal.GoInto),
-			Handler:     gui.handleViewCommitFiles,
-			Description: gui.Tr.LcViewCommitFiles,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.CheckoutCommit),
-			Handler:     gui.handleCheckoutCommit,
-			Description: gui.Tr.LcCheckoutCommit,
+			Handler:     guards.OutsideFilterMode(gui.HandlePasteCommits),
+			Description: gui.c.Tr.LcPasteCommits,
 		},
 		{
 			ViewName:    "commits",
@@ -859,114 +554,85 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Key:         gui.getKey(config.Universal.New),
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleNewBranchOffCurrentItem,
-			Description: gui.Tr.LcCreateNewBranchFromCommit,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.TagCommit),
-			Handler:     gui.handleTagCommit,
-			Description: gui.Tr.LcTagCommit,
+			Description: gui.c.Tr.LcCreateNewBranchFromCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.exitCherryPickingMode,
-			Description: gui.Tr.LcResetCherryPick,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.CopyCommitMessageToClipboard),
-			Handler:     gui.handleCopySelectedCommitMessageToClipboard,
-			Description: gui.Tr.LcCopyCommitMessageToClipboard,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.OpenInBrowser),
-			Handler:     gui.handleOpenCommitInBrowser,
-			Description: gui.Tr.LcOpenCommitInBrowser,
-		},
-		{
-			ViewName:    "commits",
-			Contexts:    []string{string(BRANCH_COMMITS_CONTEXT_KEY)},
-			Key:         gui.getKey(config.Commits.ViewBisectOptions),
-			Handler:     gui.handleOpenBisectMenu,
-			Description: gui.Tr.LcViewBisectOptions,
-			OpensMenu:   true,
+			Description: gui.c.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleViewReflogCommitFiles,
-			Description: gui.Tr.LcViewCommitFiles,
+			Description: gui.c.Tr.LcViewCommitFiles,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Select),
-			Handler:     gui.handleCheckoutReflogCommit,
-			Description: gui.Tr.LcCheckoutCommit,
+			Handler:     gui.CheckoutReflogCommit,
+			Description: gui.c.Tr.LcCheckoutCommit,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateReflogResetMenu,
-			Description: gui.Tr.LcViewResetOptions,
+			Description: gui.c.Tr.LcViewResetOptions,
 			OpensMenu:   true,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
-			Handler:     gui.handleCopyCommit,
-			Description: gui.Tr.LcCherryPickCopy,
+			Handler:     guards.OutsideFilterMode(gui.handleCopyCommit),
+			Description: gui.c.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
-			Handler:     gui.handleCopyCommitRange,
-			Description: gui.Tr.LcCherryPickCopyRange,
+			Handler:     guards.OutsideFilterMode(gui.handleCopyCommitRange),
+			Description: gui.c.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.exitCherryPickingMode,
-			Description: gui.Tr.LcResetCherryPick,
+			Description: gui.c.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "commits",
 			Contexts:    []string{string(REFLOG_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyCommitShaToClipboard,
+			Description: gui.c.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleViewSubCommitFiles,
-			Description: gui.Tr.LcViewCommitFiles,
+			Description: gui.c.Tr.LcViewCommitFiles,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleCheckoutSubCommit,
-			Description: gui.Tr.LcCheckoutCommit,
+			Description: gui.c.Tr.LcCheckoutCommit,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ViewResetOptions),
 			Handler:     gui.handleCreateSubCommitResetMenu,
-			Description: gui.Tr.LcViewResetOptions,
+			Description: gui.c.Tr.LcViewResetOptions,
 			OpensMenu:   true,
 		},
 		{
@@ -974,65 +640,65 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.handleNewBranchOffCurrentItem,
-			Description: gui.Tr.LcNewBranch,
+			Description: gui.c.Tr.LcNewBranch,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopy),
 			Handler:     gui.handleCopyCommit,
-			Description: gui.Tr.LcCherryPickCopy,
+			Description: gui.c.Tr.LcCherryPickCopy,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.CherryPickCopyRange),
 			Handler:     gui.handleCopyCommitRange,
-			Description: gui.Tr.LcCherryPickCopyRange,
+			Description: gui.c.Tr.LcCherryPickCopyRange,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Commits.ResetCherryPick),
 			Handler:     gui.exitCherryPickingMode,
-			Description: gui.Tr.LcResetCherryPick,
+			Description: gui.c.Tr.LcResetCherryPick,
 		},
 		{
 			ViewName:    "branches",
 			Contexts:    []string{string(SUB_COMMITS_CONTEXT_KEY)},
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyCommitShaToClipboard,
+			Description: gui.c.Tr.LcCopyCommitShaToClipboard,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.GoInto),
 			Handler:     gui.handleViewStashFiles,
-			Description: gui.Tr.LcViewStashFiles,
+			Description: gui.c.Tr.LcViewStashFiles,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleStashApply,
-			Description: gui.Tr.LcApply,
+			Description: gui.c.Tr.LcApply,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Stash.PopStash),
 			Handler:     gui.handleStashPop,
-			Description: gui.Tr.LcPop,
+			Description: gui.c.Tr.LcPop,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleStashDrop,
-			Description: gui.Tr.LcDrop,
+			Description: gui.c.Tr.LcDrop,
 		},
 		{
 			ViewName:    "stash",
 			Key:         gui.getKey(config.Universal.New),
 			Handler:     gui.handleNewBranchOffCurrentItem,
-			Description: gui.Tr.LcNewBranch,
+			Description: gui.c.Tr.LcNewBranch,
 		},
 		{
 			ViewName: "commitMessage",
@@ -1062,7 +728,7 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			ViewName:    "menu",
 			Key:         gui.getKey(config.Universal.Return),
 			Handler:     gui.handleMenuClose,
-			Description: gui.Tr.LcCloseMenu,
+			Description: gui.c.Tr.LcCloseMenu,
 		},
 		{
 			ViewName: "information",
@@ -1074,76 +740,76 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.CopyToClipboard),
 			Handler:     gui.handleCopySelectedSideContextItemToClipboard,
-			Description: gui.Tr.LcCopyCommitFileNameToClipboard,
+			Description: gui.c.Tr.LcCopyCommitFileNameToClipboard,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.CommitFiles.CheckoutCommitFile),
 			Handler:     gui.handleCheckoutCommitFile,
-			Description: gui.Tr.LcCheckoutCommitFile,
+			Description: gui.c.Tr.LcCheckoutCommitFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Remove),
 			Handler:     gui.handleDiscardOldFileChange,
-			Description: gui.Tr.LcDiscardOldFileChange,
+			Description: gui.c.Tr.LcDiscardOldFileChange,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.OpenFile),
 			Handler:     gui.handleOpenOldCommitFile,
-			Description: gui.Tr.LcOpenFile,
+			Description: gui.c.Tr.LcOpenFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Edit),
 			Handler:     gui.handleEditCommitFile,
-			Description: gui.Tr.LcEditFile,
+			Description: gui.c.Tr.LcEditFile,
 		},
 		{
 			ViewName:    "commitFiles",
 			Key:         gui.getKey(config.Universal.Select),
 			Handler:     gui.handleToggleFileForPatch,
-			Description: gui.Tr.LcToggleAddToPatch,
+			Description: gui.c.Tr.