oxen-cli 0.50.7

Oxen is a fast, unstructured data version control, to help version large machine learning datasets written in Rust.
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
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70

use async_trait::async_trait;
use clap::{Arg, Command, arg};
use liboxen::model::LocalRepository;

use liboxen::repositories;

use crate::helpers::check_repo_migration_needed;

use crate::cmd::RunCmd;
pub const NAME: &str = "merge";
pub struct MergeCmd;

#[async_trait]
impl RunCmd for MergeCmd {
    fn name(&self) -> &str {
        NAME
    }

    fn args(&self) -> Command {
        Command::new(NAME)
            .about("Merges a branch into the current checked out branch.")
            .arg(
                arg!([BRANCH] "The name of the branch you want to merge in.")
                    .required_unless_present("abort"),
            )
            .arg(
                Arg::new("abort")
                    .long("abort")
                    .help("Abandon an interrupted or in-conflict merge and restore HEAD.")
                    .action(clap::ArgAction::SetTrue)
                    .conflicts_with("BRANCH"),
            )
    }

    async fn run(&self, args: &clap::ArgMatches) -> Result<(), anyhow::Error> {
        let repository = LocalRepository::from_current_dir()?;

        // Don't allow in remote mode
        if repository.is_remote_mode() {
            return Err(anyhow::anyhow!(
                "Error: Command 'oxen merge' not implemented for remote mode repositories",
            ));
        }

        check_repo_migration_needed(&repository)?;

        if args.get_flag("abort") {
            repositories::merge::abort_merge(&repository).await?;
            return Ok(());
        }

        let branch = args.get_one::<String>("BRANCH").expect("required");

        // Return immediately if the merge branch is the current branch
        let current = if let Some(current) = repositories::branches::current_branch(&repository)? {
            current
        } else {
            return Err(anyhow::anyhow!(
                "Error: Cannot use 'oxen merge' in an empty repository",
            ));
        };

        if current.name == *branch {
            return Err(anyhow::anyhow!("Error: Cannot merge into current branch",));
        }

        repositories::merge::merge(&repository, branch).await?;
        Ok(())
    }
}