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.
361 lines
8.6 KiB
Rust
361 lines
8.6 KiB
Rust
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn head() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit one", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file two.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit two", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file three.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit three", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
let commit_four_oid = {
|
|
fs::write(repository.path().join("file four.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit four", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
controller
|
|
.squash(project, branch_id, commit_four_oid)
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
assert_eq!(
|
|
descriptions,
|
|
vec!["commit three\ncommit four", "commit two", "commit one"]
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn middle() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit one", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
let commit_two_oid = {
|
|
fs::write(repository.path().join("file two.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit two", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file three.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit three", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file four.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit four", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
controller
|
|
.squash(project, branch_id, commit_two_oid)
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
assert_eq!(
|
|
descriptions,
|
|
vec!["commit four", "commit three", "commit one\ncommit two"]
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn forcepush_allowed() {
|
|
let Test {
|
|
repository,
|
|
project_id,
|
|
project,
|
|
controller,
|
|
projects,
|
|
..
|
|
} = &Test::default();
|
|
|
|
projects
|
|
.update(&projects::UpdateRequest {
|
|
id: *project_id,
|
|
..Default::default()
|
|
})
|
|
.await
|
|
.unwrap();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit one", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
controller
|
|
.push_virtual_branch(project, branch_id, false, None)
|
|
.await
|
|
.unwrap();
|
|
|
|
let commit_two_oid = {
|
|
fs::write(repository.path().join("file two.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit two", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file three.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit three", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file four.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit four", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
controller
|
|
.squash(project, branch_id, commit_two_oid)
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
assert_eq!(
|
|
descriptions,
|
|
vec!["commit four", "commit three", "commit one\ncommit two"]
|
|
);
|
|
assert!(branch.requires_force);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn forcepush_forbidden() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
controller
|
|
.update_virtual_branch(
|
|
project,
|
|
branch::BranchUpdateRequest {
|
|
id: branch_id,
|
|
allow_rebasing: Some(false),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
{
|
|
fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit one", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
controller
|
|
.push_virtual_branch(project, branch_id, false, None)
|
|
.await
|
|
.unwrap();
|
|
|
|
let commit_two_oid = {
|
|
fs::write(repository.path().join("file two.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit two", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file three.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit three", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
{
|
|
fs::write(repository.path().join("file four.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit four", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
assert_eq!(
|
|
controller
|
|
.squash(project, branch_id, commit_two_oid)
|
|
.await
|
|
.unwrap_err()
|
|
.to_string(),
|
|
"force push not allowed"
|
|
);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn root_forbidden() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let branch_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let commit_one_oid = {
|
|
fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "commit one", None, false)
|
|
.await
|
|
.unwrap()
|
|
};
|
|
|
|
assert_eq!(
|
|
controller
|
|
.squash(project, branch_id, commit_one_oid)
|
|
.await
|
|
.unwrap_err()
|
|
.to_string(),
|
|
"can not squash root commit"
|
|
);
|
|
}
|