mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-08-28 02:24:49 -05:00
Ruud KamphuisandStefan Haller
727b4b56dd
The worktrees tab now displays the checked-out branch (or detached HEAD state) for each worktree, making it much easier to see which worktree holds which branch. This is useful when you need to "unlock" a branch that's occupied by another worktree: you can now clearly see which worktrees are on a branch vs detached, without having to select each one individually. Also rename the "(main)" label to "(main worktree)" to avoid confusion with the common "main" branch name, and move it after the branch column.
64 lines
1.7 KiB
Go
64 lines
1.7 KiB
Go
package presentation
|
|
|
|
import (
|
|
"github.com/jesseduffield/lazygit/pkg/commands/models"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
|
|
"github.com/jesseduffield/lazygit/pkg/gui/style"
|
|
"github.com/jesseduffield/lazygit/pkg/i18n"
|
|
"github.com/jesseduffield/lazygit/pkg/theme"
|
|
"github.com/jesseduffield/lazygit/pkg/utils"
|
|
"github.com/samber/lo"
|
|
)
|
|
|
|
func GetWorktreeDisplayStrings(tr *i18n.TranslationSet, worktrees []*models.Worktree) [][]string {
|
|
return lo.Map(worktrees, func(worktree *models.Worktree, _ int) []string {
|
|
return GetWorktreeDisplayString(
|
|
tr,
|
|
worktree)
|
|
})
|
|
}
|
|
|
|
func GetWorktreeDisplayString(tr *i18n.TranslationSet, worktree *models.Worktree) []string {
|
|
textStyle := theme.DefaultTextColor
|
|
|
|
current := ""
|
|
currentColor := style.FgCyan
|
|
if worktree.IsCurrent {
|
|
current = " *"
|
|
currentColor = style.FgGreen
|
|
}
|
|
|
|
icon := icons.IconForWorktree(false)
|
|
if worktree.IsPathMissing {
|
|
textStyle = style.FgRed
|
|
icon = icons.IconForWorktree(true)
|
|
}
|
|
|
|
res := []string{}
|
|
res = append(res, currentColor.Sprint(current))
|
|
if icons.IsIconEnabled() {
|
|
res = append(res, textStyle.Sprint(icon))
|
|
}
|
|
|
|
name := worktree.Name
|
|
if worktree.IsPathMissing && !icons.IsIconEnabled() {
|
|
name += " " + tr.MissingWorktree
|
|
}
|
|
res = append(res, textStyle.Sprint(name))
|
|
var branch string
|
|
if worktree.Branch != "" {
|
|
branch = style.FgCyan.Sprint(worktree.Branch)
|
|
} else if worktree.Head != "" {
|
|
branch = style.FgYellow.Sprint("HEAD detached at " + utils.ShortHash(worktree.Head))
|
|
}
|
|
res = append(res, branch+mainWorktreeLabel(tr, worktree))
|
|
return res
|
|
}
|
|
|
|
func mainWorktreeLabel(tr *i18n.TranslationSet, worktree *models.Worktree) string {
|
|
if worktree.IsMain {
|
|
return style.FgDefault.Sprint(" " + tr.MainWorktree)
|
|
}
|
|
return ""
|
|
}
|