address auto-review

Author: Byron

crates/but-workspace/src/branch_details.rs

@@ -2,7 +2,6 @@ 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,
 };
@@ -185,8 +184,10 @@ 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 change_id =
+            but_core::commit::Headers::try_from_commit_headers(|| commit.extra_headers())
+                .and_then(|hdr| hdr.change_id.map(|id| id.to_string()));
         let author: ui::Author = commit.author()?.into();
         let committer: ui::Author = commit.committer()?.into();
         authors.insert(author.clone());

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

@@ -1,5 +1,4 @@
 use bstr::{BString, ByteSlice};
-use gitbutler_commit::commit_ext::CommitExt as _;
 use gix::date::parse::TimeBuf;
 use serde::Serialize;
 
@@ -121,15 +120,20 @@ but_schemars::register_sdk_type!(Commit);
 impl TryFrom<gix::Commit<'_>> for Commit {
     type Error = anyhow::Error;
     fn try_from(commit: gix::Commit<'_>) -> Result<Self, Self::Error> {
+        let commit_id = commit.id;
+        let commit = commit.decode()?;
+        let headers = but_core::commit::Headers::try_from_commit_headers(|| commit.extra_headers());
         Ok(Commit {
-            id: commit.id,
-            parent_ids: commit.parent_ids().map(|id| id.detach()).collect(),
-            message: commit.message_raw_sloppy().into(),
-            has_conflicts: false,
-            state: CommitState::LocalAndRemote(commit.id),
+            id: commit_id,
+            parent_ids: commit.parents().collect(),
+            message: commit.message.to_owned(),
+            has_conflicts: headers.as_ref().is_some_and(|hdr| hdr.is_conflicted()),
+            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()),
+            change_id: headers
+                .and_then(|headers| headers.change_id)
+                .map(|id| id.to_string()),
             gerrit_review_url: None,
         })
     }

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

@@ -567,6 +567,9 @@ 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,
+            // This is a synthetic upstream commit used only to reuse
+            // `Commit::from_upstream_commit()`. Legacy status JSON does not
+            // expose change-ids, so dropping it here is fine.
             change_id: None,
         },
         None,
@@ -584,6 +587,9 @@ pub(super) fn build_workspace_status_json(
                 created_at: upstream.created_at,
                 message: upstream.message.clone().into(),
                 author: upstream_author,
+                // This is a synthetic upstream commit used only to reuse
+                // `Commit::from_upstream_commit()`. Legacy status JSON does not
+                // expose change-ids, so dropping it here is fine.
                 change_id: None,
             },
             None,
@@ -616,6 +622,10 @@ pub(super) fn build_workspace_status_json(
                                     created_at: remote_commit.created_at as i128,
                                     message: remote_commit.description.clone().into(),
                                     author,
+                                    // This is a synthetic upstream commit used
+                                    // only to reuse `Commit::from_upstream_commit()`.
+                                    // Legacy status JSON does not expose
+                                    // change-ids, so dropping it here is fine.
                                     change_id: None,
                                 },
                                 None,