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
41
42
43
44
45
46
47
48
49
50
51
52

use crate::git::Git;
use crate::Check;

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

    let (_forked_at, parent_branch) = git.get_parent()?;

    let default_branch = git.get_default_branch("origin")?;
    let parent = params
        .revision
        .as_ref()
        .or_else(|| parent_branch.as_ref())
        .map(|x| x.as_str())
        .unwrap_or_else(|| default_branch.as_str());

    if git.has_file_changes()? {
        return Err("The repository has not committed changes, aborting.".into());
    }

    if parent.contains('/') {
        git.update_upstream(parent)?;
    }

    let mut rev_list = git.rev_list("HEAD", parent, true)?;

    if rev_list.is_empty() {
        println!("Your branch is already up-to-date.");
        return Ok(());
    }

    let mut last_failing_revision: Option<String> = None;
    while let Some(revision) = rev_list.pop() {
        if let Some(cargo_lock_conflict) = git.check_no_conflict(revision.as_str())? {
            if cargo_lock_conflict {
                println!("WARNING: conflict with Cargo.lock detected. Run `cargo git update --deps` to fix it.");
            }

            break;
        } else {
            last_failing_revision = Some(revision.clone());
        }
    }

    if let Some(revision) = last_failing_revision {
        Err(format!("Conflict detected on {}", revision).into())
    } else {
        println!("No conflict detected.");

        Ok(())
    }
}