commit engine: get the write lock passed when committing

Author: krlvi

crates/but-cli/src/command/commit.rs

@@ -35,6 +35,7 @@ pub fn commit(
     };
     let changes = to_whole_file_diffspec(but_core::diff::worktree_changes(&repo)?.changes);
     if let Some(project) = project.as_ref() {
+        let mut guard = project.exclusive_worktree_access();
         debug_print(
             but_workspace::commit_engine::create_commit_and_update_refs_with_project(
                 &repo,
@@ -44,6 +45,7 @@ pub fn commit(
                 None,
                 changes,
                 0, /* context-lines */
+                guard.write_permission(),
             )?,
         )?;
     } else {

crates/but-workspace/src/commit_engine/mod.rs

@@ -6,6 +6,7 @@ use but_core::RepositoryExt;
 use but_core::unified_diff::DiffHunk;
 use but_rebase::RebaseOutput;
 use but_rebase::commit::CommitterMode;
+use gitbutler_project::access::WorktreeWritePermission;
 use gitbutler_stack::{StackId, VirtualBranchesHandle, VirtualBranchesState};
 use gix::prelude::ObjectIdExt as _;
 use gix::refs::transaction::PreviousValue;
@@ -473,6 +474,7 @@ pub fn create_commit_and_update_refs(
 /// if present. Alternatively it uses the current `HEAD` as only reference point.
 /// Note that virtual branches will be updated and written back after this call, which will obtain
 /// an exclusive workspace lock as well.
+#[allow(clippy::too_many_arguments)]
 pub fn create_commit_and_update_refs_with_project(
     repo: &gix::Repository,
     project: &gitbutler_project::Project,
@@ -481,8 +483,8 @@ pub fn create_commit_and_update_refs_with_project(
     move_source: Option<MoveSourceCommit>,
     changes: Vec<DiffSpec>,
     context_lines: u32,
+    _perm: &mut WorktreeWritePermission,
 ) -> anyhow::Result<CreateCommitOutcome> {
-    let _guard = project.exclusive_worktree_access();
     let vbh = VirtualBranchesHandle::new(project.gb_dir());
     let mut vb = vbh.read_file()?;
     let frame = match maybe_stackid {

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

@@ -326,7 +326,7 @@ fn amend_with_commit_engine(
     commit_oid: git2::Oid,
     worktree_changes: Vec<DiffSpec>,
 ) -> Result<git2::Oid> {
-    // let changes: Vec<DiffSpec> = ownership.claims.iter().map(claim_to_diffspec).collect();
+    let mut guard = ctx.project().exclusive_worktree_access();
 
     let vb_state = ctx.project().virtual_branches();
     let stack = vb_state.get_stack(stack_id)?;
@@ -344,6 +344,7 @@ fn amend_with_commit_engine(
         None,
         worktree_changes,
         3, // for the old API this is hardcoded
+        guard.write_permission(),
     )?;
     let new_commit = outcome.new_commit.ok_or(anyhow::anyhow!(
         "Failed to amend with commit engine. Rejected specs: {:?}",

crates/gitbutler-tauri/src/workspace.rs

@@ -120,6 +120,7 @@ pub fn create_commit_from_worktree_changes(
             }
         }
     };
+    let guard = project.exclusive_worktree_access();
     Ok(commit_engine::create_commit_and_update_refs_with_project(
         &repo,
         &project,
@@ -136,6 +137,7 @@ pub fn create_commit_from_worktree_changes(
         None,
         worktree_changes.into_iter().map(Into::into).collect(),
         settings.get()?.context_lines,
+        guard,
     )?
     .into())
 }
@@ -156,6 +158,7 @@ pub fn amend_commit_from_worktree_changes(
     worktree_changes: Vec<commit_engine::ui::DiffSpec>,
 ) -> Result<commit_engine::ui::CreateCommitOutcome, Error> {
     let project = projects.get(project_id)?;
+    let mut guard = project.exclusive_worktree_access();
     let repo = but_core::open_repo_for_merging(&project.worktree_path())?;
     Ok(commit_engine::create_commit_and_update_refs_with_project(
         &repo,
@@ -165,6 +168,7 @@ pub fn amend_commit_from_worktree_changes(
         None,
         worktree_changes.into_iter().map(Into::into).collect(),
         settings.get()?.context_lines,
+        guard.write_permission(),
     )?
     .into())
 }