Improve display of missing and link worktrees

Author: Joel Baranick

pkg/commands/loaders/worktrees.go

@@ -4,8 +4,6 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
-	"os"
-	"path/filepath"
 	"strings"
 )
 
@@ -25,11 +23,6 @@ func NewWorktreeLoader(
 }
 
 func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
-	currentDir, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-
 	worktreesOutput, err := self.cmd.New(`git worktree list --porcelain -z`).DontLog().RunWithOutput()
 	if err != nil {
 		return nil, err
@@ -46,20 +39,10 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 			continue
 		}
 		if strings.HasPrefix(splitLine, "worktree ") {
-			main := false
-			name := "main"
 			path := strings.SplitN(splitLine, " ", 2)[1]
-			if len(worktrees) == 0 {
-				main = true
-			} else {
-				name = filepath.Base(path)
-			}
-
 			currentWorktree = &models.Worktree{
-				Name:    name,
-				Path:    path,
-				Main:    main,
-				Current: path == currentDir,
+				Id:   len(worktrees),
+				Path: path,
 			}
 		}
 	}

pkg/commands/models/worktree.go

@@ -1,15 +1,22 @@
 package models
 
+import (
+	"fmt"
+	"github.com/go-errors/errors"
+	"io/fs"
+	"log"
+	"os"
+	"path/filepath"
+)
+
 // Worktree : A git worktree
 type Worktree struct {
-	Name    string
-	Main    bool
-	Current bool
-	Path    string
+	Id   int
+	Path string
 }
 
 func (w *Worktree) RefName() string {
-	return w.Name
+	return w.Name()
 }
 
 func (w *Worktree) ID() string {
@@ -19,3 +26,30 @@ func (w *Worktree) ID() string {
 func (w *Worktree) Description() string {
 	return w.RefName()
 }
+
+func (w *Worktree) Name() string {
+	return filepath.Base(w.Path)
+}
+
+func (w *Worktree) Main() bool {
+	return w.Id == 0
+}
+
+func (w *Worktree) Current() bool {
+	pwd, err := os.Getwd()
+	if err != nil {
+		log.Fatalln(err.Error())
+	}
+
+	return pwd == w.Path
+}
+
+func (w *Worktree) Missing() bool {
+	if _, err := os.Stat(w.Path); err != nil {
+		if errors.Is(err, fs.ErrNotExist) {
+			return true
+		}
+		log.Fatalln(fmt.Errorf("failed to check if worktree path `%s` exists\n%w", w.Path, err).Error())
+	}
+	return false
+}

pkg/gui/controllers/helpers/worktree_helper.go

@@ -3,7 +3,6 @@ package helpers
 import (
 	"github.com/jesseduffield/lazygit/pkg/commands"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
-	"path/filepath"
 )
 
 type IWorktreeHelper interface {
@@ -28,23 +27,23 @@ func NewWorktreeHelper(c *types.HelperCommon, git *commands.GitCommand, model *t
 
 func (self *WorktreeHelper) GetMainWorktreeName() string {
 	for _, worktree := range self.model.Worktrees {
-		if worktree.Main {
-			return filepath.Base(worktree.Path)
+		if worktree.Main() {
+			return worktree.Name()
 		}
 	}
 
 	return ""
 }
 
-func (self *WorktreeHelper) GetCurrentWorktreeName() string {
-	for _, worktree := range self.model.Worktrees {
-		if worktree.Current {
-			if worktree.Main {
-				return ""
-			}
-			return worktree.Name
-		}
-	}
-
-	return ""
-}
+//func (self *WorktreeHelper) GetCurrentWorktreeName() string {
+//	for _, worktree := range self.model.Worktrees {
+//		if worktree.Current() {
+//			if worktree.Main() {
+//				return ""
+//			}
+//			return worktree.Name()
+//		}
+//	}
+//
+//	return ""
+//}

pkg/gui/controllers/worktrees_controller.go

@@ -66,11 +66,11 @@ func (self *WorktreesController) GetKeybindings(opts types.KeybindingsOpts) []*t
 //}
 
 func (self *WorktreesController) delete(worktree *models.Worktree) error {
-	if worktree.Main {
+	if worktree.Main() {
 		return self.c.ErrorMsg(self.c.Tr.CantDeleteMainWorktree)
 	}
 
-	if worktree.Current {
+	if worktree.Current() {
 		return self.c.ErrorMsg(self.c.Tr.CantDeleteCurrentWorktree)
 	}
 
@@ -88,7 +88,7 @@ func (self *WorktreesController) deleteWithForce(worktree *models.Worktree, forc
 	message := utils.ResolvePlaceholderString(
 		templateStr,
 		map[string]string{
-			"worktreeName": worktree.Name,
+			"worktreeName": worktree.Name(),
 		},
 	)
 

pkg/gui/presentation/icons/git_icons.go

@@ -63,7 +63,7 @@ func IconForRemote(remote *models.Remote) string {
 }
 
 func IconForWorktree(worktree *models.Worktree, missing bool) string {
-	if worktree.Main {
+	if worktree.Main() {
 		return ""
 	}
 	if missing {

pkg/gui/presentation/worktrees.go

@@ -1,14 +1,11 @@
 package presentation
 
 import (
-	"github.com/go-errors/errors"
 	"github.com/jesseduffield/generics/slices"
 	"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/theme"
-	"io/fs"
-	"os"
 )
 
 func GetWorktreeListDisplayStrings(worktrees []*models.Worktree) [][]string {
@@ -23,13 +20,13 @@ func getWorktreeDisplayStrings(w *models.Worktree) []string {
 
 	current := ""
 	currentColor := style.FgCyan
-	if w.Current {
+	if w.Current() {
 		current = "  *"
 		currentColor = style.FgGreen
 	}
 
 	icon := icons.IconForWorktree(w, false)
-	if _, err := os.Stat(w.Path); errors.Is(err, fs.ErrNotExist) {
+	if w.Missing() {
 		textStyle = style.FgRed
 		icon = icons.IconForWorktree(w, true)
 	}
@@ -39,6 +36,6 @@ func getWorktreeDisplayStrings(w *models.Worktree) []string {
 	if icons.IsIconEnabled() {
 		res = append(res, textStyle.Sprint(icon))
 	}
-	res = append(res, textStyle.Sprint(w.Name))
+	res = append(res, textStyle.Sprint(w.Name()))
 	return res
 }

pkg/gui/refresh.go

@@ -571,14 +571,12 @@ func (gui *Gui) refreshStatus() {
 
 	name := presentation.GetBranchTextStyle(currentBranch.Name).Sprint(currentBranch.Name)
 	var repoName string
-	worktreeName := gui.helpers.Worktree.GetCurrentWorktreeName()
-	if len(worktreeName) > 0 {
-		worktreeName = fmt.Sprintf("[%s]", worktreeName)
-		repoName = gui.helpers.Worktree.GetMainWorktreeName()
-	} else {
-		repoName = utils.GetCurrentRepoName()
+	repoName = utils.GetCurrentRepoName()
+	mainWorktreeName := gui.helpers.Worktree.GetMainWorktreeName()
+	if repoName != mainWorktreeName {
+		repoName = fmt.Sprintf("%s(%s)", mainWorktreeName, style.FgBlue.Sprint(repoName))
 	}
-	status += fmt.Sprintf("%s%s → %s ", repoName, worktreeName, name)
+	status += fmt.Sprintf("%s → %s ", repoName, name)
 
 	gui.setViewContent(gui.Views.Status, status)
 }

pkg/gui/worktrees_panel.go

@@ -15,7 +15,11 @@ func (gui *Gui) worktreesRenderToMain() error {
 	if worktree == nil {
 		task = types.NewRenderStringTask("No worktrees")
 	} else {
-		task = types.NewRenderStringTask(fmt.Sprintf("%s\nPath: %s", style.FgGreen.Sprint(worktree.Name), worktree.Path))
+		missing := ""
+		if worktree.Missing() {
+			missing = style.FgRed.Sprint(" (missing)")
+		}
+		task = types.NewRenderStringTask(fmt.Sprintf("%s\nPath: %s%s", style.FgGreen.Sprint(worktree.Name()), worktree.Path, missing))
 	}
 
 	return gui.c.RenderToMainViews(types.RefreshMainOpts{