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

This makes the change-ids usable.
Note that they won't be stable unless the rebase engine uses the
ones in the cache instead of persisting.

Co-authored-by: Sebastian Thiel <sebastian.thiel@icloud.com>

Author: codex

crates/but-workspace/src/branch_details.rs

@@ -2,6 +2,7 @@ use std::collections::HashSet;
 
 use anyhow::Context as _;
 use but_core::RefMetadata;
+use gitbutler_commit::commit_ext::CommitExt as _;
 use gix::{
     date::parse::TimeBuf, prelude::ObjectIdExt as _, reference::Category, remote::Direction,
 };
@@ -184,6 +185,7 @@ fn upstream_commits_gix(
     for info in traversal {
         let info = info?;
         let commit = info.id().object()?.into_commit();
+        let change_id = commit.change_id().map(|id| id.to_string());
         let commit = commit.decode()?;
         let author: ui::Author = commit.author()?.into();
         let committer: ui::Author = commit.committer()?.into();
@@ -194,6 +196,7 @@ fn upstream_commits_gix(
             message: commit.message.into(),
             created_at: i128::from(commit.time()?.seconds) * 1000,
             author,
+            change_id,
         });
     }
     Ok(out)
@@ -230,6 +233,10 @@ fn local_commits_gix(
             state: CommitState::LocalAndRemote(info.id),
             created_at: i128::from(commit.committer.time.seconds) * 1000,
             author,
+            change_id: commit
+                .headers()
+                .and_then(|headers| headers.change_id)
+                .map(|id| id.to_string()),
             gerrit_review_url: None,
         });
     }

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

@@ -632,6 +632,7 @@ pub fn local_and_remote_commits(
             state,
             created_at,
             author: gix_commit.author()?.into(),
+            change_id: change_id.map(|id| id.to_string()),
             gerrit_review_url: None,
         };
         local_and_remote.push(api_commit);

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

@@ -1,4 +1,5 @@
 use bstr::{BString, ByteSlice};
+use gitbutler_commit::commit_ext::CommitExt as _;
 use gix::date::parse::TimeBuf;
 use serde::Serialize;
 
@@ -108,6 +109,8 @@ pub struct Commit {
     pub created_at: i128,
     /// The author of the commit.
     pub author: Author,
+    /// The GitButler change-id associated with this commit, if available.
+    pub change_id: Option<String>,
     /// Optional URL to the Gerrit review for this commit, if applicable.
     /// Only populated if Gerrit mode is enabled and the commit has an associated review.
     pub gerrit_review_url: Option<String>,
@@ -126,6 +129,7 @@ impl TryFrom<gix::Commit<'_>> for Commit {
             state: CommitState::LocalAndRemote(commit.id),
             created_at: i128::from(commit.time()?.seconds) * 1000,
             author: commit.author()?.into(),
+            change_id: commit.change_id().map(|id| id.to_string()),
             gerrit_review_url: None,
         })
     }
@@ -134,6 +138,10 @@ impl TryFrom<gix::Commit<'_>> for Commit {
 impl From<but_core::CommitOwned> for Commit {
     fn from(CommitOwned { id, inner }: CommitOwned) -> Self {
         let headers = commit::Headers::try_from_commit(&inner);
+        let has_conflicts = headers.as_ref().is_some_and(|hdr| hdr.is_conflicted());
+        let change_id = headers
+            .and_then(|hdr| hdr.change_id)
+            .map(|id| id.to_string());
         let gix::objs::Commit {
             tree: _,
             parents,
@@ -147,10 +155,11 @@ impl From<but_core::CommitOwned> for Commit {
             id,
             parent_ids: parents.into_iter().collect(),
             message,
-            has_conflicts: headers.is_some_and(|hdr| hdr.is_conflicted()),
+            has_conflicts,
             state: CommitState::LocalAndRemote(id),
             created_at: committer.time.seconds as i128 * 1000,
             author: author.to_ref(&mut TimeBuf::default()).into(),
+            change_id,
             gerrit_review_url: None,
         }
     }
@@ -196,6 +205,8 @@ pub struct UpstreamCommit {
     pub created_at: i128,
     /// The author of the commit.
     pub author: Author,
+    /// The GitButler change-id associated with this commit, if available.
+    pub change_id: Option<String>,
 }
 #[cfg(feature = "export-schema")]
 but_schemars::register_sdk_type!(UpstreamCommit);
@@ -379,7 +390,7 @@ impl From<&crate::ref_info::Commit> for ui::UpstreamCommit {
             flags: _,
             // TODO: Represent this in the UI (maybe) and/or deal with divergence of the local and remote tracking branch.
             has_conflicts: _,
-            change_id: _,
+            change_id,
         }: &crate::ref_info::Commit,
     ) -> Self {
         ui::UpstreamCommit {
@@ -389,6 +400,7 @@ impl From<&crate::ref_info::Commit> for ui::UpstreamCommit {
             author: author
                 .to_ref(&mut gix::date::parse::TimeBuf::default())
                 .into(),
+            change_id: change_id.as_ref().map(ToString::to_string),
         }
     }
 }
@@ -408,7 +420,7 @@ impl From<&LocalCommit> for ui::Commit {
                     // TODO: also flags refs
                     flags: _,
                     has_conflicts,
-                    change_id: _,
+                    change_id,
                 },
             relation,
         }: &LocalCommit,
