Merge pull request #9605 from Byron/next

V3 for branch creation

Author: Byron

Cargo.lock

@@ -13,22 +13,10 @@ publish = false
 
 [dependencies]
 serde.workspace = true
-futures-util = { version = "0.3", default-features = false, features = [
-    "sink",
-    "std",
-] }
 tokio = { workspace = true, features = ["full"] }
-tokio-util = "0.7.15"
-dirs.workspace = true
-bstr.workspace = true
 anyhow.workspace = true
 serde_json = "1.0.140"
 tracing.workspace = true
-tracing-subscriber = { version = "0.3", features = [
-    "env-filter",
-    "std",
-    "fmt",
-] }
 
 but-settings.workspace = true
 gitbutler-user.workspace = true
@@ -59,10 +47,7 @@ gix = { workspace = true, features = [
 git2.workspace = true
 gitbutler-feedback.workspace = true
 gitbutler-error.workspace = true
-gitbutler-diff.workspace = true
-gitbutler-watcher.workspace = true
 but-rules.workspace = true
-but-action.workspace = true
 reqwest = { version = "0.12", features = ["json"] }
 gitbutler-forge.workspace = true
 open = "5.3"

crates/but-api/Cargo.toml

@@ -58,6 +58,22 @@ impl Workspace {
             .iter()
             .find_map(|stack| stack.branches.iter().find(|b| b.ref_name.as_ref() == name))
     }
+
+    /// Find the `(stack_idx, branch_idx)` of `name` within our stack branches and return it,
+    /// for direct access like `ws.stacks[stack_idx].branches[branch_idx]`.
+    pub fn find_owner_indexes_by_name(
+        &self,
+        name: &gix::refs::FullNameRef,
+    ) -> Option<(usize, usize)> {
+        self.stacks
+            .iter()
+            .enumerate()
+            .find_map(|(stack_idx, stack)| {
+                stack.branches.iter().enumerate().find_map(|(seg_idx, b)| {
+                    (b.ref_name.as_ref() == name).then_some((stack_idx, seg_idx))
+                })
+            })
+    }
 }
 
 /// Metadata about branches, associated with any Git branch.
@@ -120,6 +136,18 @@ pub struct RefInfo {
     pub updated_at: Option<gix::date::Time>,
 }
 
+/// Mutations
+impl RefInfo {
+    /// Set the `updated_at` field to the current time.
+    pub fn set_updated_to_now(&mut self) {
+        self.updated_at = Some(gix::date::Time::now_local_or_utc());
+    }
+    /// Set the `created_at` field to the current time.
+    pub fn set_created_to_now(&mut self) {
+        self.created_at = Some(gix::date::Time::now_local_or_utc());
+    }
+}
+
 impl std::fmt::Debug for RefInfo {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         let format = gix::date::time::format::ISO8601;

crates/but-core/src/ref_metadata.rs

@@ -34,5 +34,4 @@ gix-testtools.workspace = true
 insta = "1.43.1"
 termtree = "0.5.1"
 but-testsupport.workspace = true
-regex = "1.11.1"
 

crates/but-graph/Cargo.toml

@@ -85,6 +85,19 @@ impl Graph {
         })
     }
 
+    /// Return the segment that is named `name`,
+    ///
+    /// Note that tags may or may not be included in the graph, depending on how it was created.
+    ///
+    /// ### Performance
+    ///
+    /// This is a brute-force search through all nodes and all data in the graph - beware of hot-loop usage.
+    pub fn named_segment_by_ref_name(&self, name: &gix::refs::FullNameRef) -> Option<&Segment> {
+        self.inner
+            .node_weights()
+            .find(|s| s.ref_name.as_ref().is_some_and(|rn| rn.as_ref() == name))
+    }
+
     /// Starting a `segment`, ignore all segments that have no commit and return the first commit
     /// of a non-empty segment.
     ///