cargo-git 0.7.0

An opinionated helper command to use git with cargo. This does not replace the git command but should be used in conjunction with.
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

use crate::git::Git;
use crate::Merge;

pub fn run(params: Merge) -> Result<(), Box<dyn std::error::Error>> {
    let mut git = Git::open()?;

    let default_branch = git.get_default_branch("origin")?;
    let current_branch = if let Some(name) = git.branch_name.as_ref() {
        name.clone()
    } else {
        return Err("Cannot merge if you are not in a branch!".into());
    };

    let branch_name = params.branch_name.as_str();

    if let Some((_, cargo_lock_conflict)) = git.merge_no_conflict(
        branch_name,
        format!("Merge branch '{}' into {}", branch_name, current_branch).as_str(),
    )? {
        if cargo_lock_conflict {
            println!("WARNING: conflict with Cargo.lock detected. Run `cargo git update --deps` to fix it.");
        }
    } else {
        return Err("Merge conflict detected, aborted.".into());
    }

    if branch_name == default_branch || branch_name.contains("/") {
        return Err(format!(
            "The branch '{}' has been merged but not deleted!",
            branch_name
        )
        .into());
    }

    git.full_delete_branch(branch_name)?;

    println!("The branch '{}' has been merged and deleted.", branch_name);

    Ok(())
}