libvctrl 0.3.0

A robust, content-addressed version control engine for arbitrary data, designed for embedding into applications.
Documentation 
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

mod common;
use common::{alice, bob, encoder, hasher, put_blob, put_tree, setup_refs, setup_store};
use libvctrl::{
    Command, CreateBranch, CreateCommit, EntryKind, Log, Object, ObjectStore, Revert, SetHead,
    Tree, TreeEntry,
};

#[test]
fn test_revert_with_conflict_added_modified() {
    let mut store = setup_store();
    let mut refs = setup_refs();

    let init_hash = common::blob_hash(b"init");
    CreateBranch {
        name: "refs/heads/main".into(),
        hash: init_hash,
    }
    .execute(&mut store, &mut refs)
    .unwrap();
    SetHead {
        target: "refs/heads/main".into(),
    }
    .execute(&mut store, &mut refs)
    .unwrap();

    let blob1 = put_blob(&mut store, b"data1");
    let entry1 = TreeEntry::new("file.txt".into(), EntryKind::Blob, blob1).unwrap();
    let tree1 = Tree::new(vec![entry1]).unwrap();
    let tree1_hash = put_tree(&mut store, &tree1);

    let c1 = CreateCommit {
        tree_hash: tree1_hash,
        parents: vec![],
        author: alice(),
        committer: alice(),
        message: "first".into(),
        encoder: Box::new(encoder()),
        hasher: Box::new(hasher()),
        signer: None,
    }
    .execute(&mut store, &mut refs)
    .unwrap();

    let blob2 = put_blob(&mut store, b"data2");
    let entry2 = TreeEntry::new("file2.txt".into(), EntryKind::Blob, blob2).unwrap();
    let tree2 = Tree::new(vec![
        TreeEntry::new("file.txt".into(), EntryKind::Blob, blob1).unwrap(),
        entry2,
    ])
    .unwrap();
    let tree2_hash = put_tree(&mut store, &tree2);

    let c2 = CreateCommit {
        tree_hash: tree2_hash,
        parents: vec![c1],
        author: alice(),
        committer: alice(),
        message: "add file2".into(),
        encoder: Box::new(encoder()),
        hasher: Box::new(hasher()),
        signer: None,
    }
    .execute(&mut store, &mut refs)
    .unwrap();

    let blob3 = put_blob(&mut store, b"data3");
    let entry2_modified = TreeEntry::new("file2.txt".into(), EntryKind::Blob, blob3).unwrap();
    let tree3 = Tree::new(vec![
        TreeEntry::new("file.txt".into(), EntryKind::Blob, blob1).unwrap(),
        entry2_modified,
    ])
    .unwrap();
    let tree3_hash = put_tree(&mut store, &tree3);

    let c3 = CreateCommit {
        tree_hash: tree3_hash,
        parents: vec![c2],
        author: alice(),
        committer: alice(),
        message: "modify file2".into(),
        encoder: Box::new(encoder()),
        hasher: Box::new(hasher()),
        signer: None,
    }
    .execute(&mut store, &mut refs)
    .unwrap();

    let history_before = Log.execute(&mut store, &mut refs).unwrap();
    assert_eq!(history_before.len(), 3);
    assert_eq!(history_before[0].message, "modify file2");
    assert_eq!(history_before[0].tree, tree3_hash);

    let c3_obj = store.get(&c3).unwrap().unwrap();
    assert!(matches!(c3_obj, Object::Commit(_)));

    let revert = Revert {
        commit_hash: c2,
        author: bob(),
        committer: bob(),
        encoder: Box::new(encoder()),
        hasher: Box::new(hasher()),
    };
    let err = revert.execute(&mut store, &mut refs).unwrap_err();
    assert!(err.to_string().contains("has been modified"));
}