dotlock-bin 1.1.0

Encrypted project-local environment variables manager
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24

use colored::Colorize;

use crate::{
    cli::args::{GitCommand, GitMergeArgs},
    domain::model::DotLockResult,
    git::{install::install_merge_driver_if_in_git_repo, merge::run_merge_driver},
};

pub fn run(command: GitCommand) -> DotLockResult<()> {
    match command {
        GitCommand::InstallMergeDriver => {
            if install_merge_driver_if_in_git_repo()? {
                println!("{} Git merge driver installed", "ok:".green().bold());
            } else {
                println!("{} not inside a Git work tree", "info:".cyan().bold());
            }
            Ok(())
        }
    }
}

pub fn run_merge(args: GitMergeArgs) -> DotLockResult<()> {
    run_merge_driver(&args.ours, &args.theirs, &args.base, args.path.as_deref())
}