Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cmd/errors.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ func herdErr(project, branch string, err error) error {
sesErr.Ref.Project, sesErr.Ref.Branch, sesErr.Type, sesErr.Ref.Project, sesErr.Ref.Branch)
}
return err
case errors.Is(err, herd.ErrMainWorktree):
return fmt.Errorf("cannot delete the main worktree %s/%s — delete its sessions with 'ch delete session %s <branch>'", project, branch, project)
default:
return err
}
Expand Down
16 changes: 16 additions & 0 deletions cmd/errors_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package cmd

import (
"errors"
"fmt"
"strings"
"testing"

"github.com/xico42/codeherd/internal/herd"
Expand Down Expand Up @@ -51,6 +53,20 @@ func TestHerdErr_sessionExists_carriesRefFromTypedError(t *testing.T) {
}
}

func TestHerdErr_mainWorktree(t *testing.T) {
err := herdErr("myapp", "main", fmt.Errorf("%w: myapp/main", herd.ErrMainWorktree))
if err == nil {
t.Fatal("herdErr returned nil")
}
msg := err.Error()
if !strings.Contains(msg, "main worktree") {
t.Errorf("message = %q, should mention the main worktree", msg)
}
if !strings.Contains(msg, "ch delete session") {
t.Errorf("message = %q, should point at 'ch delete session'", msg)
}
}

func TestHerdErr_unknownSentinel_passesThrough(t *testing.T) {
raw := errors.New("boom")
got := herdErr("myapp", "feat", raw)
Expand Down
Loading
Loading