Merge pull request #9408 from Byron/graph-segmentation

integration-checks

Author: Byron

Cargo.lock

@@ -5,8 +5,7 @@ resolver = "2"
 [workspace.dependencies]
 bstr = "1.11.1"
 # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
-gix = { git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", version = "0.72.1", default-features = false, features = [
-] }
+gix = { version = "0.73.0", default-features = false, features = [] }
 gix-testtools = "0.16.1"
 insta = "1.43.1"
 git2 = { version = "0.20.0", features = [

Cargo.toml

@@ -4,6 +4,7 @@ use crate::{ModeFlags, TreeChange};
 use gix::diff::tree_with_rewrites::Change;
 use gix::prelude::TreeDiffChangeExt;
 
+// TODO: use `peel_to_tree()` once special conflict markers aren't needed anymore.
 fn id_to_tree(repo: &gix::Repository, id: gix::ObjectId) -> anyhow::Result<gix::Tree<'_>> {
     let object = repo.find_object(id)?;
     if object.kind == gix::object::Kind::Commit {

crates/but-core/src/diff/tree_changes.rs

@@ -69,11 +69,11 @@ pub mod settings;
 pub use settings::git::types::GitConfigSettings;
 
 mod repo_ext;
-use crate::ref_metadata::ValueInfo;
 pub use repo_ext::RepositoryExt;
 
 /// Various types
 pub mod ref_metadata;
+use crate::ref_metadata::ValueInfo;
 
 /// A trait to associate arbitrary metadata with any *Git reference name*.
 /// Note that a single reference name can have multiple distinct pieces of metadata associated with it.

crates/but-core/src/lib.rs

@@ -71,11 +71,27 @@ pub struct Branch {
 
 impl std::fmt::Debug for Branch {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_struct("Branch")
-            .field("ref_info", &self.ref_info)
-            .field("description", &MaybeDebug(&self.description))
-            .field("review", &self.review)
-            .finish()
+        const DEFAULT_IN_TESTSUITE: gix::date::Time = gix::date::Time {
+            seconds: 0,
+            offset: 0,
+        };
+        let mut d = f.debug_struct("Branch");
+        if self
+            .ref_info
+            .created_at
+            .is_some_and(|t| t != DEFAULT_IN_TESTSUITE)
+            || self
+                .ref_info
+                .updated_at
+                .is_some_and(|t| t != DEFAULT_IN_TESTSUITE)
+            || self.description.is_some()
+            || self.review.pull_request.is_some()
+        {
+            d.field("ref_info", &self.ref_info)
+                .field("description", &MaybeDebug(&self.description))
+                .field("review", &self.review);
+        }
+        d.finish()
     }
 }
 

crates/but-core/src/ref_metadata.rs

@@ -39,7 +39,7 @@ pub struct Workspace<'graph> {
     ///
     /// It is `None` there is only a single stack and no target, so nothing was integrated.
     pub lower_bound: Option<gix::ObjectId>,
-    /// If `base` is set, this is the segment owning the commit.
+    /// If `lower_bound` is set, this is the segment owning the commit.
     pub lower_bound_segment_id: Option<SegmentIndex>,
     /// The target to integrate workspace stacks into.
     ///

crates/but-graph/src/projection/workspace.rs

@@ -205,11 +205,6 @@ pub enum Subcommands {
         #[clap(long, short = 'd')]
         description: Option<String>,
     },
-    /// Returns all commits for the branch with the given `name` in the stack with the given `id`.
-    StackBranchCommits {
-        id: StackId,
-        name: String,
-    },
 }
 
 #[cfg(test)]

crates/but-testing/src/args.rs

@@ -173,10 +173,7 @@ pub mod stacks {
     use crate::command::{debug_print, project_from_path, ref_metadata_toml};
     use anyhow::Context;
     use but_settings::AppSettings;
-    use but_workspace::{
-        StacksFilter, stack_branch_local_and_remote_commits, stack_branch_upstream_only_commits,
-        stack_branches, ui,
-    };
+    use but_workspace::{StacksFilter, stack_branches, ui};
     use gitbutler_command_context::CommandContext;
     use gitbutler_stack::StackId;
     use gix::bstr::ByteSlice;
@@ -383,34 +380,6 @@ pub mod stacks {
             debug_print(stack_entry)
         }
     }
-
-    pub fn branch_commits(
-        id: StackId,
-        name: &str,
-        current_dir: &Path,
-        use_json: bool,
-    ) -> anyhow::Result<()> {
-        let project = project_from_path(current_dir)?;
-        let ctx = CommandContext::open(&project, AppSettings::default())?;
-        let repo = ctx.gix_repo()?;
-        let local_and_remote =
-            stack_branch_local_and_remote_commits(id, name.to_string(), &ctx, &repo);
-        let upstream_only = stack_branch_upstream_only_commits(id, name.to_string(), &ctx, &repo);
-
-        if use_json {
-            let branch_commits = BranchCommits {
-                local_and_remote: local_and_remote?,
-                upstream_commits: upstream_only?,
-            };
-
-            let json = serde_json::to_string_pretty(&branch_commits)?;
-            println!("{json}");
-            Ok(())
-        } else {
-            debug_print(local_and_remote)?;
-            debug_print(upstream_only)
-        }
-    }
 }
 
 pub(crate) mod discard_change {

crates/but-testing/src/command/mod.rs

@@ -174,9 +174,6 @@ async fn main() -> Result<()> {
                 )
             }
         },
-        args::Subcommands::StackBranchCommits { id, name } => {
-            command::stacks::branch_commits(*id, name, &args.current_dir, args.json)
-        }
     }
 }