@@ -423,6 +435,7 @@ impl From<&LocalCommit> for ui::Commit {
             author: author
                 .to_ref(&mut gix::date::parse::TimeBuf::default())
                 .into(),
+            change_id: change_id.as_ref().map(ToString::to_string),
             gerrit_review_url: None,
         }
     }

crates/but-workspace/tests/workspace/ui.rs

@@ -1,6 +1,8 @@
 mod changes_in_branch {
     use but_graph::init::Options;
-    use but_testsupport::visualize_commit_graph_all;
+    use but_testsupport::{
+        seed_cache_with_stable_change_ids_for_all_commits, visualize_commit_graph_all,
+    };
     use but_workspace::ui;
 
     use crate::{ref_info::with_workspace_commit::utils::read_only_in_memory_scenario, utils::r};
@@ -139,6 +141,7 @@ mod changes_in_branch {
 
         let mut ref_info: ui::RefInfo = {
             let mut cache = crate::ref_info::in_memory_cache();
+            seed_cache_with_stable_change_ids_for_all_commits(&repo, &mut cache)?;
             but_workspace::head_info(&repo, &*meta, Default::default(), &mut cache)?.try_into()?
         };
         ref_info = ref_info.pruned_to_entrypoint();
@@ -247,6 +250,7 @@ mod changes_in_branch {
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
                       },
+                      "changeId": "msqoopqtzoyyxmomxumvuqxynvsllmpx",
                       "gerritReviewUrl": null
                     }
                   ],
@@ -259,7 +263,8 @@ mod changes_in_branch {
                         "name": "author",
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
-                      }
+                      },
+                      "changeId": "rqnnxmwzwuyvtuvlqnpoxmzuoqpkzrov"
                     }
                   ],
                   "commitsOutside": null,
@@ -430,6 +435,7 @@ mod changes_in_branch {
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
                       },
+                      "changeId": "msqoopqtzoyyxmomxumvuqxynvsllmpx",
                       "gerritReviewUrl": null
                     }
                   ],
@@ -442,7 +448,8 @@ mod changes_in_branch {
                         "name": "author",
                         "email": "author@example.com",
                         "gravatarUrl": "https://www.gravatar.com/avatar/5c1e6d6e64e12aca17657581a48005d1?s=100&r=g&d=retro"
-                      }
+                      },
+                      "changeId": "rqnnxmwzwuyvtuvlqnpoxmzuoqpkzrov"
                     }
                   ],
                   "commitsOutside": null,

crates/but/src/command/legacy/status/json.rs

@@ -567,6 +567,7 @@ pub(super) fn build_workspace_status_json(
             created_at: status_ctx.common_merge_base_data.created_at,
             message: status_ctx.common_merge_base_data.message.clone().into(),
             author,
+            change_id: None,
         },
         None,
     );
@@ -583,6 +584,7 @@ pub(super) fn build_workspace_status_json(
                 created_at: upstream.created_at,
                 message: upstream.message.clone().into(),
                 author: upstream_author,
+                change_id: None,
             },
             None,
         );
@@ -614,6 +616,7 @@ pub(super) fn build_workspace_status_json(
                                     created_at: remote_commit.created_at as i128,
                                     message: remote_commit.description.clone().into(),
                                     author,
+                                    change_id: None,
                                 },
                                 None,
                             ))