From 44248d9ab0818dfca6a5c1f5ee2ad5b0d45d4998 Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Tue, 29 Sep 2020 18:34:01 +1000 Subject: pull branch model out into models package --- pkg/gui/branches_panel.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'pkg/gui/branches_panel.go') diff --git a/pkg/gui/branches_panel.go b/pkg/gui/branches_panel.go index be67def2d..dae81f7fa 100644 --- a/pkg/gui/branches_panel.go +++ b/pkg/gui/branches_panel.go @@ -6,11 +6,12 @@ import ( "github.com/jesseduffield/gocui" "github.com/jesseduffield/lazygit/pkg/commands" + "github.com/jesseduffield/lazygit/pkg/models" ) // list panel functions -func (gui *Gui) getSelectedBranch() *commands.Branch { +func (gui *Gui) getSelectedBranch() *models.Branch { if len(gui.State.Branches) == 0 { return nil } @@ -209,7 +210,7 @@ func (gui *Gui) handleCheckoutByName(g *gocui.Gui, v *gocui.View) error { }) } -func (gui *Gui) getCheckedOutBranch() *commands.Branch { +func (gui *Gui) getCheckedOutBranch() *models.Branch { if len(gui.State.Branches) == 0 { return nil } @@ -247,7 +248,7 @@ func (gui *Gui) deleteBranch(force bool) error { return gui.deleteNamedBranch(selectedBranch, force) } -func (gui *Gui) deleteNamedBranch(selectedBranch *commands.Branch, force bool) error { +func (gui *Gui) deleteNamedBranch(selectedBranch *models.Branch, force bool) error { title := gui.Tr.SLocalize("DeleteBranch") var messageID string if force { @@ -446,7 +447,7 @@ func (gui *Gui) handleRenameBranch(g *gocui.Gui, v *gocui.View) error { }) } -func (gui *Gui) currentBranch() *commands.Branch { +func (gui *Gui) currentBranch() *models.Branch { if len(gui.State.Branches) == 0 { return nil } -- cgit v1.2.3