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

@@ -194,6 +194,9 @@ fn upstream_commits_gix(
             message: commit.message.into(),
             created_at: i128::from(commit.time()?.seconds) * 1000,
             author,
+            change_id: but_core::commit::Headers::try_from_commit(&commit)
+                .and_then(|headers| headers.change_id)
+                .map(|id| id.to_string()),
         });
     }
     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,
         }
     }