Merge pull request #13151 from Byron/wire-change-ids

Wire-up RefInfo change-ids in commits to UI (#GB-1165)

Author: Byron

Cargo.lock

@@ -12,6 +12,7 @@
 		"test:ui": "vitest --ui",
 		"build": "vite build",
 		"preview": "vite preview",
+		"package": "svelte-kit sync",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check-cycles": "tsx ../../scripts/check-component-cycles.ts",
 		"check:watch": "pnpm check --watch",

apps/desktop/package.json

@@ -18,6 +18,7 @@ const MOCK_COMMIT_A: Commit = {
 	state: { type: "LocalOnly" },
 	createdAt: BigInt(1672531200000), // Example timestamp
 	author: MOCK_AUTHOR_A,
+	changeId: "Icommit-a-id",
 	gerritReviewUrl: null,
 };
 
@@ -26,6 +27,7 @@ const MOCK_UPSTREAM_COMMIT_A: UpstreamCommit = {
 	message: "Upstream commit message",
 	createdAt: BigInt(1672531200000), // Example timestamp
 	author: MOCK_AUTHOR_A,
+	changeId: null,
 };
 
 const BRANCH_DETAILS_A: BranchDetails = {

apps/desktop/src/lib/testing/mockStackService.ts

@@ -7,6 +7,7 @@
 		"dev": "vite dev --host 0.0.0.0",
 		"build": "vite build",
 		"preview": "vite preview",
+		"package": "svelte-kit sync",
 		"prepare": "svelte-kit sync",
 		"check": "svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch",

apps/web/package.json

@@ -136,13 +136,11 @@ fn default_target_setting_if_none(
 
 fn stacks(ctx: &Context, repo: &gix::Repository) -> anyhow::Result<Vec<StackEntry>> {
     let meta = ctx.legacy_meta()?;
-    let mut cache = ctx.cache.get_cache_mut()?;
     but_workspace::legacy::stacks_v3(
         repo,
         &meta,
         but_workspace::legacy::StacksFilter::InWorkspace,
         None,
-        &mut cache,
     )
 }
 

crates/but-action/src/lib.rs

@@ -88,6 +88,5 @@ pub fn commit(
 fn stacks(ctx: &Context) -> anyhow::Result<Vec<StackEntry>> {
     let repo = ctx.clone_repo_for_merging_non_persisting()?;
     let meta = ctx.legacy_meta()?;
-    let mut cache = ctx.cache.get_cache_mut()?;
-    but_workspace::legacy::stacks_v3(&repo, &meta, StacksFilter::default(), None, &mut cache)
+    but_workspace::legacy::stacks_v3(&repo, &meta, StacksFilter::default(), None)
 }

crates/but-action/src/reword.rs

@@ -55,15 +55,13 @@ mod json {
 pub fn head_info(ctx: &but_ctx::Context) -> Result<but_workspace::RefInfo> {
     let repo = ctx.clone_repo_for_merging_non_persisting()?;
     let meta = ctx.meta()?;
-    let mut cache = ctx.cache.get_cache_mut()?;
     but_workspace::head_info(
         &repo,
         &meta,
         but_workspace::ref_info::Options {
             traversal: but_graph::init::Options::limited(),
             expensive_commit_info: true,
         },
-        &mut cache,
     )
     .map(|info| info.pruned_to_entrypoint())
 }
@@ -84,8 +82,7 @@ pub(crate) fn stacks_v3_from_ctx(
 ) -> anyhow::Result<Vec<but_workspace::legacy::ui::StackEntry>> {
     let repo = ctx.clone_repo_for_merging_non_persisting()?;
     let meta = ctx.meta()?;
-    let mut cache = ctx.cache.get_cache_mut()?;
-    but_workspace::legacy::stacks_v3(&repo, &meta, filter, None, &mut cache)
+    but_workspace::legacy::stacks_v3(&repo, &meta, filter, None)
 }
 
 #[cfg(unix)]
@@ -185,8 +182,7 @@ pub fn stack_details(
     let mut details = {
         let repo = ctx.clone_repo_for_merging_non_persisting()?;
         let meta = ctx.meta()?;
-        let mut cache = ctx.cache.get_cache_mut()?;
-        but_workspace::legacy::stack_details_v3(stack_id, &repo, &meta, &mut cache)
+        but_workspace::legacy::stack_details_v3(stack_id, &repo, &meta)
     }?;
     let repo = ctx.repo.get()?;
     let gerrit_mode = repo.git_settings()?.gitbutler_gerrit_mode.unwrap_or(false);

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

@@ -59,8 +59,7 @@ pub fn cherry_apply_status(
         .with_object_memory();
 
     let meta = ctx.legacy_meta()?;
-    let mut cache = ctx.cache.get_cache_mut()?;
-    let stacks = stacks_v3(&repo, &meta, StacksFilter::InWorkspace, None, &mut cache)?;
+    let stacks = stacks_v3(&repo, &meta, StacksFilter::InWorkspace, None)?;
 
     if stacks.is_empty() {
         return Ok(CherryApplyStatus::NoStacks);

crates/but-cherry-apply/src/lib.rs

@@ -47,8 +47,7 @@ fn can_apply_to_foo_stack() -> anyhow::Result<()> {
             .join("virtual_branches.toml"),
     )?;
     let repo = test_ctx.ctx.repo.get()?;
-    let mut cache = test_ctx.ctx.cache.get_cache_mut()?;
-    let details = stack_details_v3(Some(foo_id), &repo, &meta, &mut cache)?;
+    let details = stack_details_v3(Some(foo_id), &repo, &meta)?;
 
     let has_commit = details
         .branch_details
@@ -98,8 +97,7 @@ fn can_apply_to_bar_stack() -> anyhow::Result<()> {
             .join("virtual_branches.toml"),
     )?;
     let repo = test_ctx.ctx.repo.get()?;
-    let mut cache = test_ctx.ctx.cache.get_cache_mut()?;
-    let details = stack_details_v3(Some(bar_id), &repo, &meta, &mut cache)?;
+    let details = stack_details_v3(Some(bar_id), &repo, &meta)?;
 
     let has_commit = details
         .branch_details

crates/but-cherry-apply/tests/cherry_apply/clean_to_both.rs

@@ -55,8 +55,7 @@ fn can_only_apply_to_bar_stack() -> anyhow::Result<()> {
             .join("virtual_branches.toml"),
     )?;
     let repo = test_ctx.ctx.repo.get()?;
-    let mut cache = test_ctx.ctx.cache.get_cache_mut()?;
-    let details = stack_details_v3(Some(bar_id), &repo, &meta, &mut cache)?;
+    let details = stack_details_v3(Some(bar_id), &repo, &meta)?;
 
     let has_commit = details
         .branch_details