Skip to content

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

Improve timeout warning and remove dead code (#1791)

Maximilian Roosee22df7d6d77
diff --git a/src/commands/list/collect/mod.rs b/src/commands/list/collect/mod.rs
index b5a7aea8a..08489bae3 100644
--- a/src/commands/list/collect/mod.rs
+++ b/src/commands/list/collect/mod.rs
@@ -893,13 +893,14 @@ pub fn collect(
items_with_missing,
} = drain_outcome
{
- // Warning: what happened + gutter showing which results are missing
+ // Warning: what happened + gutter showing which tasks blocked
let mut diag = format!(
"wt list timed out after {}s ({received_count} results received)",
results::DRAIN_TIMEOUT.as_secs()
);
if !items_with_missing.is_empty() {
+ diag.push_str("\nBlocked tasks:");
let missing_lines: Vec<String> = items_with_missing
.iter()
.map(|result| {
@@ -919,7 +920,7 @@ pub fn collect(
eprintln!(
"{}",
hint_message(cformat!(
- "A git command likely hung; run with <underline>-v</> for details, <underline>-vv</> to create a diagnostic file"
+ "A git command likely hung; run <underline>wt list -v</> for details or <underline>wt list -vv</> to create a diagnostic file"
))
);
}
diff --git a/src/git/repository/working_tree.rs b/src/git/repository/working_tree.rs
index 28086fd7b..2939da08d 100644
--- a/src/git/repository/working_tree.rs
+++ b/src/git/repository/working_tree.rs
@@ -254,12 +254,6 @@ impl<'a> WorkingTree<'a> {
LineDiff::from_numstat(&stdout)
}
- /// Get line diff statistics between working tree and a specific ref.
- pub fn working_tree_diff_vs_ref(&self, ref_name: &str) -> anyhow::Result<LineDiff> {
- let stdout = self.run_command(&["diff", "--numstat", ref_name])?;
- LineDiff::from_numstat(&stdout)
- }
-
/// Determine whether there are staged changes in the index.
///
/// Returns `Ok(true)` when staged changes are present, `Ok(false)` otherwise.