Merge pull request #13662 from gitbutlerapp/kv-branch-114

remove legacy branch splitting API and implementation

Author: krlvi

crates/but-api/src/legacy/workspace.rs

@@ -8,45 +8,16 @@ use but_workspace::{
     commit_engine::{self, StackSegmentId},
     legacy::{StacksFilter, ui::StackEntry},
 };
-use gitbutler_branch_actions::{BranchManagerExt, update_workspace_commit};
+use gitbutler_branch_actions::BranchManagerExt;
 use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_oplog::{
     OplogExt, SnapshotExt,
     entry::{OperationKind, SnapshotDetails},
 };
-use gitbutler_reference::{LocalRefname, Refname};
 use tracing::instrument;
 
 use crate::json::HexHash;
 
-mod json {
-    use but_workspace::legacy::MoveChangesResult as LegacyMoveChangesResult;
-    use serde::Serialize;
-
-    use crate::json::HexHash;
-
-    /// JSON transport type for moving changes between commits.
-    #[derive(Debug, Serialize)]
-    #[serde(rename_all = "camelCase")]
-    pub struct MoveChangesResult {
-        /// Commits that have been mapped from one thing to another
-        pub replaced_commits: Vec<(HexHash, HexHash)>,
-    }
-
-    impl From<LegacyMoveChangesResult> for MoveChangesResult {
-        fn from(value: LegacyMoveChangesResult) -> Self {
-            let LegacyMoveChangesResult { replaced_commits } = value;
-
-            Self {
-                replaced_commits: replaced_commits
-                    .into_iter()
-                    .map(|(x, y)| (x.into(), y.into()))
-                    .collect(),
-            }
-        }
-    }
-}
-
 #[but_api(napi, try_from = but_workspace::ui::RefInfo)]
 #[instrument(err(Debug))]
 pub fn head_info(ctx: &but_ctx::Context) -> Result<but_workspace::RefInfo> {
@@ -345,75 +316,6 @@ pub fn discard_worktree_changes(
     Ok(refused)
 }
 
-#[but_api(json::MoveChangesResult)]
-#[instrument(err(Debug))]
-pub fn split_branch(
-    ctx: &mut Context,
-    source_stack_id: StackId,
-    source_branch_name: String,
-    new_branch_name: String,
-    file_changes_to_split_off: Vec<String>,
-) -> Result<but_workspace::legacy::MoveChangesResult> {
-    let mut guard = ctx.exclusive_worktree_access();
-    let _ = ctx.create_snapshot(
-        SnapshotDetails::new(OperationKind::SplitBranch),
-        guard.write_permission(),
-    );
-
-    let (_, move_changes_result) = but_workspace::legacy::split_branch(
-        ctx,
-        source_stack_id,
-        source_branch_name,
-        new_branch_name.clone(),
-        &file_changes_to_split_off,
-        guard.write_permission(),
-    )?;
-
-    // TODO(ctx): remove this, it's done above
-    update_workspace_commit(ctx, false)?;
-
-    let refname = Refname::Local(LocalRefname::new(&new_branch_name, None));
-    let branch_manager = ctx.branch_manager();
-    branch_manager.create_virtual_branch_from_branch(&refname, None, guard.write_permission())?;
-
-    // TODO(ctx): use new branch creation, which would update the ctx workspace as well.
-    let meta = ctx.meta()?;
-    let (repo, mut ws, _) = ctx.workspace_mut_and_db_with_perm(guard.write_permission())?;
-    ws.refresh_from_head(&repo, &meta)?;
-
-    Ok(move_changes_result)
-}
-
-#[but_api(json::MoveChangesResult)]
-#[instrument(err(Debug))]
-pub fn split_branch_into_dependent_branch(
-    ctx: &mut but_ctx::Context,
-    source_stack_id: StackId,
-    source_branch_name: String,
-    new_branch_name: String,
-    file_changes_to_split_off: Vec<String>,
-) -> Result<but_workspace::legacy::MoveChangesResult> {
-    let mut guard = ctx.exclusive_worktree_access();
-
-    let _ = ctx.create_snapshot(
-        SnapshotDetails::new(OperationKind::SplitBranch),
-        guard.write_permission(),
-    );
-
-    let move_changes_result = but_workspace::legacy::split_into_dependent_branch(
-        ctx,
-        source_stack_id,
-        source_branch_name,
-        new_branch_name.clone(),
-        &file_changes_to_split_off,
-        guard.write_permission(),
-    )?;
-
-    update_workspace_commit(ctx, false)?;
-
-    Ok(move_changes_result)
-}
-
 /// This API allows the user to quickly "stash" a bunch of uncommitted changes - getting them out of the worktree.
 /// Unlike the regular stash, the user specifies a new branch where those changes will be 'saved'/committed.
 /// Immediately after the changes are committed, the branch is unapplied from the workspace, and the "stash" branch can be re-applied at a later time

crates/but-server/src/lib.rs

@@ -806,14 +806,6 @@ pub async fn run(config: Config) -> anyhow::Result<()> {
             "/discard_worktree_changes",
             but_post(legacy::workspace::discard_worktree_changes_cmd),
         )
-        .route(
-            "/split_branch",
-            but_post(legacy::workspace::split_branch_cmd),
-        )
-        .route(
-            "/split_branch_into_dependent_branch",
-            but_post(legacy::workspace::split_branch_into_dependent_branch_cmd),
-        )
         .route(
             "/stash_into_branch",
             but_post(legacy::workspace::stash_into_branch_cmd),

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

@@ -17,16 +17,11 @@ pub use head::{
     merge_worktree_with_workspace, remerged_workspace_commit_v2, remerged_workspace_tree_v2,
 };
 
-pub mod tree_manipulation;
 // TODO: _v3 versions are specifically for the UI, so import them into `ui` instead.
 #[expect(deprecated, reason = "re-exports stacks_v3 and stack_details_v3")]
 pub use stacks::{
     local_and_remote_commits, stack_branches, stack_details_v3, stack_heads_info, stacks_v3,
 };
-pub use tree_manipulation::{
-    MoveChangesResult,
-    split_branch::{split_branch, split_into_dependent_branch},
-};
 
 /// Various types for the frontend.
 pub mod ui;