mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-21 16:41:32 +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.
63 lines
1.4 KiB
Rust
63 lines
1.4 KiB
Rust
use std::fs;
|
|
|
|
use gitbutler_core::virtual_branches::{branch, branch::BranchOwnershipClaims};
|
|
|
|
use super::Test;
|
|
|
|
#[tokio::test]
|
|
async fn should_unapply_with_commits() {
|
|
let Test {
|
|
project,
|
|
controller,
|
|
repository,
|
|
..
|
|
} = &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.txt"),
|
|
"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n",
|
|
)
|
|
.unwrap();
|
|
controller
|
|
.create_commit(project, branch_id, "test", None, false)
|
|
.await
|
|
.unwrap();
|
|
|
|
// change in the committed hunks leads to hunk locking
|
|
fs::write(
|
|
repository.path().join("file.txt"),
|
|
"_\n2\n3\n4\n5\n6\n7\n8\n9\n_\n",
|
|
)
|
|
.unwrap();
|
|
|
|
controller
|
|
.unapply_ownership(
|
|
project,
|
|
&"file.txt:1-5,7-11"
|
|
.parse::<BranchOwnershipClaims>()
|
|
.unwrap(),
|
|
)
|
|
.await
|
|
.unwrap_or_else(|err| panic!("{err:?}"));
|
|
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
assert!(branch.files.is_empty());
|
|
}
|