id: make from_str use non-legacy Context

This is in preparation for a future commit that changes `IdDb::new`
(which `from_str` calls) to also take `Context` instead of
`CommandContext`.

Author: jonathantanmy2

crates/but/src/absorb.rs

@@ -6,11 +6,10 @@ use but_api::{
     legacy::{diff, virtual_branches},
 };
 use but_core::DiffSpec;
+use but_ctx::Context;
 use but_hunk_assignment::HunkAssignment;
 use but_hunk_dependency::ui::HunkDependencies;
-use but_settings::AppSettings;
 use colored::Colorize;
-use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 
 use crate::{id::CliId, rub::parse_sources, utils::OutputChannel};
@@ -29,11 +28,11 @@ use crate::{id::CliId, rub::parse_sources, utils::OutputChannel};
 /// If a Branch (stack) id is provided, absorb will be performed for all changes assigned to that stack
 /// If no source is provided, absorb is performed for all uncommitted changes
 pub(crate) fn handle(
-    project: &Project,
+    ctx: &Context,
     out: &mut OutputChannel,
     source: Option<&str>,
 ) -> anyhow::Result<()> {
-    let ctx = &mut CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
+    let project = &ctx.legacy_project;
     let source: Option<CliId> = source
         .and_then(|s| parse_sources(ctx, s).ok())
         .and_then(|s| {

crates/but/src/branch/mod.rs

@@ -1,9 +1,7 @@
 use anyhow::bail;
 pub use branch::{Platform, Subcommands};
 use but_core::ref_metadata::StackId;
-use but_settings::AppSettings;
 use but_workspace::legacy::ui::StackEntry;
-use gitbutler_command_context::CommandContext;
 
 use crate::{LegacyProject, args::branch, utils::OutputChannel};
 
@@ -151,10 +149,6 @@ pub async fn handle(
             branch_name,
             anchor,
         }) => {
-            let ctx = CommandContext::open(
-                legacy_project,
-                AppSettings::load_from_default_path_creating()?,
-            )?;
             // Get branch name or use canned name
             let branch_name = branch_name.map(Ok).unwrap_or_else(|| {
                 but_api::legacy::workspace::canned_branch_name(legacy_project.id)
@@ -165,10 +159,9 @@ pub async fn handle(
 
             let anchor = if let Some(anchor_str) = anchor {
                 // Use the new create_reference API when anchor is provided
-                let mut ctx = ctx; // Make mutable for CliId resolution
 
                 // Resolve the anchor string to a CliId
-                let anchor_ids = crate::id::CliId::from_str(&mut ctx, &anchor_str)?;
+                let anchor_ids = crate::id::CliId::from_str(ctx, &anchor_str)?;
                 if anchor_ids.is_empty() {
                     return Err(anyhow::anyhow!("Could not find anchor: {}", anchor_str));
                 }

crates/but/src/commit.rs

@@ -7,9 +7,8 @@ use but_api::{
     legacy::{diff, virtual_branches, workspace},
 };
 use but_core::{DiffSpec, ui::TreeChange};
+use but_ctx::Context;
 use but_hunk_assignment::HunkAssignment;
-use but_settings::AppSettings;
-use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 
 use crate::{
@@ -18,14 +17,14 @@ use crate::{
 };
 
 pub(crate) fn insert_blank_commit(
-    project: &Project,
+    ctx: &Context,
     out: &mut OutputChannel,
     target: &str,
 ) -> Result<()> {
-    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
+    let project = &ctx.legacy_project;
 
     // Resolve the target ID
-    let cli_ids = CliId::from_str(&mut ctx, target)?;
+    let cli_ids = CliId::from_str(ctx, target)?;
 
     if cli_ids.is_empty() {
         bail!("Target '{}' not found", target);
@@ -144,14 +143,14 @@ fn find_stack_containing_commit(
 }
 
 pub(crate) fn commit(
-    project: &Project,
+    ctx: &Context,
     out: &mut OutputChannel,
     message: Option<&str>,
     branch_hint: Option<&str>,
     only: bool,
     create_branch: bool,
 ) -> anyhow::Result<()> {
-    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
+    let project = &ctx.legacy_project;
 
     // Get all stacks using but-api
     let project_id = project.id;
@@ -171,7 +170,7 @@ pub(crate) fn commit(
         .collect();
 
     let (target_stack_id, target_stack) =
-        select_stack(&mut ctx, project, &stacks, branch_hint, create_branch, out)?;
+        select_stack(ctx, project, &stacks, branch_hint, create_branch, out)?;
 
     // Get changes and assignments using but-api
     let worktree_changes = diff::changes_in_worktree(project_id)?;
@@ -236,7 +235,7 @@ pub(crate) fn commit(
             .find(|branch| branch.name == hint)
             .or_else(|| {
                 // If no exact match, try to parse as CLI ID and match
-                if let Ok(cli_ids) = crate::id::CliId::from_str(&mut ctx, hint) {
+                if let Ok(cli_ids) = crate::id::CliId::from_str(ctx, hint) {
                     for cli_id in cli_ids {
                         if let crate::id::CliId::Branch { name, .. } = cli_id
                             && let Some(branch) =
@@ -335,7 +334,7 @@ fn create_independent_branch(
 }
 
 fn select_stack(
-    ctx: &mut CommandContext,
+    ctx: &Context,
     project: &Project,
     stacks: &[(
         but_core::ref_metadata::StackId,
@@ -396,7 +395,7 @@ fn select_stack(
 }
 
 fn find_stack_by_hint(
-    ctx: &mut CommandContext,
+    ctx: &Context,
     stacks: &[(
         but_core::ref_metadata::StackId,
         but_workspace::ui::StackDetails,

crates/but/src/describe.rs

@@ -1,20 +1,16 @@
 use anyhow::{Result, bail};
+use but_ctx::Context;
 use but_oxidize::{ObjectIdExt, OidExt};
-use but_settings::AppSettings;
 use gitbutler_command_context::CommandContext;
 use gitbutler_project::Project;
 
 use crate::{editor::get_text_from_editor_no_comments, id::CliId, utils::OutputChannel};
 
-pub(crate) fn describe_target(
-    project: &Project,
-    out: &mut OutputChannel,
-    target: &str,
-) -> Result<()> {
-    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
+pub(crate) fn describe_target(ctx: &Context, out: &mut OutputChannel, target: &str) -> Result<()> {
+    let project = &ctx.legacy_project;
 
     // Resolve the commit ID
-    let cli_ids = CliId::from_str(&mut ctx, target)?;
+    let cli_ids = CliId::from_str(ctx, target)?;
 
     if cli_ids.is_empty() {
         bail!("ID '{}' not found", target);
@@ -32,10 +28,10 @@ pub(crate) fn describe_target(
 
     match cli_id {
         CliId::Branch { name, .. } => {
-            edit_branch_name(&ctx, project, name, out)?;
+            edit_branch_name(project, name, out)?;
         }
         CliId::Commit { oid } => {
-            edit_commit_message_by_id(&ctx, project, *oid, out)?;
+            edit_commit_message_by_id(&ctx.legacy_ctx()?, project, *oid, out)?;
         }
         _ => {
             bail!("Target must be a commit ID, not {}", cli_id.kind());
@@ -45,12 +41,7 @@ pub(crate) fn describe_target(
     Ok(())
 }
 
-fn edit_branch_name(
-    _ctx: &CommandContext,
-    project: &Project,
-    branch_name: &str,
-    out: &mut OutputChannel,
-) -> Result<()> {
+fn edit_branch_name(project: &Project, branch_name: &str, out: &mut OutputChannel) -> Result<()> {
     // Find which stack this branch belongs to
     let stacks = but_api::legacy::workspace::stacks(
         project.id,

crates/but/src/forge/review.rs

@@ -1,8 +1,9 @@
 use std::collections::BTreeMap;
 
-use anyhow::Context;
+use anyhow::Context as _;
 use bstr::ByteSlice;
 use but_core::ref_metadata::StackId;
+use but_ctx::Context;
 use but_oxidize::OidExt;
 use but_settings::AppSettings;
 use but_workspace::ui::Commit;
@@ -102,21 +103,22 @@ pub fn set_review_template(
 
 /// Publish reviews for active branches in the workspace.
 pub async fn publish_reviews(
-    project: &Project,
+    ctx: &Context,
     branch: Option<String>,
     skip_force_push_protection: bool,
     with_force: bool,
     run_hooks: bool,
     default: bool,
     out: &mut OutputChannel,
 ) -> anyhow::Result<()> {
+    let project = &ctx.legacy_project;
     let review_map = get_review_map(project).await?;
     let applied_stacks = but_api::legacy::workspace::stacks(
         project.id,
         Some(but_workspace::legacy::StacksFilter::InWorkspace),
     )?;
     let maybe_branch_names = branch
-        .map(|branch_id| get_branch_names(project, &branch_id))
+        .map(|branch_id| get_branch_names(ctx, &branch_id))
         .transpose()?;
     handle_multiple_branches_in_workspace(
         project,
@@ -132,9 +134,8 @@ pub async fn publish_reviews(
     .await
 }
 
-fn get_branch_names(project: &Project, branch_id: &str) -> anyhow::Result<Vec<String>> {
-    let mut ctx = CommandContext::open(project, AppSettings::load_from_default_path_creating()?)?;
-    let branch_ids = CliId::from_str(&mut ctx, branch_id)?
+fn get_branch_names(ctx: &Context, branch_id: &str) -> anyhow::Result<Vec<String>> {
+    let branch_ids = CliId::from_str(ctx, branch_id)?
         .iter()
         .filter_map(|clid| match clid {
             CliId::Branch { name, .. } => Some(name.clone()),

crates/but/src/id.rs

@@ -2,6 +2,7 @@ use std::{collections::HashMap, fmt::Display};
 
 use bstr::ByteSlice;
 use but_core::ref_metadata::StackId;
+use but_ctx::Context;
 use but_hunk_assignment::HunkAssignment;
 use gitbutler_command_context::CommandContext;
 
@@ -194,7 +195,7 @@ impl CliId {
         }
     }
 
-    pub fn from_str(ctx: &mut CommandContext, s: &str) -> anyhow::Result<Vec<Self>> {
+    pub fn from_str(ctx: &Context, s: &str) -> anyhow::Result<Vec<Self>> {
         if s.len() < 2 {
             return Err(anyhow::anyhow!(
                 "Id needs to be at least 2 characters long: {}",
@@ -203,37 +204,37 @@ impl CliId {
         }
 
         // TODO: make callers of this function pass IdDb instead
-        let mut id_db = IdDb::new(ctx)?;
+        let mut id_db = IdDb::new(&ctx.legacy_ctx()?)?;
 
         let mut matches = Vec::new();
 
         // First, try exact branch name match
-        if let Ok(branch_matches) = id_db.find_branches_by_name(ctx, s) {
+        if let Ok(branch_matches) = id_db.find_branches_by_name(&ctx.legacy_ctx()?, s) {
             matches.extend(branch_matches);
         }
 
         // Then try partial SHA matches (for commits)
-        if let Ok(commit_matches) = Self::find_commits_by_sha(ctx, s) {
+        if let Ok(commit_matches) = Self::find_commits_by_sha(&ctx.legacy_ctx()?, s) {
             matches.extend(commit_matches);
         }
 
         // Then try CliId matching (both prefix and exact)
         if s.len() > 2 {
             // For longer strings, try prefix matching on CliIds
             let mut cli_matches = Vec::new();
-            crate::status::all_files(ctx)?
+            crate::status::all_files(&mut ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches_prefix(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::status::all_committed_files(ctx)?
+            crate::status::all_committed_files(&mut ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches_prefix(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::status::all_branches(ctx)?
+            crate::status::all_branches(&ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches_prefix(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::utils::commits::all_commits(ctx)?
+            crate::utils::commits::all_commits(&ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches_prefix(s))
                 .for_each(|id| cli_matches.push(id));
@@ -244,19 +245,19 @@ impl CliId {
         } else {
             // For 2-character strings, try exact CliId matching
             let mut cli_matches = Vec::new();
-            crate::status::all_files(ctx)?
+            crate::status::all_files(&mut ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::status::all_committed_files(ctx)?
+            crate::status::all_committed_files(&mut ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::status::all_branches(ctx)?
+            crate::status::all_branches(&ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches(s))
                 .for_each(|id| cli_matches.push(id));
-            crate::utils::commits::all_commits(ctx)?
+            crate::utils::commits::all_commits(&ctx.legacy_ctx()?)?
                 .into_iter()
                 .filter(|id| id.matches(s))
                 .for_each(|id| cli_matches.push(id));