Skip to content

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

Update select preview header controls

Maximilian Roos823436b2cbf8
diff --git a/src/commands/select.rs b/src/commands/select.rs
index 50c602dbb..d406e4a4a 100644
--- a/src/commands/select.rs
+++ b/src/commands/select.rs
@@ -407,7 +407,10 @@ impl WorktreeSkimItem {
let tab1 = format_tab("1: HEAD±", mode == PreviewMode::WorkingTree);
let tab2 = format_tab("2: history", mode == PreviewMode::History);
let tab3 = format_tab("3: main…±", mode == PreviewMode::BranchDiff);
- let controls = format_tab("ctrl-u/d: scroll | alt-p: toggle", false);
+ let controls = format_tab(
+ "Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: toggle",
+ false,
+ );
format!("{} | {} | {}\n{}\n\n", tab1, tab2, tab3, controls)
}
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
index 743bc0479..301a3e144 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_abort_escape.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path Remote⇅ Co│ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path Remote⇅ Co│Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> @ main ^ . ..│
│⚪ main has no uncommitted changes
│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
index 2625624ec..529479382 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_multiple_worktrees.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> @ main ^ ./repo ..│
+ feature-one _ ./repo.fea..│⚪ main has no uncommitted changes
+ feature-two _ ./repo.fea..│
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
index d1ff61cd0..cb8d23bec 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_history.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> + feature ↑ ↑5 ./repo.feature..│
│* b1549b6 (feature) Add file 5 with important changes
│* 111f7e4 Add file 4 with important changes
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
index 5b0c3592e..548dc72ea 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_main_diff.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> + feature ↑ ↑2 ./repo.feature..│
│ feature_code.rs | 6 ++++++
│ tests.rs | 4 ++++
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
index 443570563..e5c7b2662 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_preview_uncommitted.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> + feature ! ↑ +3 -1 ↑1 ./repo.feature..│
│ tracked.txt | 4 +++-
│ 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
index 05c947420..edd9beee4 100644
--- a/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
+++ b/tests/integration_tests/snapshots/integration__integration_tests__select__select_with_branches.snap
@@ -3,7 +3,7 @@ source: tests/integration_tests/select.rs
expression: normalized
---
> [QUERY] │[PREVIEW_HEADER]
- Branch Status HEAD± main↕ Path │ctrl-u/d: scroll | alt-p: toggle
+ Branch Status HEAD± main↕ Path │Enter: switch | Esc: cancel | ctrl-u/d: scroll | alt-p: tog
> @ main ^ ./repo │
+ active-worktree _ ./repo..│⚪ main has no uncommitted changes
orphan-branch _ ⎇ │