Skip to content

Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows

Feat(list): Use new `⇡⇣` symbols for upstream commits

Maximilian Roose80fc4c12e07
diff --git a/README.md b/README.md
index 45f9a1aab..006870fa8 100644
--- a/README.md
+++ b/README.md
@@ -114,7 +114,7 @@ merge, cleanup.
```console
$ wt list
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
+@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
@@ -696,7 +696,7 @@ Options:
- **main↕:** Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
- **main…±** (`--full`): Line diffs in commits ahead of main (+added -deleted)
- **Path:** Worktree directory location
-- **Remote⇅:** Commits ahead↑/behind↓ relative to tracking branch (e.g. `origin/branch`)
+- **Remote⇅:** Commits ahead⇡/behind⇣ relative to tracking branch (e.g. `origin/branch`)
- **CI** (`--full`): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)
- `●` **passed** (green) - All checks passed
- `●` **running** (blue) - Checks in progress
diff --git a/src/cli.rs b/src/cli.rs
index ababe6eff..721fdafbc 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -596,7 +596,7 @@ Docs: <https://llm.datasette.io/> | <https://github.com/sigoden/aichat>
- **main↕:** Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
- **main…±** (`--full`): Line diffs in commits ahead of main (+added -deleted)
- **Path:** Worktree directory location
-- **Remote⇅:** Commits ahead↑/behind↓ relative to tracking branch (e.g. `origin/branch`)
+- **Remote⇅:** Commits ahead⇡/behind⇣ relative to tracking branch (e.g. `origin/branch`)
- **CI** (`--full`): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)
- `●` **passed** (green) - All checks passed
- `●` **running** (blue) - Checks in progress
diff --git a/src/commands/list/columns.rs b/src/commands/list/columns.rs
index e5961ca49..bfcb7527a 100644
--- a/src/commands/list/columns.rs
+++ b/src/commands/list/columns.rs
@@ -19,7 +19,10 @@ pub enum ColumnKind {
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum DiffVariant {
Signs,
+ /// Simple arrows (↑↓) for commits ahead/behind main
Arrows,
+ /// Double-struck arrows (⇡⇣) for commits ahead/behind remote
+ UpstreamArrows,
}
/// Static metadata describing a column's behavior in both layout and rendering.
diff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rs
index a0f0cb00c..99caba1ae 100644
--- a/src/commands/list/layout.rs
+++ b/src/commands/list/layout.rs
@@ -296,7 +296,7 @@ impl ColumnKind {
always_show_zeros: false,
}),
ColumnKind::Upstream => Some(DiffDisplayConfig {
- variant: DiffVariant::Arrows,
+ variant: DiffVariant::UpstreamArrows,
positive_style: ADDITION,
negative_style: DELETION.dimmed(),
always_show_zeros: true,
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rs
index 7b9356a5c..d7bec9a2d 100644
--- a/src/commands/list/render.rs
+++ b/src/commands/list/render.rs
@@ -122,6 +122,10 @@ impl DiffVariant {
positive: "↑",
negative: "↓",
},
+ DiffVariant::UpstreamArrows => DiffSymbols {
+ positive: "⇡",
+ negative: "⇣",
+ },
}
}
}
@@ -165,7 +169,9 @@ impl DiffColumnConfig {
// Line diffs: show full number (user prefers precision over compactness)
DiffVariant::Signs => (value.to_string(), false),
// Commit counts: use C abbreviation
- DiffVariant::Arrows => (format!("{}C", value / 100), true),
+ DiffVariant::Arrows | DiffVariant::UpstreamArrows => {
+ (format!("{}C", value / 100), true)
+ }
}
} else {
(value.to_string(), false)
diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snap
index 379df46f2..d7c79911a 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap
@@ -61,7 +61,7 @@ Global Options:
- main↕: Commit count ahead↑/behind↓ relative to main (commits in HEAD vs main)
- main…± (--full): Line diffs in commits ahead of main (+added -deleted)
- Path: Worktree directory location
-- Remote⇅: Commits ahead↑/behind↓ relative to tracking branch (e.g. origin/branch)
+- Remote⇅: Commits ahead⇡/behind⇣ relative to tracking branch (e.g. origin/branch)
- CI (--full): CI pipeline status (tries PR/MR checks first, falls back to branch workflows)
- ● passed (green) - All checks passed
- ● running (blue) - Checks in progress
diff --git a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
index 8bd1a5981..83abe2801 100644
--- a/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
+++ b/tests/snapshots/integration__integration_tests__list__maximum_status_symbols.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^⇡ ./test-repo ↑1 ↓0 85ed6d3d 10mo Main advances
-+ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ↑1 ↓1 4afb2b9e 10mo Local commit
+@ main ^⇡ ./test-repo ⇡1 ⇣0 85ed6d3d 10mo Main advances
++ feature +!?⚠↕⇅⊠🤖 +2 -2 ↑2 ↓1 +3 -1 ./feature ⇡1 ⇣1 4afb2b9e 10mo Local commit
⚪ Showing 2 worktrees, 1 with changes, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
index ccecd2dd5..43bf39e1b 100644
--- a/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
+++ b/tests/snapshots/integration__integration_tests__list__readme_example_simple_list.snap
@@ -24,7 +24,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
+@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
+ bugfix-y ↑ ↑1 ./bugfix-y 412a27c8 10mo Fix bug
+ feature-x + ↑ +5 ↑3 ./feature-x 7fd821aa 10mo Add file 3
diff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
index b539cd1b7..3cafd88f6 100644
--- a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
+++ b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap
@@ -26,8 +26,8 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 6c3da842 10mo Initial commit on main
-+ ahead ↑⇡ ↑1 +1 ./ahead ↑1 ↓0 2fff52c2 10mo Ahead commit
-+ in-sync ∅ ./in-sync ↑0 ↓0 6c3da842 10mo Initial commit on main
+@ main ^ ./test-repo ⇡0 ⇣0 6c3da842 10mo Initial commit on main
++ ahead ↑⇡ ↑1 +1 ./ahead ⇡1 ⇣0 2fff52c2 10mo Ahead commit
++ in-sync ∅ ./in-sync ⇡0 ⇣0 6c3da842 10mo Initial commit on main
⚪ Showing 3 worktrees, 1 ahead
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
index a7a098eef..7160acca7 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap
@@ -26,7 +26,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 10mo Initial commit
local-only-1 ∅ ⎇ b834638e 10mo Initial commit
local-only-2 ∅ ⎇ b834638e 10mo Initial commit
origin/remote-only-1 ∅ ⎇ b834638e 10mo Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
index 6e14c8cc7..da711b2a0 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 b834638e 10mo Initial commit
+@ main ^ ./test-repo ⇡0 ⇣0 b834638e 10mo Initial commit
+ feature-with-worktree ∅ ./feature-with-worktree b834638e 10mo Initial commit
origin/remote-only ∅ ⎇ b834638e 10mo Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
index dd89fa0e3..6517a3250 100644
--- a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap
@@ -25,7 +25,7 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ Path Remote⇅ Commit Age Message
-@ main ^ . ↑0 ↓0 b834638e 10mo Initial commit
+@ main ^ . ⇡0 ⇣0 b834638e 10mo Initial commit
origin/remote-feature-1 ∅ ⎇ b834638e 10mo Initial commit
origin/remote-feature-2 ∅ ⎇ b834638e 10mo Initial commit
diff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
index 6ff3db78e..c57284e3f 100644
--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap
@@ -27,11 +27,11 @@ exit_code: 0
----- stderr -----
Branch Status HEAD± main↕ main…± Path Remote⇅ CI Commit Age Message
-@ main ^ ./test-repo ↑0 ↓0 [SHA] 10mo Initial commit on main
-+ ahead ↑⇡ ↑2 +2 ./ahead ↑2 ↓0 [SHA] 10mo Ahead commit 2
-+ behind ∅ ⇣ ./behind ↑0 ↓1 [SHA] 10mo Initial commit on main
-+ diverged ↑⇅ ↑1 +1 ./diverged ↑1 ↓1 [SHA] 10mo Diverged local commit
-+ in-sync ∅ ./in-sync ↑0 ↓0 [SHA] 10mo Initial commit on main
+@ main ^ ./test-repo ⇡0 ⇣0 [SHA] 10mo Initial commit on main
++ ahead ↑⇡ ↑2 +2 ./ahead ⇡2 ⇣0 [SHA] 10mo Ahead commit 2
++ behind ∅ ⇣ ./behind ⇡0 ⇣1 [SHA] 10mo Initial commit on main
++ diverged ↑⇅ ↑1 +1 ./diverged ⇡1 ⇣1 [SHA] 10mo Diverged local commit
++ in-sync ∅ ./in-sync ⇡0 ⇣0 [SHA] 10mo Initial commit on main
+ no-upstream ∅ ./no-upstream [SHA] 10mo Initial commit on main
⚪ Showing 6 worktrees, 2 ahead