gitbutler/crates/gitbutler-branch/src/controller.rs

513 lines
17 KiB
Rust
Raw Normal View History

use anyhow::Result;
use gitbutler_core::{
git::{credentials::Helper, BranchExt},
project_repository::Repository,
projects::FetchResult,
types::ReferenceName,
};
use gitbutler_oplog::{
entry::{OperationKind, SnapshotDetails},
oplog::Oplog,
snapshot::Snapshot,
};
use std::{path::Path, sync::Arc};
use tokio::sync::Semaphore;
use crate::base::{
get_base_branch_data, set_base_branch, set_target_push_remote, update_base_branch, BaseBranch,
};
2024-07-07 16:51:07 +03:00
use super::r#virtual as branch;
use gitbutler_core::virtual_branches;
use crate::files::RemoteBranchFile;
use gitbutler_core::virtual_branches::{
branch::{BranchId, BranchOwnershipClaims},
target, VirtualBranchesHandle,
};
use gitbutler_core::{
git,
projects::{self, Project},
};
#[derive(Clone)]
pub struct Controller {
semaphore: Arc<Semaphore>,
}
impl Default for Controller {
fn default() -> Self {
Self {
semaphore: Arc::new(Semaphore::new(1)),
}
}
}
impl Controller {
pub async fn create_commit(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
message: &str,
ownership: Option<&BranchOwnershipClaims>,
run_hooks: bool,
2024-06-05 23:56:03 +03:00
) -> Result<git2::Oid> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let snapshot_tree = project_repository.project().prepare_snapshot();
2024-07-07 16:51:07 +03:00
let result = branch::commit(
&project_repository,
branch_id,
message,
ownership,
run_hooks,
)
.map_err(Into::into);
let _ = snapshot_tree.and_then(|snapshot_tree| {
project_repository.project().snapshot_commit_creation(
snapshot_tree,
result.as_ref().err(),
message.to_owned(),
None,
)
});
result
}
pub async fn can_apply_remote_branch(
&self,
project: &Project,
branch_name: &git::RemoteRefname,
) -> Result<bool> {
let project_repository = Repository::open(project)?;
2024-07-07 16:51:07 +03:00
branch::is_remote_branch_mergeable(&project_repository, branch_name).map_err(Into::into)
}
pub async fn list_virtual_branches(
&self,
project: &Project,
2024-07-07 16:51:07 +03:00
) -> Result<(Vec<branch::VirtualBranch>, Vec<git::diff::FileDiff>)> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
2024-07-07 16:51:07 +03:00
branch::list_virtual_branches(&project_repository).map_err(Into::into)
}
pub async fn create_virtual_branch(
&self,
project: &Project,
create: &virtual_branches::branch::BranchCreateRequest,
) -> Result<BranchId> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
2024-07-07 16:51:07 +03:00
let branch_id = branch::create_virtual_branch(&project_repository, create)?.id;
Ok(branch_id)
}
pub async fn create_virtual_branch_from_branch(
&self,
project: &Project,
branch: &git::Refname,
) -> Result<BranchId> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
2024-07-07 16:51:07 +03:00
branch::create_virtual_branch_from_branch(&project_repository, branch).map_err(Into::into)
}
pub async fn get_base_branch_data(&self, project: &Project) -> Result<BaseBranch> {
let project_repository = Repository::open(project)?;
get_base_branch_data(&project_repository)
}
pub async fn list_remote_commit_files(
&self,
project: &Project,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
) -> Result<Vec<RemoteBranchFile>> {
let project_repository = Repository::open(project)?;
crate::files::list_remote_commit_files(project_repository.repo(), commit_oid)
.map_err(Into::into)
}
pub async fn set_base_branch(
&self,
project: &Project,
target_branch: &git::RemoteRefname,
) -> Result<BaseBranch> {
let project_repository = Repository::open(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::SetBaseBranch));
set_base_branch(&project_repository, target_branch)
}
pub async fn set_target_push_remote(&self, project: &Project, push_remote: &str) -> Result<()> {
let project_repository = Repository::open(project)?;
set_target_push_remote(&project_repository, push_remote)
}
2024-05-23 05:41:13 +03:00
pub async fn integrate_upstream_commits(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::MergeUpstream));
branch::integrate_upstream_commits(&project_repository, branch_id).map_err(Into::into)
}
pub async fn update_base_branch(&self, project: &Project) -> Result<Vec<ReferenceName>> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::UpdateWorkspaceBase));
update_base_branch(&project_repository)
.map(|unapplied_branches| {
unapplied_branches
.iter()
.filter_map(|unapplied_branch| unapplied_branch.reference_name().ok())
.collect()
})
.map_err(Into::into)
}
pub async fn update_virtual_branch(
&self,
project: &Project,
branch_update: virtual_branches::branch::BranchUpdateRequest,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let snapshot_tree = project_repository.project().prepare_snapshot();
let old_branch = project_repository
.project()
.virtual_branches()
.get_branch(branch_update.id)?;
2024-07-07 16:51:07 +03:00
let result = branch::update_branch(&project_repository, &branch_update);
let _ = snapshot_tree.and_then(|snapshot_tree| {
project_repository.project().snapshot_branch_update(
snapshot_tree,
&old_branch,
&branch_update,
result.as_ref().err(),
)
});
result?;
Ok(())
}
pub async fn delete_virtual_branch(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
2024-07-07 16:51:07 +03:00
branch::delete_branch(&project_repository, branch_id)
}
pub async fn unapply_ownership(
&self,
project: &Project,
ownership: &BranchOwnershipClaims,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::DiscardHunk));
2024-07-07 16:51:07 +03:00
branch::unapply_ownership(&project_repository, ownership).map_err(Into::into)
}
pub async fn reset_files(&self, project: &Project, files: &Vec<String>) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::DiscardFile));
2024-07-07 16:51:07 +03:00
branch::reset_files(&project_repository, files).map_err(Into::into)
}
pub async fn amend(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
ownership: &BranchOwnershipClaims,
2024-06-05 23:56:03 +03:00
) -> Result<git2::Oid> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::AmendCommit));
2024-07-07 16:51:07 +03:00
branch::amend(&project_repository, branch_id, commit_oid, ownership)
}
pub async fn move_commit_file(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
from_commit_oid: git2::Oid,
to_commit_oid: git2::Oid,
ownership: &BranchOwnershipClaims,
2024-06-05 23:56:03 +03:00
) -> Result<git2::Oid> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::MoveCommitFile));
2024-07-07 16:51:07 +03:00
branch::move_commit_file(
&project_repository,
branch_id,
from_commit_oid,
to_commit_oid,
ownership,
)
.map_err(Into::into)
}
pub async fn undo_commit(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let snapshot_tree = project_repository.project().prepare_snapshot();
let result: Result<()> =
2024-07-07 16:51:07 +03:00
branch::undo_commit(&project_repository, branch_id, commit_oid).map_err(Into::into);
let _ = snapshot_tree.and_then(|snapshot_tree| {
project_repository.project().snapshot_commit_undo(
snapshot_tree,
result.as_ref(),
commit_oid,
)
});
result
}
pub async fn insert_blank_commit(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
offset: i32,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::InsertBlankCommit));
2024-07-07 16:51:07 +03:00
branch::insert_blank_commit(&project_repository, branch_id, commit_oid, offset)
.map_err(Into::into)
}
pub async fn reorder_commit(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
offset: i32,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::ReorderCommit));
2024-07-07 16:51:07 +03:00
branch::reorder_commit(&project_repository, branch_id, commit_oid, offset)
.map_err(Into::into)
}
pub async fn reset_virtual_branch(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
target_commit_oid: git2::Oid,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::UndoCommit));
2024-07-07 16:51:07 +03:00
branch::reset_branch(&project_repository, branch_id, target_commit_oid).map_err(Into::into)
}
pub async fn convert_to_real_branch(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-07-07 16:51:07 +03:00
name_conflict_resolution: branch::NameConflitResolution,
) -> Result<ReferenceName> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let snapshot_tree = project_repository.project().prepare_snapshot();
2024-07-07 16:51:07 +03:00
let result = branch::convert_to_real_branch(
&project_repository,
branch_id,
name_conflict_resolution,
)
.map_err(Into::into);
let _ = snapshot_tree.and_then(|snapshot_tree| {
project_repository
.project()
.snapshot_branch_unapplied(snapshot_tree, result.as_ref())
});
result.and_then(|b| b.reference_name())
}
pub async fn push_virtual_branch(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
with_force: bool,
2024-05-07 17:07:37 +03:00
askpass: Option<Option<BranchId>>,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let helper = Helper::default();
let project_repository = open_with_verify(project)?;
2024-07-07 16:51:07 +03:00
branch::push(&project_repository, branch_id, with_force, &helper, askpass)
}
pub async fn list_remote_branches(
&self,
project: Project,
) -> Result<Vec<virtual_branches::RemoteBranch>> {
let project_repository = Repository::open(&project)?;
virtual_branches::list_remote_branches(&project_repository)
}
pub async fn get_remote_branch_data(
&self,
project: &Project,
refname: &git::Refname,
) -> Result<virtual_branches::RemoteBranchData> {
let project_repository = Repository::open(project)?;
virtual_branches::get_branch_data(&project_repository, refname)
}
pub async fn squash(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::SquashCommit));
2024-07-07 16:51:07 +03:00
branch::squash(&project_repository, branch_id, commit_oid).map_err(Into::into)
}
pub async fn update_commit_message(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
message: &str,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::UpdateCommitMessage));
2024-07-07 16:51:07 +03:00
branch::update_commit_message(&project_repository, branch_id, commit_oid, message)
.map_err(Into::into)
}
pub async fn fetch_from_remotes(
&self,
project: &Project,
2024-05-07 17:07:37 +03:00
askpass: Option<String>,
) -> Result<FetchResult> {
let project_repository = Repository::open(project)?;
let helper = Helper::default();
2024-05-24 15:58:56 +03:00
let remotes = project_repository.remotes()?;
let fetch_results: Vec<Result<(), _>> = remotes
2024-05-24 15:58:56 +03:00
.iter()
.map(|remote| project_repository.fetch(remote, &helper, askpass.clone()))
2024-05-24 15:58:56 +03:00
.collect();
2024-05-24 15:58:56 +03:00
let project_data_last_fetched = if fetch_results.iter().any(Result::is_err) {
projects::FetchResult::Error {
timestamp: std::time::SystemTime::now(),
2024-05-24 15:58:56 +03:00
error: fetch_results
.iter()
.filter_map(|result| match result {
Ok(_) => None,
Err(error) => Some(error.to_string()),
})
.collect::<Vec<_>>()
.join("\n"),
}
} else {
projects::FetchResult::Fetched {
timestamp: std::time::SystemTime::now(),
2024-05-24 15:58:56 +03:00
}
};
2024-05-24 15:58:56 +03:00
let default_target = default_target(&project_repository.project().gb_dir())?;
2024-05-06 17:01:06 +03:00
// if we have a push remote, let's fetch from this too
if let Some(push_remote) = &default_target.push_remote_name {
if let Err(err) = project_repository.fetch(push_remote, &helper, askpass.clone()) {
tracing::warn!(?err, "fetch from push-remote failed");
}
2024-05-06 17:01:06 +03:00
}
Ok(project_data_last_fetched)
}
pub async fn move_commit(
&self,
project: &Project,
2024-05-29 12:07:36 +03:00
target_branch_id: BranchId,
2024-06-05 23:56:03 +03:00
commit_oid: git2::Oid,
) -> Result<()> {
self.permit(project.ignore_project_semaphore).await;
let project_repository = open_with_verify(project)?;
let _ = project_repository
.project()
.create_snapshot(SnapshotDetails::new(OperationKind::MoveCommit));
2024-07-07 16:51:07 +03:00
branch::move_commit(&project_repository, target_branch_id, commit_oid).map_err(Into::into)
}
async fn permit(&self, ignore: bool) {
if !ignore {
let _permit = self.semaphore.acquire().await;
}
}
}
fn open_with_verify(project: &Project) -> Result<Repository> {
let project_repository = Repository::open(project)?;
crate::integration::verify_branch(&project_repository)?;
Ok(project_repository)
}
2024-04-21 10:26:34 +03:00
fn default_target(base_path: &Path) -> anyhow::Result<target::Target> {
VirtualBranchesHandle::new(base_path).get_default_target()
2024-04-21 10:26:34 +03:00
}