Skip to content

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

feat: Enhance `handle_push` and standardize snapshot settings

Maximilian Roos1203450d8e45
diff --git a/src/cli.rs b/src/cli.rs
index bd4595082..536e956cd 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -556,7 +556,10 @@ Note: `locked` and `prunable` are top-level fields on worktree objects, not in s
#[arg(long)]
full: bool,
- /// Force progressive (or --no-progressive)
+ /// Show fast info immediately, update with slow info
+ ///
+ /// Displays local data (branches, paths, status) first, then updates
+ /// with remote data (CI, upstream) as it arrives. Auto-enabled for TTY.
#[arg(long, overrides_with = "no_progressive")]
progressive: bool,
diff --git a/tests/common/mod.rs b/tests/common/mod.rs
index f0742834b..af054ed12 100644
--- a/tests/common/mod.rs
+++ b/tests/common/mod.rs
@@ -84,6 +84,9 @@ pub fn configure_cli_command(cmd: &mut Command) {
cmd.env_remove(&key);
}
}
+ // Set to non-existent path to prevent loading user's real config
+ // Tests that need config should use TestRepo::clean_cli_env() which overrides this
+ cmd.env("WORKTRUNK_CONFIG_PATH", "/nonexistent/test/config.toml");
cmd.env("CLICOLOR_FORCE", "1");
if std::env::var("COLUMNS").is_err() {
cmd.env("COLUMNS", "150");
diff --git a/tests/snapshots/integration__integration_tests__help__help_list.snap b/tests/snapshots/integration__integration_tests__help__help_list.snap
index a2c8cfa33..5d3d8cc68 100644
--- a/tests/snapshots/integration__integration_tests__help__help_list.snap
+++ b/tests/snapshots/integration__integration_tests__help__help_list.snap
@@ -31,8 +31,11 @@ Options:
--full
Show CI, conflicts, diffs
- --progressive
- Force progressive (or --no-progressive)
+ --progressive
+ Show fast info immediately, update with slow info
+
+ Displays local data (branches, paths, status) first, then updates with
+remote data (CI, upstream) as it arrives. Auto-enabled for TTY.
-h, --help
Print help (see a summary with '-h')
diff --git a/tests/snapshots/integration__integration_tests__init__init_fish.snap b/tests/snapshots/integration__integration_tests__init__init_fish.snap
index a17c8959b..1ae8f1dae 100644
--- a/tests/snapshots/integration__integration_tests__init__init_fish.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_fish.snap
@@ -319,7 +319,7 @@ complete -c wt -n "__fish_wt_using_subcommand list" -l config -d 'User config fi
complete -c wt -n "__fish_wt_using_subcommand list" -l branches -d 'Include branches without worktrees'
complete -c wt -n "__fish_wt_using_subcommand list" -l remotes -d 'Include remote branches'
complete -c wt -n "__fish_wt_using_subcommand list" -l full -d 'Show CI, conflicts, diffs'
-complete -c wt -n "__fish_wt_using_subcommand list" -l progressive -d 'Force progressive (or --no-progressive)'
+complete -c wt -n "__fish_wt_using_subcommand list" -l progressive -d 'Show fast info immediately, update with slow info'
complete -c wt -n "__fish_wt_using_subcommand list" -l no-progressive -d 'Force buffered rendering'
complete -c wt -n "__fish_wt_using_subcommand list" -s v -l verbose -d 'Show commands and debug info'
complete -c wt -n "__fish_wt_using_subcommand list" -s h -l help -d 'Print help (see more with \'--help\')'
diff --git a/tests/snapshots/integration__integration_tests__init__init_zsh.snap b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
index 41a59e812..773396ded 100644
--- a/tests/snapshots/integration__integration_tests__init__init_zsh.snap
+++ b/tests/snapshots/integration__integration_tests__init__init_zsh.snap
@@ -571,7 +571,7 @@ json\:"JSON output"))' \
'--branches[Include branches without worktrees]' \
'--remotes[Include remote branches]' \
'--full[Show CI, conflicts, diffs]' \
-'--progressive[Force progressive (or --no-progressive)]' \
+'--progressive[Show fast info immediately, update with slow info]' \
'--no-progressive[Force buffered rendering]' \
'-v[Show commands and debug info]' \
'--verbose[Show commands and debug info]' \
diff --git a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
index 13d0df5ae..23c7ef022 100644
--- a/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
+++ b/tests/snapshots/integration__integration_tests__list__list_with_c_flag.snap
@@ -10,6 +10,7 @@ info:
CLICOLOR_FORCE: "1"
COLUMNS: "150"
GIT_EDITOR: ""
+ WORKTRUNK_CONFIG_PATH: "[TEST_CONFIG]"
---
success: true
exit_code: 0