mirrors/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-12 12:55:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Make GetMergeBase a method of ExistingMainBranches

Browse source
This commit is contained in:
Stefan Haller 2024-05-18 20:24:05 +02:00
parent f4d922bc80
commit e79b4259e4
2 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

27
pkg/commands/git_commands/commit_loader.go
View file

@ -103,9 +103,9 @@ func (self *CommitLoader) GetCommits(opts GetCommitsOptions) ([]*models.Commit,
go utils.Safe(func() { go utils.Safe(func() {
defer wg.Done() defer wg.Done()
ancestor = self.getMergeBase(opts.RefName, opts.MainBranches) ancestor = opts.MainBranches.GetMergeBase(opts.RefName)
if opts.RefToShowDivergenceFrom != "" { if opts.RefToShowDivergenceFrom != "" {
remoteAncestor = self.getMergeBase(opts.RefToShowDivergenceFrom, opts.MainBranches) remoteAncestor = opts.MainBranches.GetMergeBase(opts.RefToShowDivergenceFrom)
} }
}) })
@ -466,29 +466,6 @@ func setCommitMergedStatuses(ancestor string, commits []*models.Commit) {
} }
} }
func (self *CommitLoader) getMergeBase(refName string, existingMainBranches *ExistingMainBranches) string {
mainBranches := existingMainBranches.Get()
if len(mainBranches) == 0 {
return ""
}
// We pass all configured main branches to the merge-base call; git will
// return the base commit for the closest one.
// We ignore errors from this call, since we can't distinguish whether the
// error is because one of the main branches has been deleted since the last
// call to determineMainBranches, or because the refName has no common
// history with any of the main branches. Since the former should happen
// very rarely, users must quit and restart lazygit to fix it; the latter is
// also not very common, but can totally happen and is not an error.
output, _ := self.cmd.New(
NewGitCmd("merge-base").Arg(refName).Arg(mainBranches...).
ToArgv(),
).DontLog().RunWithOutput()
return ignoringWarnings(output)
}
func ignoringWarnings(commandOutput string) string { func ignoringWarnings(commandOutput string) string {
trimmedOutput := strings.TrimSpace(commandOutput) trimmedOutput := strings.TrimSpace(commandOutput)
split := strings.Split(trimmedOutput, "\n") split := strings.Split(trimmedOutput, "\n")

24
pkg/commands/git_commands/main_branches.go
View file

@ -47,6 +47,30 @@ func (self *MainBranches) Get() []string {
return self.existingMainBranches return self.existingMainBranches
} }
// Return the merge base of the given refName with the closest main branch.
func (self *MainBranches) GetMergeBase(refName string) string {
mainBranches := self.Get()
if len(mainBranches) == 0 {
return ""
}
// We pass all existing main branches to the merge-base call; git will
// return the base commit for the closest one.
// We ignore errors from this call, since we can't distinguish whether the
// error is because one of the main branches has been deleted since the last
// call to determineMainBranches, or because the refName has no common
// history with any of the main branches. Since the former should happen
// very rarely, users must quit and restart lazygit to fix it; the latter is
// also not very common, but can totally happen and is not an error.
output, _ := self.cmd.New(
NewGitCmd("merge-base").Arg(refName).Arg(mainBranches...).
ToArgv(),
).DontLog().RunWithOutput()
return ignoringWarnings(output)
}
func (self *MainBranches) determineMainBranches() []string { func (self *MainBranches) determineMainBranches() []string {
var existingBranches []string var existingBranches []string
var wg sync.WaitGroup var wg sync.WaitGroup