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

some more refactoring

Browse Source
This commit is contained in:
Jesse Duffield
2022-01-30 20:03:08 +11:00
parent e2f5fe1016
commit 0a8cff6ab6
31 changed files with 647 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pkg/gui/keybindings.go
View File

@ -276,7 +276,7 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
{
ViewName: "",
Key: gui.getKey(config.Universal.CreateRebaseOptionsMenu),
Handler: gui.handleCreateRebaseOptionsMenu,
Handler: gui.helpers.rebase.CreateRebaseOptionsMenu,
Description: gui.c.Tr.ViewMergeRebaseOptions,
OpensMenu: true,
},
@ -423,7 +423,7 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
ViewName: "branches",
Contexts: []string{string(context.LOCAL_BRANCHES_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.New),
Handler: gui.handleNewBranchOffCurrentItem,
Handler: gui.handleNewBranchOffBranch,
Description: gui.c.Tr.LcNewBranch,
},
{
@ -513,13 +513,6 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
Handler: gui.handleEnterRemoteBranch,
Description: gui.c.Tr.LcViewCommits,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopy),
Handler: gui.handleCopyCommit,
Description: gui.c.Tr.LcCherryPickCopy,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
@ -527,33 +520,11 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
Handler: gui.handleCopySelectedSideContextItemToClipboard,
Description: gui.c.Tr.LcCopyCommitShaToClipboard,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopyRange),
Handler: gui.handleCopyCommitRange,
Description: gui.c.Tr.LcCherryPickCopyRange,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.PasteCommits),
Handler: guards.OutsideFilterMode(gui.HandlePasteCommits),
Description: gui.c.Tr.LcPasteCommits,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.New),
Modifier: gocui.ModNone,
Handler: gui.handleNewBranchOffCurrentItem,
Description: gui.c.Tr.LcCreateNewBranchFromCommit,
},
{
ViewName: "commits",
Contexts: []string{string(context.BRANCH_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.ResetCherryPick),
Handler: gui.exitCherryPickingMode,
Handler: gui.helpers.cherryPick.Reset,
Description: gui.c.Tr.LcResetCherryPick,
},
{
@ -582,21 +553,21 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
ViewName: "commits",
Contexts: []string{string(context.REFLOG_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopy),
Handler: guards.OutsideFilterMode(gui.handleCopyCommit),
Handler: guards.OutsideFilterMode(gui.handleCopyReflogCommit),
Description: gui.c.Tr.LcCherryPickCopy,
},
{
ViewName: "commits",
Contexts: []string{string(context.REFLOG_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopyRange),
Handler: guards.OutsideFilterMode(gui.handleCopyCommitRange),
Handler: guards.OutsideFilterMode(gui.handleCopyReflogCommitRange),
Description: gui.c.Tr.LcCherryPickCopyRange,
},
{
ViewName: "commits",
Contexts: []string{string(context.REFLOG_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.ResetCherryPick),
Handler: gui.exitCherryPickingMode,
Handler: gui.helpers.cherryPick.Reset,
Description: gui.c.Tr.LcResetCherryPick,
},
{
@ -632,28 +603,28 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
ViewName: "branches",
Contexts: []string{string(context.SUB_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.New),
Handler: gui.handleNewBranchOffCurrentItem,
Handler: gui.handleNewBranchOffSubCommit,
Description: gui.c.Tr.LcNewBranch,
},
{
ViewName: "branches",
Contexts: []string{string(context.SUB_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopy),
Handler: gui.handleCopyCommit,
Handler: gui.handleCopySubCommit,
Description: gui.c.Tr.LcCherryPickCopy,
},
{
ViewName: "branches",
Contexts: []string{string(context.SUB_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.CherryPickCopyRange),
Handler: gui.handleCopyCommitRange,
Handler: gui.handleCopySubCommitRange,
Description: gui.c.Tr.LcCherryPickCopyRange,
},
{
ViewName: "branches",
Contexts: []string{string(context.SUB_COMMITS_CONTEXT_KEY)},
Key: gui.getKey(config.Commits.ResetCherryPick),
Handler: gui.exitCherryPickingMode,
Handler: gui.helpers.cherryPick.Reset,
Description: gui.c.Tr.LcResetCherryPick,
},
{
@ -690,7 +661,7 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
{
ViewName: "stash",
Key: gui.getKey(config.Universal.New),
Handler: gui.handleNewBranchOffCurrentItem,
Handler: gui.handleNewBranchOffStashEntry,
Description: gui.c.Tr.LcNewBranch,
},
{
@ -1220,14 +1191,14 @@ func (gui *Gui) GetInitialKeybindings() []*types.Binding {
Contexts: []string{string(context.REMOTE_BRANCHES_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.Select),
// gonna use the exact same handler as the 'n' keybinding because everybody wants this to happen when they checkout a remote branch
Handler: gui.handleNewBranchOffCurrentItem,
Handler: gui.handleNewBranchOffRemoteBranch,
Description: gui.c.Tr.LcCheckout,
},
{
ViewName: "branches",
Contexts: []string{string(context.REMOTE_BRANCHES_CONTEXT_KEY)},
Key: gui.getKey(config.Universal.New),
Handler: gui.handleNewBranchOffCurrentItem,
Handler: gui.handleNewBranchOffRemoteBranch,
Description: gui.c.Tr.LcNewBranch,
},
{