Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
Replaces "∥" with "|" for InSync Upstream column
Maximilian Roosd299b41525a2
diff --git a/README.md b/README.mdindex f1690f707..05cb167fa 100644--- a/README.md+++ b/README.md@@ -86,7 +86,7 @@ After doing some work:$ wt listBranch Status HEAD± main↕ Path Remote⇅ Commit Age Message@ feature-api + ↑ +3 ↑4 ./repo.feature-api 5b01afca 30m Add API tests-^ main ^∥ ./repo ∥ b834638e 1d Initial commit+^ main ^| ./repo | b834638e 1d Initial commit+ fix-auth _ ./repo.fix-auth b834638e 1d Initial commit⚪ Showing 3 worktrees, 1 with changes, 1 aheaddiff --git a/src/commands/list/layout.rs b/src/commands/list/layout.rsindex a1df279b3..5af291b2f 100644--- a/src/commands/list/layout.rs+++ b/src/commands/list/layout.rs@@ -299,7 +299,7 @@ impl ColumnKind {variant: DiffVariant::UpstreamArrows,positive_style: ADDITION,negative_style: DELETION.dimmed(),- always_show_zeros: false, // 0/0 case handled specially with ∥ symbol+ always_show_zeros: false, // 0/0 case handled specially with | symbol}),_ => None,}diff --git a/src/commands/list/model.rs b/src/commands/list/model.rsindex 916e0788c..1f41b6368 100644--- a/src/commands/list/model.rs+++ b/src/commands/list/model.rs@@ -661,7 +661,7 @@ impl std::fmt::Display for UpstreamDivergence {fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {match self {Self::None => Ok(()),- Self::InSync => write!(f, "∥"),+ Self::InSync => write!(f, "|"),Self::Ahead => write!(f, "⇡"),Self::Behind => write!(f, "⇣"),Self::Diverged => write!(f, "⇅"),diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex 7f5bd3206..cd031f1ea 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -610,7 +610,7 @@ impl ColumnLayout {let Some((_, ahead, behind)) = ctx.upstream.active() else {return StyledLine::new();};- // Show centered ∥ when in sync instead of ⇡0 ⇣0+ // Show centered | when in sync instead of ⇡0 ⇣0// Note: This duplicates the InSync check from UpstreamDivergence, but// checking counts directly is simpler than threading the enum through.if ahead == 0 && behind == 0 {@@ -618,7 +618,7 @@ impl ColumnLayout {// Center the symbol in the column widthlet padding_left = (self.width.saturating_sub(1)) / 2;cell.push_raw(" ".repeat(padding_left));- cell.push_styled("∥", Style::new().dimmed());+ cell.push_styled("|", Style::new().dimmed());return cell;}self.render_diff_cell(ahead, behind)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.snapindex 748a9044d..6b02bab02 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@@ -25,7 +25,7 @@ exit_code: 0----- stderr -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m@ [1mfeature-api[0m [36m+[39m [2m↑[22m [32m+3[0m [32m↑4[0m [1m./repo.feature-api[0m [2m5b01afca[0m [2m30m[0m [2mAdd API tests[0m-^ main [2m^[22m[2m∥[22m ./repo [2m∥[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+^ main [2m^[22m[2m|[22m ./repo [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfix-auth[0m [2m_[22m [2m./repo.fix-auth[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m⚪ [2mShowing 3 worktrees, 1 with changes, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snap b/tests/snapshots/integration__integration_tests__list__task_dag_with_upstream.snapindex b548f6456..d5ccef659 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[22m[2m∥[22m [1m./repo[0m [2m∥[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ ahead [2m↑[22m[2m⇡[22m [32m↑1[0m [32m+1[0m ./repo.ahead [32m⇡1[0m [2m2fff52c2[0m [2m1d[0m [2mAhead commit[0m-+ [2min-sync[0m [2m_[22m [2m∥[22m [2m./repo.in-sync[0m [2m∥[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m⚪ [2mShowing 3 worktrees, 1 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_and_branches.snapindex f1b23392d..ba03c3050 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[22m[2m∥[22m [1m.[0m [2m∥[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2mlocal-only-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2mlocal-only-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2morigin/remote-only-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_filters_worktrees.snapindex ea43d66cb..38aa130b6 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[22m[2m∥[22m [1m./repo[0m [2m∥[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+ [2mfeature-with-worktree[0m [2m_[22m [2m./repo.feature-with-worktree[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2morigin/remote-only[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snap b/tests/snapshots/integration__integration_tests__list__with_remotes_flag.snapindex b9f472709..7084a86d1 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mPath[0m [1mRemote⇅[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[22m[2m∥[22m [1m.[0m [2m∥[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m+@ [1mmain[0m [2m^[22m[2m|[22m [1m.[0m [2m|[0m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2morigin/remote-feature-1[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0m[2morigin/remote-feature-2[0m [2m_[22m [2m⎇[22m [2mb834638e[0m [2m1d[0m [2mInitial commit[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex 3116792fb..108c654ca 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 -----[1mBranch[0m [1mStatus[0m [1mHEAD±[0m [1mmain↕[0m [1mmain…±[0m [1mPath[0m [1mRemote⇅[0m [1mCI[0m [1mCommit[0m [1mAge[0m [1mMessage[0m-@ [1mmain[0m [2m^[22m[2m∥[22m [1m./repo[0m [2m∥[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+@ [1mmain[0m [2m^[22m[2m|[22m [1m./repo[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ ahead [2m↑[22m[2m⇡[22m [32m↑2[0m [32m+2[0m ./repo.ahead [32m⇡2[0m [2m8d8f4673[0m [2m1d[0m [2mAhead commit 2[0m+ [2mbehind[0m [2m_[22m [2m⇣[22m [2m./repo.behind[0m [2m[31m⇣1[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ diverged [2m↑[22m[2m⇅[22m [32m↑1[0m [32m+1[0m ./repo.diverged [32m⇡1[0m [2m[31m⇣1[0m [2mca7cb696[0m [2m1d[0m [2mDiverged local commit[0m-+ [2min-sync[0m [2m_[22m [2m∥[22m [2m./repo.in-sync[0m [2m∥[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m++ [2min-sync[0m [2m_[22m [2m|[22m [2m./repo.in-sync[0m [2m|[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m+ [2mno-upstream[0m [2m_[22m [2m./repo.no-upstream[0m [2m6c3da842[0m [2m1d[0m [2mInitial commit on main[0m⚪ [2mShowing 6 worktrees, 2 ahead[0m