mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-15 10:06:26 -04:00
017367f940
When viewing branches in an enlargened window, we now colour the commit shas based on whether the branch has been merged to a main branch and whether it's been pushed to the upstream. This isn't using the exact same code as we use for commits, so it's possible we'll get a colour mismatch when the user checks out a branch and views the commits in the commits view, but if we come across that situation we'll just need to fix it.
94 lines
2.1 KiB
Go
94 lines
2.1 KiB
Go
package context
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
)
|
|
|
|
type BranchesContext struct {
|
|
*FilteredListViewModel[*models.Branch]
|
|
*ListContextTrait
|
|
}
|
|
|
|
var (
|
|
_ types.IListContext = (*BranchesContext)(nil)
|
|
_ types.DiffableContext = (*BranchesContext)(nil)
|
|
)
|
|
|
|
func NewBranchesContext(c *ContextCommon) *BranchesContext {
|
|
viewModel := NewFilteredListViewModel(
|
|
func() []*models.Branch { return c.Model().Branches },
|
|
func(branch *models.Branch) []string {
|
|
return []string{branch.Name}
|
|
},
|
|
)
|
|
|
|
getDisplayStrings := func(_ int, _ int) [][]string {
|
|
return presentation.GetBranchListDisplayStrings(
|
|
viewModel.GetItems(),
|
|
c.State().GetItemOperation,
|
|
c.State().GetRepoState().GetScreenMode() != types.SCREEN_NORMAL,
|
|
c.Modes().Diffing.Ref,
|
|
c.Tr,
|
|
c.UserConfig,
|
|
c.Model().Worktrees,
|
|
c.Model().MergedBranches,
|
|
)
|
|
}
|
|
|
|
self := &BranchesContext{
|
|
FilteredListViewModel: viewModel,
|
|
ListContextTrait: &ListContextTrait{
|
|
Context: NewSimpleContext(NewBaseContext(NewBaseContextOpts{
|
|
View: c.Views().Branches,
|
|
WindowName: "branches",
|
|
Key: LOCAL_BRANCHES_CONTEXT_KEY,
|
|
Kind: types.SIDE_CONTEXT,
|
|
Focusable: true,
|
|
})),
|
|
ListRenderer: ListRenderer{
|
|
list: viewModel,
|
|
getDisplayStrings: getDisplayStrings,
|
|
},
|
|
c: c,
|
|
},
|
|
}
|
|
|
|
return self
|
|
}
|
|
|
|
func (self *BranchesContext) GetSelectedItemId() string {
|
|
item := self.GetSelected()
|
|
if item == nil {
|
|
return ""
|
|
}
|
|
|
|
return item.ID()
|
|
}
|
|
|
|
func (self *BranchesContext) GetSelectedRef() types.Ref {
|
|
branch := self.GetSelected()
|
|
if branch == nil {
|
|
return nil
|
|
}
|
|
return branch
|
|
}
|
|
|
|
func (self *BranchesContext) GetDiffTerminals() []string {
|
|
// for our local branches we want to include both the branch and its upstream
|
|
branch := self.GetSelected()
|
|
if branch != nil {
|
|
names := []string{branch.ID()}
|
|
if branch.IsTrackingRemote() {
|
|
names = append(names, branch.ID()+"@{u}")
|
|
}
|
|
return names
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func (self *BranchesContext) ShowBranchHeadsInSubCommits() bool {
|
|
return true
|
|
}
|