clean up chained branches display

Author: skarim

cmd/checkout.go

@@ -89,7 +89,7 @@ func runCheckout(cfg *config.Config, opts *checkoutOptions) error {
 	currentBranch, _ := git.CurrentBranch()
 	if targetBranch == currentBranch {
 		cfg.Infof("Already on %s", targetBranch)
-		cfg.Printf("Stack: %s", s.DisplayName())
+		cfg.Printf("Stack: %s", s.DisplayChain())
 		return nil
 	}
 
@@ -99,7 +99,7 @@ func runCheckout(cfg *config.Config, opts *checkoutOptions) error {
 	}
 
 	cfg.Successf("Switched to %s", targetBranch)
-	cfg.Printf("Stack: %s", s.DisplayName())
+	cfg.Printf("Stack: %s", s.DisplayChain())
 	return nil
 }
 
@@ -148,7 +148,7 @@ func interactiveStackPicker(cfg *config.Config, sf *stack.StackFile) (*stack.Sta
 
 	options := make([]string, len(sf.Stacks))
 	for i := range sf.Stacks {
-		options[i] = sf.Stacks[i].DisplayName()
+		options[i] = sf.Stacks[i].DisplayChain()
 	}
 
 	p := prompter.New(cfg.In, cfg.Out, cfg.Err)

cmd/init.go

@@ -245,11 +245,7 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 	// Print result
 	if opts.adopt {
 		cfg.Printf("Adopting stack with trunk %s and %d branches", trunk, len(branches))
-		chainParts := []string{"(" + trunk + ")"}
-		for _, b := range branches {
-			chainParts = append(chainParts, b)
-		}
-		cfg.Printf("Initializing stack: %s", joinChain(chainParts))
+		cfg.Printf("Initializing stack: %s", newStack.DisplayChain())
 		cfg.Printf("You can continue working on %s", branches[len(branches)-1])
 	} else {
 		cfg.Successf("Creating stack with trunk %s and branch %s", trunk, branches[len(branches)-1])
@@ -272,11 +268,3 @@ func runInit(cfg *config.Config, opts *initOptions) error {
 	return nil
 }
 
-// joinChain formats branches as: (trunk) <- branch1 <- branch2
-func joinChain(parts []string) string {
-	result := parts[0]
-	for _, p := range parts[1:] {
-		result += " <- " + p
-	}
-	return result
-}

cmd/rebase.go

@@ -132,11 +132,7 @@ func runRebase(cfg *config.Config, opts *rebaseOptions) error {
 		}
 	}
 
-	chainParts := []string{s.Trunk.Branch}
-	for _, b := range s.Branches {
-		chainParts = append(chainParts, b.Branch)
-	}
-	cfg.Printf("Stack detected: %s", joinChain(chainParts))
+	cfg.Printf("Stack detected: %s", s.DisplayChain())
 
 	currentIdx := s.IndexOf(currentBranch)
 	if currentIdx < 0 {

cmd/utils.go

@@ -99,7 +99,7 @@ func resolveStack(sf *stack.StackFile, branch string, cfg *config.Config) (*stac
 
 	options := make([]string, len(stacks))
 	for i, s := range stacks {
-		options[i] = s.DisplayName()
+		options[i] = s.DisplayChain()
 	}
 
 	p := prompter.New(cfg.In, cfg.Out, cfg.Err)
@@ -111,7 +111,7 @@ func resolveStack(sf *stack.StackFile, branch string, cfg *config.Config) (*stac
 	s := stacks[selected]
 
 	if len(s.Branches) == 0 {
-		return nil, fmt.Errorf("selected stack %q has no branches", s.DisplayName())
+		return nil, fmt.Errorf("selected stack %q has no branches", s.DisplayChain())
 	}
 
 	// Switch to the top branch of the selected stack so future commands

internal/stack/stack.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 )
 
 const (
@@ -40,14 +41,14 @@ type Stack struct {
 	Branches []BranchRef `json:"branches"`
 }
 
-// DisplayName returns a human-readable chain representation of the stack.
+// DisplayChain returns a human-readable chain representation of the stack.
 // Format: (trunk) <- branch1 <- branch2 <- branch3
-func (s *Stack) DisplayName() string {
-	result := "(" + s.Trunk.Branch + ")"
+func (s *Stack) DisplayChain() string {
+	parts := []string{"(" + s.Trunk.Branch + ")"}
 	for _, b := range s.Branches {
-		result += " <- " + b.Branch
+		parts = append(parts, b.Branch)
 	}
-	return result
+	return strings.Join(parts, " <- ")
 }
 
 // BranchNames returns the list of branch names in order.