Improve worktree panel

Author: Joel Baranick

pkg/commands/loaders/worktrees.go

@@ -4,6 +4,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/commands/models"
 	"github.com/jesseduffield/lazygit/pkg/commands/oscommands"
 	"github.com/jesseduffield/lazygit/pkg/common"
+	"path/filepath"
 	"strings"
 )
 
@@ -44,18 +45,11 @@ func (self *WorktreeLoader) GetWorktrees() ([]*models.Worktree, error) {
 				Id:   len(worktrees),
 				Path: path,
 			}
+		} else if strings.HasPrefix(splitLine, "branch ") {
+			branch := strings.SplitN(splitLine, " ", 2)[1]
+			currentWorktree.Branch = filepath.Base(branch)
 		}
 	}
 
-	/*
-		worktree /Users/jbaranick/Source/lazygit
-		HEAD f6d6b5dec0432ffa953611700ab9b1ff0089f948
-		branch refs/heads/worktree_support
-
-		worktree /Users/jbaranick/Source/lazygit/.worktrees/worktree_tests
-		HEAD f6d6b5dec0432ffa953611700ab9b1ff0089f948
-		branch refs/heads/worktree_tests
-	*/
-
 	return worktrees, nil
 }

pkg/commands/models/worktree.go

@@ -11,8 +11,9 @@ import (
 
 // Worktree : A git worktree
 type Worktree struct {
-	Id   int
-	Path string
+	Id     int
+	Path   string
+	Branch string
 }
 
 func (w *Worktree) RefName() string {

pkg/gui/worktrees_panel.go

@@ -19,7 +19,15 @@ func (gui *Gui) worktreesRenderToMain() error {
 		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))
+		task = types.NewRenderStringTask(
+			fmt.Sprintf(
+				"Name:   %s\nBranch: %s\nPath:   %s%s\n",
+				style.FgGreen.Sprint(worktree.Name()),
+				style.FgYellow.Sprint(worktree.Branch),
+				style.FgCyan.Sprint(worktree.Path),
+				missing,
+			),
+		)
 	}
 
 	return gui.c.RenderToMainViews(types.RefreshMainOpts{