go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-01-10 04:07:18 +02:00
Code Issues Releases Activity

WIP

Browse Source
This commit is contained in:
Jesse Duffield 2020-08-19 19:13:47 +10:00
parent 2b812b01e9
commit 7ebed76d16
3 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/gui/branches_panel.go
View File

@ -89,11 +89,6 @@ func (gui *Gui) renderLocalBranchesWithSelection() error {
gui.refreshSelectedLine(&gui.State.Panels.Branches.SelectedLine, len(gui.State.Branches))
displayStrings := presentation.GetBranchListDisplayStrings(gui.State.Branches, gui.State.ScreenMode != SCREEN_NORMAL, gui.State.Diff.Ref)
gui.renderDisplayStrings(branchesView, displayStrings)
// if gui.g.CurrentView() == branchesView {
// if err := gui.handleBranchSelect(); err != nil {
// return gui.surfaceError(err)
// }
// }
return nil
}
@ -453,23 +448,6 @@ func (gui *Gui) onBranchesTabClick(tabIndex int) error {
return gui.switchContext(context)
}
func (gui *Gui) refreshBranchesViewWithSelection() error {
branchesView := gui.getBranchesView()
switch branchesView.Context {
case "local-branches":
return gui.renderLocalBranchesWithSelection()
case "remotes":
return gui.renderRemotesWithSelection()
case "remote-branches":
return gui.renderRemoteBranchesWithSelection()
case "tags":
return gui.renderTagsWithSelection()
}
return nil
}
func (gui *Gui) handleNextBranchesTab(g *gocui.Gui, v *gocui.View) error {
return gui.onBranchesTabClick(
utils.ModuloWithWrap(v.TabIndex+1, len(v.Tabs)),

18
pkg/gui/commits_panel.go
View File

@ -119,13 +119,7 @@ func (gui *Gui) refreshCommitsWithLimit() error {
}
gui.State.Commits = commits
if gui.getCommitsView().Context == "branch-commits" {
if err := gui.renderBranchCommitsWithSelection(); err != nil {
return err
}
}
return nil
return gui.postRefreshUpdate(gui.Contexts.BranchCommits.Context)
}
// specific functions
@ -439,12 +433,12 @@ func (gui *Gui) handleCopyCommit(g *gocui.Gui, v *gocui.View) error {
for index, cherryPickedCommit := range gui.State.CherryPickedCommits {
if commit.Sha == cherryPickedCommit.Sha {
gui.State.CherryPickedCommits = append(gui.State.CherryPickedCommits[0:index], gui.State.CherryPickedCommits[index+1:]...)
return gui.renderBranchCommitsWithSelection()
return gui.Contexts.BranchCommits.Context.HandleRender()
}
}
gui.addCommitToCherryPickedCommits(gui.State.Panels.Commits.SelectedLine)
return gui.renderBranchCommitsWithSelection()
return gui.Contexts.BranchCommits.Context.HandleRender()
}
func (gui *Gui) cherryPickedCommitShaMap() map[string]bool {
@ -492,7 +486,7 @@ func (gui *Gui) handleCopyCommitRange(g *gocui.Gui, v *gocui.View) error {
gui.addCommitToCherryPickedCommits(index)
}
return gui.renderBranchCommitsWithSelection()
return gui.Contexts.BranchCommits.Context.HandleRender()
}
// HandlePasteCommits begins a cherry-pick rebase with the commits the user has copied
@ -678,7 +672,7 @@ func (gui *Gui) refreshCommitsViewWithSelection() error {
switch commitsView.Context {
case "branch-commits":
return gui.renderBranchCommitsWithSelection()
return gui.Contexts.BranchCommits.Context.HandleRender()
case "reflog-commits":
return gui.renderReflogCommitsWithSelection()
}
@ -721,7 +715,7 @@ func (gui *Gui) handleOpenSearchForCommitsPanel(g *gocui.Gui, v *gocui.View) err
func (gui *Gui) handleResetCherryPick(g *gocui.Gui, v *gocui.View) error {
gui.State.CherryPickedCommits = []*commands.Commit{}
return gui.renderBranchCommitsWithSelection()
return gui.Contexts.BranchCommits.Context.HandleRender()
}
func (gui *Gui) handleGotoBottomForCommitsPanel(g *gocui.Gui, v *gocui.View) error {

11
pkg/gui/reflog_panel.go
View File

@ -85,11 +85,7 @@ func (gui *Gui) refreshReflogCommits() error {
state.FilteredReflogCommits = state.ReflogCommits
}
if gui.getCommitsView().Context == "reflog-commits" {
return gui.renderReflogCommitsWithSelection()
}
return nil
return gui.postRefreshUpdate(gui.Contexts.ReflogCommits.Context)
}
func (gui *Gui) renderReflogCommitsWithSelection() error {
@ -98,11 +94,6 @@ func (gui *Gui) renderReflogCommitsWithSelection() error {
gui.refreshSelectedLine(&gui.State.Panels.ReflogCommits.SelectedLine, len(gui.State.FilteredReflogCommits))
displayStrings := presentation.GetReflogCommitListDisplayStrings(gui.State.FilteredReflogCommits, gui.State.ScreenMode != SCREEN_NORMAL, gui.State.Diff.Ref)
gui.renderDisplayStrings(commitsView, displayStrings)
if gui.g.CurrentView() == commitsView && commitsView.Context == "reflog-commits" {
if err := gui.handleReflogCommitSelect(); err != nil {
return err
}
}
return nil
}