grit-lib 0.5.21

Core library for the grit Git implementation
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
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145

//! [`TargetTipLists`] ahead/behind counts and bounded OID lists vs system `git`.

use std::path::Path;
use std::process::Command;

use grit_lib::config::environment::RepositoryOptions;
use grit_lib::objects::ObjectId;
use grit_lib::refs::branch_tracking::{TargetTipListOptions, TargetTipLists};
use grit_lib::repo::Repository;
use grit_test_support::{git, unique_tmp, write_file};

fn commit(dir: &Path, file: &str, message: &str) {
    write_file(dir, file, message);
    git(dir, &["add", file]);
    git(
        dir,
        &[
            "-c",
            "user.name=T",
            "-c",
            "user.email=t@example.com",
            "commit",
            "-q",
            "-m",
            message,
        ],
    );
}

fn rev(dir: &Path, spec: &str) -> ObjectId {
    git(dir, &["rev-parse", spec])
        .trim()
        .parse()
        .expect("rev-parse prints an oid")
}

fn open(dir: &Path) -> Repository {
    Repository::discover(Some(dir), &RepositoryOptions::empty()).expect("open repo")
}

fn git_rev_list_count(dir: &Path, range: &str) -> usize {
    git(dir, &["rev-list", "--count", range])
        .trim()
        .parse()
        .expect("count")
}

fn git_rev_list_n(dir: &Path, n: usize, range: &str) -> Vec<ObjectId> {
    let out = Command::new("git")
        .current_dir(dir)
        .args(["rev-list", "-n", &n.to_string(), range])
        .env("GIT_CONFIG_GLOBAL", "/dev/null")
        .env("GIT_CONFIG_SYSTEM", "/dev/null")
        .output()
        .expect("git rev-list");
    assert!(out.status.success(), "git rev-list failed");
    out.stdout
        .split(|b| *b == b'\n')
        .filter(|line| !line.is_empty())
        .map(|line| {
            std::str::from_utf8(line)
                .expect("utf-8 oid")
                .parse()
                .expect("oid")
        })
        .collect()
}

fn diverged_clone(tag: &str) -> std::path::PathBuf {
    let root = unique_tmp("target-compare", tag);
    let origin = root.join("origin");
    std::fs::create_dir_all(&origin).expect("mkdir origin");
    git(&origin, &["init", "-q", "-b", "main"]);
    commit(&origin, "a", "a1");
    commit(&origin, "a", "a2");
    git(&root, &["clone", "-q", "origin", "clone"]);
    let clone = root.join("clone");
    commit(&clone, "b", "b1");
    commit(&clone, "b", "b2");
    commit(&origin, "a", "a3");
    git(&clone, &["fetch", "-q"]);
    clone
}

#[test]
fn target_comparison_behind_git_compat() -> grit_lib::error::Result<()> {
    let clone = diverged_clone("behind");
    let repo = open(&clone);
    let head = rev(&clone, "HEAD");
    let target = rev(&clone, "origin/main");

    let opts = TargetTipListOptions {
        list_limit: 1,
        include_behind: true,
    };
    let cmp = TargetTipLists::compute(&repo, head, target, opts)?;
    assert_eq!(cmp.ahead, git_rev_list_count(&clone, "origin/main..HEAD"));
    assert_eq!(cmp.behind, git_rev_list_count(&clone, "HEAD..origin/main"));
    assert_eq!(
        cmp.ahead_oids,
        git_rev_list_n(&clone, 1, "origin/main..HEAD")
    );
    assert_eq!(
        cmp.behind_oids,
        git_rev_list_n(&clone, 1, "HEAD..origin/main")
    );

    let bounded = TargetTipLists::compute(
        &repo,
        head,
        target,
        TargetTipListOptions {
            list_limit: 100,
            include_behind: false,
        },
    )?;
    assert_eq!(bounded.ahead, 2);
    assert_eq!(bounded.behind, 1);
    assert_eq!(bounded.ahead_oids.len(), 2);
    assert!(bounded.behind_oids.is_empty());
    Ok(())
}

#[test]
fn target_comparison_list_limit_bounds_lists_not_counts() -> grit_lib::error::Result<()> {
    let clone = diverged_clone("limit");
    let repo = open(&clone);
    let head = rev(&clone, "HEAD");
    let target = rev(&clone, "origin/main");

    let cmp = TargetTipLists::compute(
        &repo,
        head,
        target,
        TargetTipListOptions {
            list_limit: 1,
            include_behind: true,
        },
    )?;
    assert_eq!(cmp.ahead, 2);
    assert_eq!(cmp.behind, 1);
    assert_eq!(cmp.ahead_oids.len(), 1);
    assert_eq!(cmp.behind_oids.len(), 1);
    Ok(())
}