Remove the usage of the ws3 feature flag

krlvi · krlvi · commit 70d76de1fe20 · 2025-08-10T18:34:50.000+02:00
diff --git a/crates/but-action/src/lib.rs b/crates/but-action/src/lib.rs
@@ -222,18 +222,8 @@ fn default_target_setting_if_none(
 }
 
 fn stacks(ctx: &CommandContext, repo: &gix::Repository) -> anyhow::Result<Vec<StackEntry>> {
-    let project = ctx.project();
-    if ctx.app_settings().feature_flags.ws3 {
-        let meta = ref_metadata_toml(ctx.project())?;
-        but_workspace::stacks_v3(repo, &meta, but_workspace::StacksFilter::InWorkspace)
-    } else {
-        but_workspace::stacks(
-            ctx,
-            &project.gb_dir(),
-            repo,
-            but_workspace::StacksFilter::InWorkspace,
-        )
-    }
+    let meta = ref_metadata_toml(ctx.project())?;
+    but_workspace::stacks_v3(repo, &meta, but_workspace::StacksFilter::InWorkspace)
 }
 
 fn ref_metadata_toml(project: &Project) -> anyhow::Result<VirtualBranchesTomlMetadata> {
diff --git a/crates/but-action/src/reword.rs b/crates/but-action/src/reword.rs
@@ -79,12 +79,8 @@ pub async fn commit(
 
 fn stacks(ctx: &CommandContext) -> anyhow::Result<Vec<StackEntry>> {
     let repo = ctx.gix_repo_for_merging_non_persisting()?;
-    if ctx.app_settings().feature_flags.ws3 {
-        let meta = VirtualBranchesTomlMetadata::from_path(
-            ctx.project().gb_dir().join("virtual_branches.toml"),
-        )?;
-        but_workspace::stacks_v3(&repo, &meta, StacksFilter::default())
-    } else {
-        but_workspace::stacks(ctx, &ctx.project().gb_dir(), &repo, StacksFilter::default())
-    }
+    let meta = VirtualBranchesTomlMetadata::from_path(
+        ctx.project().gb_dir().join("virtual_branches.toml"),
+    )?;
+    but_workspace::stacks_v3(&repo, &meta, StacksFilter::default())
 }
diff --git a/crates/but-api/src/commands/stack.rs b/crates/but-api/src/commands/stack.rs
@@ -102,56 +102,51 @@ pub fn create_reference(app: &App, params: create_reference::Params) -> Result<(
 pub fn create_branch(app: &App, params: CreateBranchParams) -> Result<(), Error> {
     let project = gitbutler_project::get(params.project_id)?;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
-    if app.app_settings.get()?.feature_flags.ws3 {
-        use ReferencePosition::Above;
-        let (repo, mut meta, graph) = ctx.graph_and_meta_and_repo()?;
-        let ws = graph.to_workspace()?;
-        let stack = ws.try_find_stack_by_id(params.stack_id)?;
-        let new_ref = Category::LocalBranch
-            .to_full_name(params.request.name.as_str())
-            .map_err(anyhow::Error::from)?;
-        if params.request.preceding_head.is_some() {
-            return Err(anyhow!(
-                "BUG: cannot have preceding head name set - let's use the new API instead"
-            )
-            .into());
-        }
+    use ReferencePosition::Above;
+    let (repo, mut meta, graph) = ctx.graph_and_meta_and_repo()?;
+    let ws = graph.to_workspace()?;
+    let stack = ws.try_find_stack_by_id(params.stack_id)?;
+    let new_ref = Category::LocalBranch
+        .to_full_name(params.request.name.as_str())
+        .map_err(anyhow::Error::from)?;
+    if params.request.preceding_head.is_some() {
+        return Err(anyhow!(
+            "BUG: cannot have preceding head name set - let's use the new API instead"
+        )
+        .into());
+    }
 
-        let mut guard = project.exclusive_worktree_access();
-        ctx.snapshot_create_dependent_branch(&params.request.name, guard.write_permission())
-            .ok();
-        _ = but_workspace::branch::create_reference(
-            new_ref.as_ref(),
-            {
-                let segment = stack.segments.first().context("BUG: no empty stacks")?;
-                segment
-                    .ref_name
-                    .as_ref()
-                    .map(|rn| ReferenceAnchor::AtSegment {
-                        ref_name: Cow::Borrowed(rn.as_ref()),
+    let mut guard = project.exclusive_worktree_access();
+    ctx.snapshot_create_dependent_branch(&params.request.name, guard.write_permission())
+        .ok();
+    _ = but_workspace::branch::create_reference(
+        new_ref.as_ref(),
+        {
+            let segment = stack.segments.first().context("BUG: no empty stacks")?;
+            segment
+                .ref_name
+                .as_ref()
+                .map(|rn| ReferenceAnchor::AtSegment {
+                    ref_name: Cow::Borrowed(rn.as_ref()),
+                    position: Above,
+                })
+                .or_else(|| {
+                    Some(ReferenceAnchor::AtCommit {
+                        commit_id: graph.tip_skip_empty(segment.id)?.id,
                         position: Above,
                     })
-                    .or_else(|| {
-                        Some(ReferenceAnchor::AtCommit {
-                            commit_id: graph.tip_skip_empty(segment.id)?.id,
-                            position: Above,
-                        })
-                    })
-                    .with_context(|| {
-                        format!(
-                            "TODO: UI should migrate to new version of `create_branch()` instead,\
+                })
+                .with_context(|| {
+                    format!(
+                        "TODO: UI should migrate to new version of `create_branch()` instead,\
                             couldn't handle {params:?}"
-                        )
-                    })?
-            },
-            &repo,
-            &ws,
-            &mut meta,
-        )?;
-    } else {
-        // NOTE: locking is built-in here.
-        gitbutler_branch_actions::stack::create_branch(&ctx, params.stack_id, params.request)?;
-    }
+                    )
+                })?
+        },
+        &repo,
+        &ws,
+        &mut meta,
+    )?;
     Ok(())
 }
 
@@ -166,31 +161,27 @@ pub struct RemoveBranchParams {
 pub fn remove_branch(app: &App, params: RemoveBranchParams) -> Result<(), Error> {
     let project = gitbutler_project::get(params.project_id)?;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
-    if app.app_settings.get()?.feature_flags.ws3 {
-        let (repo, mut meta, graph) = ctx.graph_and_meta_and_repo()?;
-        let ws = graph.to_workspace()?;
-        let ref_name = Category::LocalBranch
-            .to_full_name(params.branch_name.as_str())
-            .map_err(anyhow::Error::from)?;
-        let mut guard = project.exclusive_worktree_access();
-        ctx.snapshot_remove_dependent_branch(&params.branch_name, guard.write_permission())
-            .ok();
-        but_workspace::branch::remove_reference(
-            ref_name.as_ref(),
-            &repo,
-            &ws,
-            &mut meta,
-            but_workspace::branch::remove_reference::Options {
-                avoid_anonymous_stacks: true,
-                // The UI kind of keeps it, but we can't do that somehow
-                // the object id is null, and stuff breaks. Fine for now.
-                // Delete is delete.
-                keep_metadata: false,
-            },
-        )?;
-    } else {
-        gitbutler_branch_actions::stack::remove_branch(&ctx, params.stack_id, params.branch_name)?;
-    }
+    let (repo, mut meta, graph) = ctx.graph_and_meta_and_repo()?;
+    let ws = graph.to_workspace()?;
+    let ref_name = Category::LocalBranch
+        .to_full_name(params.branch_name.as_str())
+        .map_err(anyhow::Error::from)?;
+    let mut guard = project.exclusive_worktree_access();
+    ctx.snapshot_remove_dependent_branch(&params.branch_name, guard.write_permission())
+        .ok();
+    but_workspace::branch::remove_reference(
+        ref_name.as_ref(),
+        &repo,
+        &ws,
+        &mut meta,
+        but_workspace::branch::remove_reference::Options {
+            avoid_anonymous_stacks: true,
+            // The UI kind of keeps it, but we can't do that somehow
+            // the object id is null, and stuff breaks. Fine for now.
+            // Delete is delete.
+            keep_metadata: false,
+        },
+    )?;
     Ok(())
 }
 
diff --git a/crates/but-api/src/commands/virtual_branches.rs b/crates/but-api/src/commands/virtual_branches.rs
@@ -40,9 +40,8 @@ pub fn create_virtual_branch(
     params: CreateVirtualBranchParams,
 ) -> Result<StackEntryNoOpt, Error> {
     let project = gitbutler_project::get(params.project_id)?;
-    let ws3_enabled = app.app_settings.get()?.feature_flags.ws3;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
-    let stack_entry = if ws3_enabled {
+    let stack_entry = {
         let (repo, mut meta, graph) = ctx.graph_and_meta_and_repo()?;
         let ws = graph.to_workspace()?;
         let new_ref = Category::LocalBranch
@@ -73,12 +72,6 @@ pub fn create_virtual_branch(
             tip,
             order: Some(stack_idx),
         }
-    } else {
-        gitbutler_branch_actions::create_virtual_branch(
-            &ctx,
-            &params.branch,
-            ctx.project().exclusive_worktree_access().write_permission(),
-        )?
     };
     Ok(stack_entry)
 }
diff --git a/crates/but-api/src/commands/workspace.rs b/crates/but-api/src/commands/workspace.rs
@@ -32,18 +32,8 @@ pub fn stacks(app: &App, params: StacksParams) -> Result<Vec<StackEntry>, Error>
     let project = gitbutler_project::get(params.project_id)?;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
     let repo = ctx.gix_repo_for_merging_non_persisting()?;
-    if ctx.app_settings().feature_flags.ws3 {
-        let meta = ref_metadata_toml(ctx.project())?;
-        but_workspace::stacks_v3(&repo, &meta, params.filter.unwrap_or_default())
-    } else {
-        but_workspace::stacks(
-            &ctx,
-            &project.gb_dir(),
-            &repo,
-            params.filter.unwrap_or_default(),
-        )
-    }
-    .map_err(Into::into)
+    let meta = ref_metadata_toml(ctx.project())?;
+    but_workspace::stacks_v3(&repo, &meta, params.filter.unwrap_or_default()).map_err(Into::into)
 }
 
 #[derive(Deserialize)]
@@ -105,18 +95,9 @@ pub fn stack_details(
 ) -> Result<but_workspace::ui::StackDetails, Error> {
     let project = gitbutler_project::get(params.project_id)?;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
-    if ctx.app_settings().feature_flags.ws3 {
-        let repo = ctx.gix_repo_for_merging_non_persisting()?;
-        let meta = ref_metadata_toml(ctx.project())?;
-        but_workspace::stack_details_v3(params.stack_id, &repo, &meta)
-    } else {
-        but_workspace::stack_details(
-            &project.gb_dir(),
-            params.stack_id.context("BUG(opt-stack-id)")?,
-            &ctx,
-        )
-    }
-    .map_err(Into::into)
+    let repo = ctx.gix_repo_for_merging_non_persisting()?;
+    let meta = ref_metadata_toml(ctx.project())?;
+    but_workspace::stack_details_v3(params.stack_id, &repo, &meta).map_err(Into::into)
 }
 
 #[derive(Deserialize)]
@@ -133,29 +114,19 @@ pub fn branch_details(
 ) -> Result<but_workspace::ui::BranchDetails, Error> {
     let project = gitbutler_project::get(params.project_id)?;
     let ctx = CommandContext::open(&project, app.app_settings.get()?.clone())?;
-    if ctx.app_settings().feature_flags.ws3 {
-        let repo = ctx.gix_repo_for_merging_non_persisting()?;
-        let meta = ref_metadata_toml(ctx.project())?;
-        let ref_name: gix::refs::FullName = match params.remote.as_deref() {
-            None => {
-                format!("refs/heads/{}", params.branch_name)
-            }
-            Some(remote) => {
-                format!("refs/remotes/{remote}/{}", params.branch_name)
-            }
+    let repo = ctx.gix_repo_for_merging_non_persisting()?;
+    let meta = ref_metadata_toml(ctx.project())?;
+    let ref_name: gix::refs::FullName = match params.remote.as_deref() {
+        None => {
+            format!("refs/heads/{}", params.branch_name)
+        }
+        Some(remote) => {
+            format!("refs/remotes/{remote}/{}", params.branch_name)
         }
-        .try_into()
-        .map_err(anyhow::Error::from)?;
-        but_workspace::branch_details_v3(&repo, ref_name.as_ref(), &meta)
-    } else {
-        but_workspace::branch_details(
-            &project.gb_dir(),
-            &params.branch_name,
-            params.remote.as_deref(),
-            &ctx,
-        )
     }
-    .map_err(Into::into)
+    .try_into()
+    .map_err(anyhow::Error::from)?;
+    but_workspace::branch_details_v3(&repo, ref_name.as_ref(), &meta).map_err(Into::into)
 }
 
 #[derive(Deserialize)]
diff --git a/crates/but-claude/src/hooks/mod.rs b/crates/but-claude/src/hooks/mod.rs
@@ -524,25 +524,17 @@ impl OutputAsJson for Result<ClaudeHookOutput> {
 }
 
 fn stack_details(ctx: &CommandContext, stack_id: StackId) -> anyhow::Result<StackDetails> {
-    if ctx.app_settings().feature_flags.ws3 {
-        let repo = ctx.gix_repo_for_merging_non_persisting()?;
-        let meta = VirtualBranchesTomlMetadata::from_path(
-            ctx.project().gb_dir().join("virtual_branches.toml"),
-        )?;
-        but_workspace::stack_details_v3(Some(stack_id), &repo, &meta)
-    } else {
-        but_workspace::stack_details(&ctx.project().gb_dir(), stack_id, ctx)
-    }
+    let repo = ctx.gix_repo_for_merging_non_persisting()?;
+    let meta = VirtualBranchesTomlMetadata::from_path(
+        ctx.project().gb_dir().join("virtual_branches.toml"),
+    )?;
+    but_workspace::stack_details_v3(Some(stack_id), &repo, &meta)
 }
 
 fn list_stacks(ctx: &CommandContext) -> anyhow::Result<Vec<StackEntry>> {
     let repo = ctx.gix_repo_for_merging_non_persisting()?;
-    if ctx.app_settings().feature_flags.ws3 {
-        let meta = VirtualBranchesTomlMetadata::from_path(
-            ctx.project().gb_dir().join("virtual_branches.toml"),
-        )?;
-        but_workspace::stacks_v3(&repo, &meta, StacksFilter::default())
-    } else {
-        but_workspace::stacks(ctx, &ctx.project().gb_dir(), &repo, StacksFilter::default())
-    }
+    let meta = VirtualBranchesTomlMetadata::from_path(
+        ctx.project().gb_dir().join("virtual_branches.toml"),
+    )?;
+    but_workspace::stacks_v3(&repo, &meta, StacksFilter::default())
 }
diff --git a/crates/but-rules/src/handler.rs b/crates/but-rules/src/handler.rs
@@ -31,13 +31,11 @@ pub fn process_workspace_rules(
     }
 
     let repo = ctx.gix_repo_for_merging_non_persisting()?;
-    let stacks_in_ws = if ctx.app_settings().feature_flags.ws3 {
+    let stacks_in_ws = {
         let meta = VirtualBranchesTomlMetadata::from_path(
             ctx.project().gb_dir().join("virtual_branches.toml"),
         )?;
         but_workspace::stacks_v3(&repo, &meta, StacksFilter::InWorkspace)
-    } else {
-        but_workspace::stacks(ctx, &ctx.project().gb_dir(), &repo, StacksFilter::default())
     }?;
 
     for rule in rules {
diff --git a/crates/but-tools/src/workspace.rs b/crates/but-tools/src/workspace.rs
@@ -1991,7 +1991,7 @@ pub struct AbsorbSpec {
     <description>
         The title of the commit to use in the amended commit.
     </description>
-    
+
     <important_notes>
         The title should be concise and descriptive.
         Don't use more than 50 characters.
@@ -2042,16 +2042,6 @@ fn stacks(
     ctx: &CommandContext,
     repo: &gix::Repository,
 ) -> anyhow::Result<Vec<but_workspace::ui::StackEntry>> {
-    let project = ctx.project();
-    if ctx.app_settings().feature_flags.ws3 {
-        let meta = ref_metadata_toml(ctx.project())?;
-        but_workspace::stacks_v3(repo, &meta, but_workspace::StacksFilter::InWorkspace)
-    } else {
-        but_workspace::stacks(
-            ctx,
-            &project.gb_dir(),
-            repo,
-            but_workspace::StacksFilter::InWorkspace,
-        )
-    }
+    let meta = ref_metadata_toml(ctx.project())?;
+    but_workspace::stacks_v3(repo, &meta, but_workspace::StacksFilter::InWorkspace)
 }
diff --git a/crates/but/src/log/mod.rs b/crates/but/src/log/mod.rs
diff --git a/crates/gitbutler-cli/src/command/vbranch.rs b/crates/gitbutler-cli/src/command/vbranch.rs
diff --git a/crates/gitbutler-testsupport/src/lib.rs b/crates/gitbutler-testsupport/src/lib.rs
