Merge pull request #4839 from gitbutlerapp/rm-vb-actions-struct

Remove unnecessary VirtualBranchActions struct

Author: krlvi

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

@@ -1,5 +1,6 @@
 use std::borrow::Cow;
 
+use crate::r#virtual as vbranch;
 use anyhow::{anyhow, bail, Context, Result};
 use gitbutler_branch::{self, dedup, Branch, BranchCreateRequest, BranchId, BranchOwnershipClaims};
 use gitbutler_commit::commit_headers::HasCommitHeaders;
@@ -14,10 +15,9 @@ use tracing::instrument;
 use super::BranchManager;
 use crate::{
     conflicts::{self, RepoConflictsExt},
-    ensure_selected_for_changes,
     hunk::VirtualBranchHunk,
     integration::update_workspace_commit,
-    set_ownership, undo_commit, VirtualBranchesExt,
+    VirtualBranchesExt,
 };
 
 impl BranchManager<'_> {
@@ -118,7 +118,8 @@ impl BranchManager<'_> {
         };
 
         if let Some(ownership) = &create.ownership {
-            set_ownership(&vb_state, &mut branch, ownership).context("failed to set ownership")?;
+            vbranch::set_ownership(&vb_state, &mut branch, ownership)
+                .context("failed to set ownership")?;
         }
 
         vb_state.set_branch(branch.clone())?;
@@ -489,7 +490,8 @@ impl BranchManager<'_> {
         // apply the branch
         vb_state.set_branch(branch.clone())?;
 
-        ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
+        vbranch::ensure_selected_for_changes(&vb_state)
+            .context("failed to ensure selected for changes")?;
         // checkout the merge index
         repo.checkout_index_builder(&mut merge_index)
             .force()
@@ -505,7 +507,7 @@ impl BranchManager<'_> {
 
                 if let Some(headers) = potential_wip_commit.gitbutler_headers() {
                     if headers.change_id == wip_commit_to_unapply {
-                        undo_commit(self.ctx, branch.id, branch.head)?;
+                        vbranch::undo_commit(self.ctx, branch.id, branch.head)?;
                     }
                 }
 

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

@@ -11,9 +11,10 @@ use gitbutler_repo::{RepoActionsExt, RepositoryExt};
 use tracing::instrument;
 
 use super::BranchManager;
+use crate::r#virtual as vbranch;
 use crate::{
     conflicts::{self},
-    ensure_selected_for_changes, get_applied_status,
+    get_applied_status,
     hunk::VirtualBranchHunk,
     VirtualBranchesExt,
 };
@@ -47,7 +48,8 @@ impl BranchManager<'_> {
         vb_state.update_ordering()?;
 
         // Ensure we still have a default target
-        ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
+        vbranch::ensure_selected_for_changes(&vb_state)
+            .context("failed to ensure selected for changes")?;
 
         crate::integration::update_workspace_commit(&vb_state, self.ctx)?;
 
@@ -132,7 +134,8 @@ impl BranchManager<'_> {
 
         self.ctx.delete_branch_reference(&branch)?;
 
-        ensure_selected_for_changes(&vb_state).context("failed to ensure selected for changes")?;
+        vbranch::ensure_selected_for_changes(&vb_state)
+            .context("failed to ensure selected for changes")?;
 
         Ok(())
     }

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

@@ -1,9 +1,27 @@
 //! GitButler internal library containing functionality related to branches, i.e. the virtual branches implementation
 mod actions;
-pub use actions::VirtualBranchActions;
+// This is our API
+pub use actions::{
+    amend, can_apply_remote_branch, convert_to_real_branch, create_change_reference, create_commit,
+    create_virtual_branch, create_virtual_branch_from_branch, delete_local_branch,
+    delete_virtual_branch, fetch_from_remotes, get_base_branch_data, get_remote_branch_data,
+    get_uncommited_files, get_uncommited_files_reusable, insert_blank_commit,
+    integrate_upstream_commits, list_local_branches, list_remote_commit_files,
+    list_virtual_branches, list_virtual_branches_cached, move_commit, move_commit_file,
+    push_change_reference, push_virtual_branch, reorder_commit, reset_files, reset_virtual_branch,
+    set_base_branch, set_target_push_remote, squash, unapply_ownership, undo_commit,
+    update_base_branch, update_branch_order, update_change_reference, update_commit_message,
+    update_virtual_branch,
+};
 
 mod r#virtual;
-pub use r#virtual::*;
+pub use r#virtual::{BranchStatus, VirtualBranch, VirtualBranchHunksByPathMap, VirtualBranches};
+/// Avoid using these!
+/// This was previously `pub use r#virtual::*;`
+pub mod internal {
+    pub use super::r#virtual::*;
+    pub use super::remote::list_local_branches;
+}
 
 mod branch_manager;
 pub use branch_manager::{BranchManager, BranchManagerExt};
@@ -18,7 +36,7 @@ mod file;
 pub use file::{Get, RemoteBranchFile};
 
 mod remote;
-pub use remote::{list_local_branches, RemoteBranch, RemoteBranchData, RemoteCommit};
+pub use remote::{RemoteBranch, RemoteBranchData, RemoteCommit};
 
 pub mod conflicts;