scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-10 22:43:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Clean up GitSyncStatus usage: add use import and unify warning messages

Browse source 
Replace fully-qualified fabro_workflows::git::GitSyncStatus paths with a
use import, and consolidate the near-duplicate dirty-worktree warning arms
into a single block that varies only the environment name.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Bryan Helmkamp 2026-03-19 11:34:55 -04:00
parent ad84f9f92c
commit d7b4033da4
1 changed files with 17 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
lib/crates/fabro-cli/src/commands/run.rs
View file

@ -20,6 +20,7 @@ use fabro_workflows::cost::{compute_stage_cost, format_cost};
use fabro_workflows::devcontainer_bridge;
use fabro_workflows::engine::{RunConfig, WorkflowRunEngine};
use fabro_workflows::event::EventEmitter;
use fabro_workflows::git::GitSyncStatus;
use fabro_workflows::handler::default_registry;
use fabro_workflows::outcome::StageStatus;
use fabro_workflows::sandbox_provider::SandboxProvider;
@ -756,21 +757,17 @@ pub async fn run_command(
);
// Warn about uncommitted changes that won't be available in the execution environment.
if git_status == fabro_workflows::git::GitSyncStatus::Dirty {
match workdir_strategy {
WorkdirStrategy::LocalWorktree => {
eprintln!(
"{} Uncommitted changes will not be included in the worktree.",
styles.yellow.apply_to("Warning:"),
);
}
WorkdirStrategy::Cloud => {
eprintln!(
"{} Uncommitted changes will not be included in the remote sandbox.",
styles.yellow.apply_to("Warning:"),
);
}
WorkdirStrategy::LocalDirectory => {}
if git_status == GitSyncStatus::Dirty {
let env_name = match workdir_strategy {
WorkdirStrategy::LocalWorktree => Some("worktree"),
WorkdirStrategy::Cloud => Some("remote sandbox"),
WorkdirStrategy::LocalDirectory => None,
};
if let Some(env_name) = env_name {
eprintln!(
"{} Uncommitted changes will not be included in the {env_name}.",
styles.yellow.apply_to("Warning:"),
);
}
}
@ -785,9 +782,9 @@ pub async fn run_command(
// For Synced we know no push is needed; for Unsynced we know it is;
// for Dirty the push status wasn't checked, so check now.
let needs_push = match git_status {
fabro_workflows::git::GitSyncStatus::Synced => false,
fabro_workflows::git::GitSyncStatus::Unsynced => true,
fabro_workflows::git::GitSyncStatus::Dirty => {
GitSyncStatus::Synced => false,
GitSyncStatus::Unsynced => true,
GitSyncStatus::Dirty => {
let check_repo = original_cwd.clone();
let check_branch = branch.clone();
tokio::task::spawn_blocking(move || {
@ -2092,7 +2089,7 @@ async fn run_preflight(
run_cfg: &Option<run_config::WorkflowRunConfig>,
args: &RunArgs,
run_defaults: &RunDefaults,
git_status: fabro_workflows::git::GitSyncStatus,
git_status: GitSyncStatus,
sandbox_provider: SandboxProvider,
styles: &'static Styles,
github_app: Option<fabro_github::GitHubAppCredentials>,
@ -2136,7 +2133,7 @@ async fn run_preflight(
CheckDetail::new(format!("Setup commands: {setup_command_count}")),
CheckDetail {
text: format!("Git: {git_status}"),
warn: git_status != fabro_workflows::git::GitSyncStatus::Synced,
warn: git_status != GitSyncStatus::Synced,
},
],
remediation: None,