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.
447 lines
12 KiB
Rust
447 lines
12 KiB
Rust
use super::*;
|
|
|
|
#[tokio::test]
|
|
async fn unapplying_selected_branch_selects_anther() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
std::fs::write(repository.path().join("file one.txt"), "").unwrap();
|
|
|
|
// first branch should be created as default
|
|
let b_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
// if default branch exists, new branch should not be created as default
|
|
let b2_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
|
|
let b = branches.iter().find(|b| b.id == b_id).unwrap();
|
|
|
|
let b2 = branches.iter().find(|b| b.id == b2_id).unwrap();
|
|
|
|
assert!(b.selected_for_changes);
|
|
assert!(!b2.selected_for_changes);
|
|
|
|
controller
|
|
.convert_to_real_branch(project, b_id, Default::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, b2.id);
|
|
assert!(branches[0].selected_for_changes);
|
|
assert!(branches[0].active);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn deleting_selected_branch_selects_anther() {
|
|
let Test {
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
// first branch should be created as default
|
|
let b_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
// if default branch exists, new branch should not be created as default
|
|
let b2_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
|
|
let b = branches.iter().find(|b| b.id == b_id).unwrap();
|
|
|
|
let b2 = branches.iter().find(|b| b.id == b2_id).unwrap();
|
|
|
|
assert!(b.selected_for_changes);
|
|
assert!(!b2.selected_for_changes);
|
|
|
|
controller
|
|
.delete_virtual_branch(project, b_id)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
|
|
assert_eq!(branches.len(), 1);
|
|
assert_eq!(branches[0].id, b2.id);
|
|
assert!(branches[0].selected_for_changes);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn create_virtual_branch_should_set_selected_for_changes() {
|
|
let Test {
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
// first branch should be created as default
|
|
let b_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b_id)
|
|
.unwrap();
|
|
assert!(branch.selected_for_changes);
|
|
|
|
// if default branch exists, new branch should not be created as default
|
|
let b_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b_id)
|
|
.unwrap();
|
|
assert!(!branch.selected_for_changes);
|
|
|
|
// explicitly don't make this one default
|
|
let b_id = controller
|
|
.create_virtual_branch(
|
|
project,
|
|
&branch::BranchCreateRequest {
|
|
selected_for_changes: Some(false),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b_id)
|
|
.unwrap();
|
|
assert!(!branch.selected_for_changes);
|
|
|
|
// explicitly make this one default
|
|
let b_id = controller
|
|
.create_virtual_branch(
|
|
project,
|
|
&branch::BranchCreateRequest {
|
|
selected_for_changes: Some(true),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
let branch = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b_id)
|
|
.unwrap();
|
|
assert!(branch.selected_for_changes);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn update_virtual_branch_should_reset_selected_for_changes() {
|
|
let Test {
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let b1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
let b1 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b1_id)
|
|
.unwrap();
|
|
assert!(b1.selected_for_changes);
|
|
|
|
let b2_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
let b2 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b2_id)
|
|
.unwrap();
|
|
assert!(!b2.selected_for_changes);
|
|
|
|
controller
|
|
.update_virtual_branch(
|
|
project,
|
|
branch::BranchUpdateRequest {
|
|
id: b2_id,
|
|
selected_for_changes: Some(true),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
let b1 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b1_id)
|
|
.unwrap();
|
|
assert!(!b1.selected_for_changes);
|
|
|
|
let b2 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b2_id)
|
|
.unwrap();
|
|
assert!(b2.selected_for_changes);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn unapply_virtual_branch_should_reset_selected_for_changes() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
let b1_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
std::fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
let b1 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b1_id)
|
|
.unwrap();
|
|
assert!(b1.selected_for_changes);
|
|
|
|
let b2_id = controller
|
|
.create_virtual_branch(project, &branch::BranchCreateRequest::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
let b2 = controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == b2_id)
|
|
.unwrap();
|
|
assert!(!b2.selected_for_changes);
|
|
|
|
controller
|
|
.convert_to_real_branch(project, b1_id, Default::default())
|
|
.await
|
|
.unwrap();
|
|
|
|
assert!(controller
|
|
.list_virtual_branches(project)
|
|
.await
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.any(|b| b.selected_for_changes && b.id != b1_id))
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn hunks_distribution() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
std::fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
|
|
controller
|
|
.create_virtual_branch(
|
|
project,
|
|
&branch::BranchCreateRequest {
|
|
selected_for_changes: Some(true),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
std::fs::write(repository.path().join("another_file.txt"), "content").unwrap();
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(branches[1].files.len(), 1);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn applying_first_branch() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
std::fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
|
|
let unapplied_branch = controller
|
|
.convert_to_real_branch(project, branches[0].id, Default::default())
|
|
.await
|
|
.unwrap();
|
|
let unapplied_branch = git::Refname::from_str(&unapplied_branch).unwrap();
|
|
controller
|
|
.create_virtual_branch_from_branch(project, &unapplied_branch)
|
|
.await
|
|
.unwrap();
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches.len(), 1);
|
|
assert!(branches[0].active);
|
|
assert!(branches[0].selected_for_changes);
|
|
}
|
|
|
|
// This test was written in response to issue #4148, to ensure the appearence
|
|
// of a locked hunk doesn't drag along unrelated hunks to its branch.
|
|
#[tokio::test]
|
|
async fn new_locked_hunk_without_modifying_existing() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
controller,
|
|
..
|
|
} = &Test::default();
|
|
|
|
let mut lines = repository.gen_file("file.txt", 9);
|
|
repository.commit_all("first commit");
|
|
repository.push();
|
|
|
|
controller
|
|
.set_base_branch(project, &"refs/remotes/origin/master".parse().unwrap())
|
|
.await
|
|
.unwrap();
|
|
|
|
lines[0] = "modification 1".to_string();
|
|
repository.write_file("file.txt", &lines);
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
|
|
controller
|
|
.create_commit(project, branches[0].id, "second commit", None, false)
|
|
.await
|
|
.expect("failed to create commit");
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(branches[0].commits.len(), 1);
|
|
|
|
controller
|
|
.create_virtual_branch(
|
|
project,
|
|
&branch::BranchCreateRequest {
|
|
selected_for_changes: Some(true),
|
|
..Default::default()
|
|
},
|
|
)
|
|
.await
|
|
.unwrap();
|
|
|
|
lines[8] = "modification 2".to_string();
|
|
repository.write_file("file.txt", &lines);
|
|
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 0);
|
|
assert_eq!(branches[1].files.len(), 1);
|
|
|
|
lines[0] = "modification 3".to_string();
|
|
repository.write_file("file.txt", &lines);
|
|
let (branches, _) = controller.list_virtual_branches(project).await.unwrap();
|
|
assert_eq!(branches[0].files.len(), 1);
|
|
assert_eq!(branches[1].files.len(), 1);
|
|
}
|