use anyhow::Context;
use worktrunk::HookType;
use worktrunk::config::{Approvals, MergeConfig, UserConfig};
use worktrunk::git::Repository;
use worktrunk::styling::{eprintln, info_message};
use super::command_approval::approve_command_batch;
use super::command_executor::FailureStrategy;
use super::commit::{CommitOptions, HookGate};
use super::context::CommandEnv;
use super::hooks::{HookAnnouncer, execute_hook};
use super::project_config::{ApprovableCommand, collect_commands_for_hooks};
use super::repository_ext::RepositoryCliExt;
use super::template_vars::TemplateVars;
use super::worktree::{
FinishAfterMergeArgs, MergeOperations, PushKind, finish_after_merge, handle_no_ff_merge,
handle_push,
};
pub struct MergeFlagOverrides {
pub squash: Option<bool>,
pub commit: Option<bool>,
pub rebase: Option<bool>,
pub remove: Option<bool>,
pub ff: Option<bool>,
pub verify: Option<bool>,
}
impl MergeFlagOverrides {
pub fn from_cli(args: &crate::cli::MergeArgs) -> Self {
Self {
squash: crate::flag_pair(args.squash, args.no_squash),
commit: crate::flag_pair(args.commit, args.no_commit),
rebase: crate::flag_pair(args.rebase, args.no_rebase),
remove: crate::flag_pair(args.remove, args.no_remove),
ff: crate::flag_pair(args.ff, args.no_ff),
verify: crate::flag_pair(args.verify, args.no_hooks || args.no_verify),
}
}
pub fn resolve(&self, config: &MergeConfig) -> ResolvedMergeFlags {
ResolvedMergeFlags {
squash: self.squash.unwrap_or(config.squash()),
commit: self.commit.unwrap_or(config.commit()),
rebase: self.rebase.unwrap_or(config.rebase()),
remove: self.remove.unwrap_or(config.remove()),
ff: self.ff.unwrap_or(config.ff()),
verify: self.verify.unwrap_or(config.verify()),
}
}
}
pub struct ResolvedMergeFlags {
pub squash: bool,
pub commit: bool,
pub rebase: bool,
pub remove: bool,
pub ff: bool,
pub verify: bool,
}
pub struct MergeOptions<'a> {
pub target: Option<&'a str>,
pub flags: MergeFlagOverrides,
pub yes: bool,
pub stage: Option<super::commit::StageMode>,
pub format: crate::cli::SwitchFormat,
}
fn collect_merge_commands(
repo: &Repository,
commit: bool,
verify: bool,
will_remove: bool,
squash_enabled: bool,
) -> anyhow::Result<(Vec<ApprovableCommand>, String)> {
let mut all_commands = Vec::new();
let project_config = match repo.load_project_config()? {
Some(cfg) => cfg,
None => return Ok((all_commands, repo.project_identifier()?)),
};
let mut hooks = Vec::new();
let will_create_commit = repo.current_worktree().is_dirty()? || squash_enabled;
if commit && verify && will_create_commit {
hooks.push(HookType::PreCommit);
hooks.push(HookType::PostCommit);
}
if verify {
hooks.push(HookType::PreMerge);
hooks.push(HookType::PostMerge);
if will_remove {
hooks.push(HookType::PreRemove);
hooks.push(HookType::PostRemove);
hooks.push(HookType::PostSwitch);
}
}
all_commands.extend(collect_commands_for_hooks(&project_config, &hooks));
let project_id = repo.project_identifier()?;
Ok((all_commands, project_id))
}
pub fn handle_merge(opts: MergeOptions<'_>) -> anyhow::Result<()> {
let json_mode = opts.format == crate::cli::SwitchFormat::Json;
let MergeOptions {
target,
flags,
yes,
stage,
..
} = opts;
let mut config = UserConfig::load().context("Failed to load config")?;
if flags.commit.unwrap_or(true) {
let _ = crate::output::prompt_commit_generation(&mut config);
}
let env = CommandEnv::for_action(config)?;
let repo = &env.repo;
let config = &env.config;
let current_branch = env.require_branch("merge")?.to_string();
let resolved = env.resolved();
let ResolvedMergeFlags {
squash,
commit,
rebase,
remove,
ff,
verify,
} = flags.resolve(&resolved.merge);
let stage_mode = stage.unwrap_or(resolved.commit.stage());
let current_wt = repo.current_worktree();
if !commit && current_wt.is_dirty()? {
return Err(worktrunk::git::GitError::UncommittedChanges {
action: Some("merge with --no-commit".into()),
branch: Some(current_branch),
force_hint: false,
}
.into());
}
let squash_enabled = squash && commit;
let target_branch = repo.require_target_branch(target)?;
let target_worktree_path = repo.worktree_for_branch(&target_branch)?;
let on_target = current_branch == target_branch;
let remove_requested = remove && !on_target;
let (all_commands, project_id) =
collect_merge_commands(repo, commit, verify, remove_requested, squash_enabled)?;
let approvals = Approvals::load().context("Failed to load approvals")?;
let approved = approve_command_batch(&all_commands, &project_id, &approvals, yes, false)?;
let commit_hooks = HookGate::from_approval(verify, approved);
let verify = if approved {
verify
} else {
eprintln!("{}", info_message("Commands declined, continuing merge"));
false
};
let mut announcer = HookAnnouncer::new(repo, config, false);
let committed = if commit && current_wt.is_dirty()? {
if squash_enabled {
false } else {
let ctx = env.context(yes);
let mut options = CommitOptions::new(&ctx);
options.target_branch = Some(&target_branch);
options.hooks = commit_hooks;
options.stage_mode = stage_mode;
options.warn_about_untracked = stage_mode == super::commit::StageMode::All;
options.show_no_squash_note = true;
let _ = options.commit(&mut announcer)?;
true }
} else {
false };
let squashed = if squash_enabled {
matches!(
super::step::handle_squash(
Some(&target_branch),
yes,
commit_hooks,
Some(stage_mode),
&mut announcer,
)?,
super::step::SquashResult::Squashed { .. }
)
} else {
false
};
let rebased = if rebase {
matches!(
super::step::handle_rebase(Some(&target_branch))?,
super::step::RebaseResult::Rebased { .. }
)
} else {
if !repo.is_rebased_onto(&target_branch)? {
return Err(worktrunk::git::GitError::NotRebased { target_branch }.into());
}
false };
if verify {
let ctx = env.context(yes);
let mut vars = TemplateVars::new().with_target(&target_branch);
if let Some(p) = target_worktree_path.as_deref() {
vars = vars.with_target_worktree_path(p);
}
execute_hook(
&ctx,
HookType::PreMerge,
&vars.as_extra_vars(),
FailureStrategy::FailFast,
crate::output::pre_hook_display_path(ctx.worktree_path),
)?;
}
let operations = Some(MergeOperations {
committed,
squashed,
rebased,
});
if !ff {
let _ = handle_no_ff_merge(Some(&target_branch), operations, ¤t_branch)?;
} else {
let _ = handle_push(Some(&target_branch), PushKind::MergeFastForward, operations)?;
}
let removed = finish_after_merge(
repo,
config,
&env,
&mut announcer,
FinishAfterMergeArgs {
current_branch: ¤t_branch,
target_branch: &target_branch,
target_worktree_path: target_worktree_path.as_deref(),
remove,
verify,
yes,
},
)?;
announcer.flush()?;
if json_mode {
let output = serde_json::json!({
"branch": current_branch,
"target": target_branch,
"committed": committed,
"squashed": squashed,
"rebased": rebased,
"removed": removed,
});
println!("{}", serde_json::to_string_pretty(&output)?);
}
Ok(())
}