refactor - cleanup UI types in but-workspace a bit

Author: Byron

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

@@ -28,7 +28,7 @@ fn ref_metadata_toml(project: &Project) -> anyhow::Result<VirtualBranchesTomlMet
 #[api_cmd]
 #[tauri::command(async)]
 #[instrument(err(Debug))]
-pub fn head_info(project_id: ProjectId) -> Result<but_workspace::ref_info::ui::RefInfo, Error> {
+pub fn head_info(project_id: ProjectId) -> Result<but_workspace::ui::ref_info::RefInfo, Error> {
     let project = gitbutler_project::get(project_id)?;
     let ctx = CommandContext::open(&project, AppSettings::load_from_default_path_creating()?)?;
     let repo = ctx.gix_repo_for_merging_non_persisting()?;
@@ -42,7 +42,7 @@ pub fn head_info(project_id: ProjectId) -> Result<but_workspace::ref_info::ui::R
         },
     )
     .map_err(Into::into)
-    .and_then(|info| but_workspace::ref_info::ui::RefInfo::for_ui(info, &repo).map_err(Into::into))
+    .and_then(|info| but_workspace::ui::ref_info::RefInfo::for_ui(info, &repo).map_err(Into::into))
 }
 
 #[api_cmd]

crates/but-workspace/src/changeset.rs

@@ -6,11 +6,10 @@
 
 use crate::{
     RefInfo,
-    ref_info::{
-        ui,
-        ui::{LocalCommit, LocalCommitRelation},
+    ui::{
+        PushStatus,
+        ref_info::{LocalCommit, LocalCommitRelation},
     },
-    ui::PushStatus,
 };
 use bstr::{BStr, BString, ByteSlice, ByteVec};
 use but_core::{ChangeState, commit::TreeKind};
@@ -94,7 +93,7 @@ impl RefInfo {
             repo,
             upstream_commits.iter().filter_map(|id| {
                 but_core::Commit::from_id(id.attach(repo))
-                    .map(ui::Commit::from)
+                    .map(crate::ui::ref_info::Commit::from)
                     .ok()
             }),
             cost_info,
@@ -262,7 +261,7 @@ impl PushStatus {
 
 fn changeset_identifier(
     repo: &gix::Repository,
-    commit: Option<&ui::Commit>,
+    commit: Option<&crate::ui::ref_info::Commit>,
     elapsed: &mut Duration,
 ) -> anyhow::Result<Option<Identifier>> {
     let Some(commit) = commit else {
@@ -296,7 +295,7 @@ enum ChangeId {
 
 fn lookup_similar<'a>(
     map: &'a Identity,
-    commit: &ui::Commit,
+    commit: &crate::ui::ref_info::Commit,
     expensive: Option<&Identifier>,
     change_id: ChangeId,
 ) -> Option<&'a gix::ObjectId> {
@@ -312,7 +311,7 @@ fn lookup_similar<'a>(
 /// Returns the fully-loaded commits suitable to be passed to UI, to have better re-use.
 fn create_similarity_lut(
     repo: &gix::Repository,
-    commits: impl Iterator<Item = impl Borrow<ui::Commit>>,
+    commits: impl Iterator<Item = impl Borrow<crate::ui::ref_info::Commit>>,
     (max_commits, num_tracked_files): (usize, usize),
     expensive: bool,
 ) -> anyhow::Result<Identity> {
@@ -633,7 +632,7 @@ enum Identifier {
     ChangesetId(ChangesetID),
 }
 
-fn commit_data_id(c: &ui::Commit) -> anyhow::Result<Identifier> {
+fn commit_data_id(c: &crate::ui::ref_info::Commit) -> anyhow::Result<Identifier> {
     let mut hasher = gix::hash::hasher(gix::hash::Kind::Sha1);
 
     let gix::actor::Signature {

crates/but-workspace/src/lib.rs

@@ -222,7 +222,7 @@ pub struct RefInfo {
 pub struct AncestorWorkspaceCommit {
     /// The commits along the first parent that are between the managed workspace reference and the managed workspace commit.
     /// The vec is never empty.
-    pub commits_outside: Vec<ref_info::ui::Commit>,
+    pub commits_outside: Vec<ui::ref_info::Commit>,
     /// The index of the segment that actually holds the managed workspace commit.
     pub segment_with_managed_commit: SegmentIndex,
     /// The index of the workspace commit within the `commits` array in its parent segment.