prikk 0.29.0

A standalone distributed version control system built around block-oriented patch theory.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25

//! `prikk merge` command implementation.

use prikk_store::{MaintainerSigner, MergeExecutionReport, execute_merge};

use crate::args::MergeExecuteArgs;
use crate::commands::CliError;
use crate::open_repository;

/// Run `prikk merge` against already-parsed arguments. AUD-10: parsing is the caller's job now
/// (`parse_merge_execute_args`, called from `main.rs` before the signer is built), so that a bad
/// argument is refused before an unrelated missing-signer environment is ever consulted.
pub(crate) fn run_merge(
    args: MergeExecuteArgs,
    signer: &impl MaintainerSigner,
) -> std::result::Result<MergeExecutionReport, CliError> {
    let layout = open_repository(args.root)?;
    execute_merge(
        &layout,
        args.baseline_block_id,
        &args.into_ref,
        &args.from_ref,
        signer,
    )
    .map_err(|err| CliError::from(err.to_string()))
}