Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Refactor status symbols table with improved category names
Maximilian Roos1160f313e581
diff --git a/docs/content/list.md b/docs/content/list.mdindex 573e2f7ea..d13bdc004 100644--- a/docs/content/list.md+++ b/docs/content/list.md@@ -114,13 +114,16 @@ Symbols appear in the Status column in this order:| Branch state | `⊘` | Would conflict if merged to main (`--full` only) || | `≡` | Matches main (identical contents) || | `_` | No commits ahead, clean working tree |-| Divergence | `↑` | Ahead of main |+| Main divergence | `^` | Is the main branch |+| | `↑` | Ahead of main || | `↓` | Behind main || | `↕` | Diverged from main |-| Remote | `⇡` | Ahead of remote |+| Remote divergence | `\|` | In sync with remote |+| | `⇡` | Ahead of remote || | `⇣` | Behind remote || | `⇅` | Diverged from remote |-| Other | `/` | Branch without worktree |+| Worktree state | `/` | Branch without worktree |+| | `⚑` | Path doesn't match template || | `⌫` | Prunable (directory missing) || | `⊠` | Locked worktree |diff --git a/src/cli.rs b/src/cli.rsindex 88ff68b47..fca403d94 100644--- a/src/cli.rs+++ b/src/cli.rs@@ -1047,13 +1047,16 @@ Symbols appear in the Status column in this order:| Branch state | `⊘` | Would conflict if merged to main (`--full` only) || | `≡` | Matches main (identical contents) || | `_` | No commits ahead, clean working tree |-| Divergence | `↑` | Ahead of main |+| Main divergence | `^` | Is the main branch |+| | `↑` | Ahead of main || | `↓` | Behind main || | `↕` | Diverged from main |-| Remote | `⇡` | Ahead of remote |+| Remote divergence | `\|` | In sync with remote |+| | `⇡` | Ahead of remote || | `⇣` | Behind remote || | `⇅` | Diverged from remote |-| Other | `/` | Branch without worktree |+| Worktree state | `/` | Branch without worktree |+| | `⚑` | Path doesn't match template || | `⌫` | Prunable (directory missing) || | `⊠` | Locked worktree |diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 5a71167be..530dfb20f 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -422,8 +422,6 @@ impl ListItem {/// It will recompute with the latest available data.////// Branches get a subset of status symbols (no working tree changes or worktree attrs).- // TODO(status-indicator): show a status glyph when a worktree's checked-out branch- // differs from the branch name we associate with it (e.g., worktree exists but on another branch).pub(crate) fn compute_status_symbols(&mut self,default_branch: Option<&str>,diff --git a/tests/snapshots/integration__integration_tests__help__help_list_long.snap b/tests/snapshots/integration__integration_tests__help__help_list_long.snapindex f0b91c437..629c3b4d1 100644--- a/tests/snapshots/integration__integration_tests__help__help_list_long.snap+++ b/tests/snapshots/integration__integration_tests__help__help_list_long.snap@@ -123,13 +123,16 @@ Symbols appear in the Status column in this order:| Branch state | [2m⊘[0m | Would conflict if merged to main ([2m--full[0m only) || | [2m≡[0m | Matches main (identical contents) || | [2m_[0m | No commits ahead, clean working tree |-| Divergence | [2m↑[0m | Ahead of main |+| Main divergence | [2m^[0m | Is the main branch |+| | [2m↑[0m | Ahead of main || | [2m↓[0m | Behind main || | [2m↕[0m | Diverged from main |-| Remote | [2m⇡[0m | Ahead of remote |+| Remote divergence | [2m\|[0m | In sync with remote |+| | [2m⇡[0m | Ahead of remote || | [2m⇣[0m | Behind remote || | [2m⇅[0m | Diverged from remote |-| Other | [2m/[0m | Branch without worktree |+| Worktree state | [2m/[0m | Branch without worktree |+| | [2m⚑[0m | Path doesn't match template || | [2m⌫[0m | Prunable (directory missing) || | [2m⊠[0m | Locked worktree |