mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-21 00:21:35 +03:00
9e9f3255a8
Seems i can get away without adding it
56 lines
1.3 KiB
Rust
56 lines
1.3 KiB
Rust
use std::fs;
|
|
|
|
use gitbutler_branch::BranchCreateRequest;
|
|
use gitbutler_stack::BranchOwnershipClaims;
|
|
|
|
use super::Test;
|
|
|
|
#[test]
|
|
fn should_unapply_with_commits() {
|
|
let Test {
|
|
project,
|
|
repository,
|
|
..
|
|
} = &Test::default();
|
|
|
|
gitbutler_branch_actions::set_base_branch(
|
|
project,
|
|
&"refs/remotes/origin/master".parse().unwrap(),
|
|
)
|
|
.unwrap();
|
|
|
|
let branch_id =
|
|
gitbutler_branch_actions::create_virtual_branch(project, &BranchCreateRequest::default())
|
|
.unwrap();
|
|
|
|
fs::write(
|
|
repository.path().join("file.txt"),
|
|
"1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n",
|
|
)
|
|
.unwrap();
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "test", None, false).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();
|
|
|
|
gitbutler_branch_actions::unapply_ownership(
|
|
project,
|
|
&"file.txt:1-5,7-11"
|
|
.parse::<BranchOwnershipClaims>()
|
|
.unwrap(),
|
|
)
|
|
.unwrap_or_else(|err| panic!("{err:?}"));
|
|
|
|
let branch = gitbutler_branch_actions::list_virtual_branches(project)
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
assert!(branch.files.is_empty());
|
|
}
|