mirror of
https://github.com/jesseduffield/lazygit.git
synced 2025-10-23 17:48:30 +03:00
20517330b4
This makes it easier to use the full ref in the git merge-base call, which avoids ambiguities when there's a tag with the same name as the current branch. This fixes a hash coloring bug in the local commits panel when there's a tag with the same name as the checked out branch; in this case all commit hashes that should be yellow were painted as red.
80 lines
2.4 KiB
Go
80 lines
2.4 KiB
Go
package helpers
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands/git_commands"
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/types"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
)
|
|
|
|
type SubCommitsHelper struct {
|
|
c *HelperCommon
|
|
|
|
refreshHelper *RefreshHelper
|
|
}
|
|
|
|
func NewSubCommitsHelper(
|
|
c *HelperCommon,
|
|
refreshHelper *RefreshHelper,
|
|
) *SubCommitsHelper {
|
|
return &SubCommitsHelper{
|
|
c: c,
|
|
refreshHelper: refreshHelper,
|
|
}
|
|
}
|
|
|
|
type ViewSubCommitsOpts struct {
|
|
Ref models.Ref
|
|
RefToShowDivergenceFrom string
|
|
TitleRef string
|
|
Context types.Context
|
|
ShowBranchHeads bool
|
|
}
|
|
|
|
func (self *SubCommitsHelper) ViewSubCommits(opts ViewSubCommitsOpts) error {
|
|
commits, err := self.c.Git().Loaders.CommitLoader.GetCommits(
|
|
git_commands.GetCommitsOptions{
|
|
Limit: true,
|
|
FilterPath: self.c.Modes().Filtering.GetPath(),
|
|
FilterAuthor: self.c.Modes().Filtering.GetAuthor(),
|
|
IncludeRebaseCommits: false,
|
|
RefName: opts.Ref.FullRefName(),
|
|
RefForPushedStatus: opts.Ref,
|
|
RefToShowDivergenceFrom: opts.RefToShowDivergenceFrom,
|
|
MainBranches: self.c.Model().MainBranches,
|
|
HashPool: self.c.Model().HashPool,
|
|
},
|
|
)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
self.setSubCommits(commits)
|
|
self.refreshHelper.RefreshAuthors(commits)
|
|
|
|
subCommitsContext := self.c.Contexts().SubCommits
|
|
subCommitsContext.SetSelection(0)
|
|
subCommitsContext.SetParentContext(opts.Context)
|
|
subCommitsContext.SetWindowName(opts.Context.GetWindowName())
|
|
subCommitsContext.SetTitleRef(utils.TruncateWithEllipsis(opts.TitleRef, 50))
|
|
subCommitsContext.SetRef(opts.Ref)
|
|
subCommitsContext.SetRefToShowDivergenceFrom(opts.RefToShowDivergenceFrom)
|
|
subCommitsContext.SetLimitCommits(true)
|
|
subCommitsContext.SetShowBranchHeads(opts.ShowBranchHeads)
|
|
subCommitsContext.ClearSearchString()
|
|
subCommitsContext.GetView().ClearSearch()
|
|
subCommitsContext.GetView().TitlePrefix = opts.Context.GetView().TitlePrefix
|
|
|
|
self.c.PostRefreshUpdate(self.c.Contexts().SubCommits)
|
|
|
|
self.c.Context().Push(self.c.Contexts().SubCommits, types.OnFocusOpts{})
|
|
return nil
|
|
}
|
|
|
|
func (self *SubCommitsHelper) setSubCommits(commits []*models.Commit) {
|
|
self.c.Mutexes().SubCommitsMutex.Lock()
|
|
defer self.c.Mutexes().SubCommitsMutex.Unlock()
|
|
|
|
self.c.Model().SubCommits = commits
|
|
}
|