Worktrunk is a CLI for Git worktree management, designed for parallel AI agent workflows
feat: Maintain row color inheritance for status column and update snapshots
Maximilian Roos7f023ddda5f6
diff --git a/src/commands/list/render.rs b/src/commands/list/render.rsindex c40be9344..a0ea9784f 100644--- a/src/commands/list/render.rs+++ b/src/commands/list/render.rs@@ -362,11 +362,8 @@ pub fn format_list_item_line(} else {format!("{:width$}", info.status_symbols, width = column.width)};- if let Some(style) = text_style {- line.push_styled(status_text, style);- } else {- line.push_raw(status_text);- }+ // Status column never inherits row color+ line.push_raw(status_text);} else if !is_last {push_blank(&mut line, column.width);}diff --git a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snapindex ea738dc7f..0b5c45590 100644--- a/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap+++ b/tests/snapshots/integration__integration_tests__list__list_ordering_rules.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpcMmBDe/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp0ctBJ2/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[36mmain [0m [36m [0m [36m./test-repo [0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[1m[35mfeature-current[0m [1m[35m↑ [0m [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0m+[36mmain [0m [36m./test-repo [0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[1m[35mfeature-current[0m ↑ [32m↑1[0m [1m[35m./feature-current[0m [2mfc28a4d1[0m [2m9 months ago [0m [2mCommit at 01:00[0mfeature-newest ↑ [32m↑1[0m ./feature-newest [2m136358eb[0m [2m9 months ago [0m [2mCommit at 03:00[0mfeature-middle ↑ [32m↑1[0m ./feature-middle [2ma0a4851a[0m [2m9 months ago [0m [2mCommit at 02:00[0mfeature-oldest ↑ [32m↑1[0m ./feature-oldest [2m1b1a2d78[0m [2m9 months ago [0m [2mCommit at 00:30[0mdiff --git a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap b/tests/snapshots/integration__integration_tests__list__long_commit_message.snapindex 28244741c..c887fdf6b 100644--- a/tests/snapshots/integration__integration_tests__list__long_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__long_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpBQpe0q/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpkokc9o/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m-[2mfeature-a[0m [2m↓ [0m [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the message...[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2m1310bfb9[0m [2m10 months ago[0m [2mShort message[0m+[2mfeature-a[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-a[0m [2mf078644e[0m [2m10 months ago[0m [2mThis is a very long commit message that should test how the message...[0m[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snapindex d47d94e0f..54358e9eb 100644--- a/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap+++ b/tests/snapshots/integration__integration_tests__list__unicode_commit_message.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp16cZ5l/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpmr0coS/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo [0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m-[2mfeature-test[0m [2m↓ [0m [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2me4614cb7[0m [2m10 months ago[0m [2mFix bug with café ☕ handling[0m+[2mfeature-test[0m ↓ [2m[31m↓1[0m [2m(no commits)[0m [2m./feature-test[0m [2m0c53695b[0m [2m10 months ago[0m [2mAdd support for 日本語 and émoji 🎉[0m[2mShowing 2 worktrees, 1 behind[0mdiff --git a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snapindex b45437d2c..805811996 100644--- a/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap+++ b/tests/snapshots/integration__integration_tests__list__with_upstream_tracking.snap@@ -17,18 +17,18 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpRlA8aA/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpuWw6nv/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mMain ↕[0m [1mMain ±[0m [1mState [0m [1mPath [0m [1mRemote ↕[0m [1mCI[0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0mahead ↑⇡ [32m↑2[0m [32m+2[0m ./ahead [32m↑2[0m [2m[31m↓0[0m [2m8d8f4673[0m [2m10 months ago[0m [2mAhead commit 2[0m-[2mbehind [0m [2m⇣ [0m [2m(matches main)[0m [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mbehind [0m ⇣ [2m(matches main)[0m [2m./behind [0m [32m↑0[0m [2m[31m↓1[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0mdiverged ↑⇡⇣ [32m↑1[0m [32m+1[0m ./diverged [32m↑1[0m [2m[31m↓1[0m [2mca7cb696[0m [2m10 months ago[0m [2mDiverged local commit[0m-[2min-sync [0m [2m [0m [2m(matches main)[0m [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m-[2mno-upstream[0m [2m [0m [2m(matches main)[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2min-sync [0m [2m(matches main)[0m [2m./in-sync [0m [32m↑0[0m [2m[31m↓0[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m+[2mno-upstream[0m [2m(matches main)[0m [2m./no-upstream[0m [2m6c3da842[0m [2m10 months ago[0m [2mInitial commit on main[0m[2mShowing 6 worktrees, 2 ahead[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snapindex 43594d998..1ac9e3a7d 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_empty_diffs.snap@@ -15,15 +15,15 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp4o78TX/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp19VPVw/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2malso-no-changes[0m [2m [0m [2m(matches main)[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mno-changes [0m [2m [0m [2m(matches main)[0m [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2malso-no-changes[0m [2m(matches main)[0m [2m./also-no-changes[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mno-changes [0m [2m(matches main)[0m [2m./no-changes [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mwith-changes ! [32m+1[0m [31m-1[0m ./with-changes [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 4 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snapindex 24122d7f0..6d6d9fc6b 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_extreme_diffs.snap@@ -15,14 +15,14 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp3ws0oN/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpPvsf6Y/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch[0m [1mStatus[0m [1mWorking ±[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mhuge [0m [2m? [0m [2m(matches main)[0m [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1m[35mmain [0m [1m[35m./test-repo[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mhuge [0m ? [2m(matches main)[0m [2m./huge [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0mtiny ! [32m+1[0m [31m-1[0m ./tiny [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 3 worktrees, 1 with changes[0mdiff --git a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snapindex 8ed741d14..19e8c2bdb 100644--- a/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap+++ b/tests/snapshots/integration__integration_tests__spacing_edge_cases__alignment_varying_diffs.snap@@ -15,16 +15,16 @@ info:LANG: CLC_ALL: CSOURCE_DATE_EPOCH: "1761609600"- WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmp9UEYDw/test-config.toml+ WORKTRUNK_CONFIG_PATH: /var/folders/wf/s6ycxvvs4ln8qsdbfx40hnc40000gn/T/.tmpsfUzeC/test-config.toml---success: trueexit_code: 0----- stdout -----[1mBranch [0m [1mStatus[0m [1mState [0m [1mPath [0m [1mCommit [0m [1mAge [0m [1mMessage[0m-[1m[35mmain [0m [1m[35m [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-large [0m [2m? [0m [2m(matches main)[0m [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-medium[0m [2m? [0m [2m(matches main)[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m-[2mfeature-small [0m [2m? [0m [2m(matches main)[0m [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[1m[35mmain [0m [1m[35m./test-repo [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-large [0m ? [2m(matches main)[0m [2m./feature-large [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-medium[0m ? [2m(matches main)[0m [2m./feature-medium[0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m+[2mfeature-small [0m ? [2m(matches main)[0m [2m./feature-small [0m [2mb834638e[0m [2m10 months ago[0m [2mInitial commit[0m[2mShowing 4 worktrees[0m