Make stack.head private

Author: krlvi

crates/but-workspace/src/virtual_branches_metadata.rs

@@ -328,34 +328,12 @@ impl RefMetadata for VirtualBranchesTomlMetadata {
             }
             None => {
                 let now_ms = (gix::date::Time::now_utc().seconds * 1000) as u128;
-                let stack = gitbutler_stack::Stack {
-                    id: StackId::default(),
-                    created_timestamp_ms: now_ms,
-                    updated_timestamp_ms: now_ms,
-                    order: self.snapshot.content.branches.len(),
-                    allow_rebasing: true, //  default in V2
-                    in_workspace: ws.contains_ref(ref_name),
-                    heads: vec![branch_to_stack_branch(ref_name, value, false)],
-
-                    // Don't keep redundant information
-                    tree: git2::Oid::zero(),
-                    head: git2::Oid::zero(),
-                    source_refname: None,
-                    upstream: None,
-                    upstream_head: None,
-
-                    // Unused - everything is defined by the top-most branch name.
-                    name: "".to_string(),
-                    notes: "".to_string(),
-
-                    // Related to ownership, obsolete.
-                    selected_for_changes: None,
-                    // unclear, obsolete
-                    not_in_workspace_wip_change_id: None,
-                    // unclear
-                    post_commits: false,
-                    ownership: Default::default(),
-                };
+                let stack = gitbutler_stack::Stack::new_with_just_heads(
+                    vec![branch_to_stack_branch(ref_name, value, false)],
+                    now_ms,
+                    self.snapshot.content.branches.len(),
+                    ws.contains_ref(ref_name),
+                );
                 *value.stack_id.borrow_mut() = Some(stack.id);
                 self.snapshot.content.branches.insert(stack.id, stack);
                 self.snapshot.changed_at = Some(Instant::now());

crates/but-workspace/tests/workspace/commit_engine/refs_update.rs

@@ -1026,7 +1026,7 @@ fn amend_on_top_of_branch_in_workspace() -> anyhow::Result<()> {
 
 mod utils {
     use but_testsupport::visualize_commit_graph;
-    use gitbutler_oxidize::{ObjectIdExt as _, OidExt};
+    use gitbutler_oxidize::OidExt;
     use gitbutler_stack::{CommitOrChangeId, VirtualBranchesState};
     use gix::refs::transaction::PreviousValue;
 
@@ -1051,35 +1051,17 @@ mod utils {
 
     /// We are only interested in the head-related information, the rest is garbage.
     pub fn stack_with_branches(
-        name: &str,
-        tip: gix::ObjectId,
+        _name: &str,
+        _tip: gix::ObjectId,
         branches: impl IntoIterator<Item = (&'static str, gix::ObjectId)>,
         repo: &gix::Repository,
     ) -> gitbutler_stack::Stack {
-        gitbutler_stack::Stack {
-            id: Default::default(),
-            name: name.into(),
-            tree: tip.kind().null().to_git2(),
-            head: tip.to_git2(),
-            heads: branches
-                .into_iter()
-                .map(|(name, target_id)| new_stack_branch(name, target_id, repo))
-                .filter_map(Result::ok)
-                .collect(),
-            notes: String::new(),
-            source_refname: None,
-            upstream: None,
-            upstream_head: None,
-            created_timestamp_ms: 0,
-            updated_timestamp_ms: 0,
-            ownership: Default::default(),
-            order: 0,
-            selected_for_changes: None,
-            allow_rebasing: false,
-            in_workspace: false,
-            not_in_workspace_wip_change_id: None,
-            post_commits: false,
-        }
+        let heads = branches
+            .into_iter()
+            .map(|(name, target_id)| new_stack_branch(name, target_id, repo))
+            .filter_map(Result::ok)
+            .collect();
+        gitbutler_stack::Stack::new_with_just_heads(heads, 0, 0, true)
     }
 
     fn new_stack_branch(

crates/gitbutler-stack/src/stack.rs

@@ -70,7 +70,7 @@ pub struct Stack {
     pub tree: git2::Oid,
     /// head is id of the last "virtual" commit in this branch
     #[serde(with = "gitbutler_serde::oid")]
-    pub head: git2::Oid,
+    head: git2::Oid,
     pub ownership: BranchOwnershipClaims,
     // order is the number by which UI should sort branches
     pub order: usize,
@@ -172,6 +172,42 @@ impl Stack {
         }
     }
 
+    pub fn new_with_just_heads(
+        heads: Vec<StackBranch>,
+        created_ms: u128,
+        order: usize,
+        in_workspace: bool,
+    ) -> Self {
+        Stack {
+            id: StackId::default(),
+            created_timestamp_ms: created_ms,
+            updated_timestamp_ms: created_ms,
+            order,
+            allow_rebasing: true, //  default in V2
+            in_workspace,
+            heads,
+
+            // Don't keep redundant information
+            tree: git2::Oid::zero(),
+            head: git2::Oid::zero(),
+            source_refname: None,
+            upstream: None,
+            upstream_head: None,
+
+            // Unused - everything is defined by the top-most branch name.
+            name: "".to_string(),
+            notes: "".to_string(),
+
+            // Related to ownership, obsolete.
+            selected_for_changes: None,
+            // unclear, obsolete
+            not_in_workspace_wip_change_id: None,
+            // unclear
+            post_commits: false,
+            ownership: Default::default(),
+        }
+    }
+
     pub fn refname(&self) -> anyhow::Result<VirtualRefname> {
         self.try_into()
     }