mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-22 09:01:45 +03:00
7d078de52f
We want to move towards having each functional domain in a separate crate. The main benefit of that for our project is that this will enforce a unidirectional dependency graph (i.e. no cycles). Starting off with virutal_branches - a lot of the implementation is still in core (i.e. virtual.rs), that will be moved in a separate PR. Furthermore, the virtual branches controller (as well as virtual.rs) contain functions not directly related to branches (e.g. commit reordering etc). That will be furthe separate in a crate.
268 lines
7.6 KiB
Rust
268 lines
7.6 KiB
Rust
use std::fs;
|
|
|
|
use gitbutler_core::virtual_branches::branch;
|
|
|
|
use super::Test;
|
|
|
|
#[tokio::test]
|
|
async fn to_head() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let oid = {
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
// commit changes
|
|
let oid = controller
|
|
.create_commit(project, branch1_id, "commit", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
|
|
oid
|
|
};
|
|
|
|
{
|
|
// reset changes to head
|
|
controller
|
|
.reset_virtual_branch(project, branch1_id, oid)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn to_target() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
let base_branch = controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
// commit changes
|
|
let oid = controller
|
|
.create_commit(project, branch1_id, "commit", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
}
|
|
|
|
{
|
|
// reset changes to head
|
|
controller
|
|
.reset_virtual_branch(project, branch1_id, base_branch.base_sha)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 0);
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn to_commit() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let first_commit_oid = {
|
|
// commit some changes
|
|
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
let oid = controller
|
|
.create_commit(project, branch1_id, "commit", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
|
|
oid
|
|
};
|
|
|
|
{
|
|
// commit some more
|
|
fs::write(repository.path().join("file.txt"), "more content").unwrap();
|
|
|
|
let second_commit_oid = controller
|
|
.create_commit(project, branch1_id, "commit", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 2);
|
|
assert_eq!(branches[0].commits[0].id, second_commit_oid);
|
|
assert_eq!(branches[0].commits[1].id, first_commit_oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"more content"
|
|
);
|
|
}
|
|
|
|
{
|
|
// reset changes to the first commit
|
|
controller
|
|
.reset_virtual_branch(project, branch1_id, first_commit_oid)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, first_commit_oid);
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"more content"
|
|
);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn to_non_existing() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
// commit changes
|
|
let oid = controller
|
|
.create_commit(project, branch1_id, "commit", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, branch1_id);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
assert_eq!(branches[0].commits[0].id, oid);
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(
|
|
fs::read_to_string(repository.path().join("file.txt")).unwrap(),
|
|
"content"
|
|
);
|
|
|
|
oid
|
|
};
|
|
|
|
assert_eq!(
|
|
controller
|
|
.reset_virtual_branch(
|
|
project,
|
|
branch1_id,
|
|
"fe14df8c66b73c6276f7bb26102ad91da680afcb".parse().unwrap()
|
|
)
|
|
.await
|
|
.unwrap_err()
|
|
.to_string(),
|
|
"commit fe14df8c66b73c6276f7bb26102ad91da680afcb not in the branch"
|
|
);
|
|
}
|