UI passes the name of the stack segment ref-name when creating new commits.

Author: Byron

Cargo.lock

@@ -69,6 +69,7 @@
 			stackId,
 			parentId,
 			message: message,
+			stackSegmentShortName: "top",
 			worktreeChanges: selection.map((item) =>
 				item.type === 'full'
 					? {

apps/desktop/src/components/v3/NewCommit.svelte

@@ -14,6 +14,7 @@ type CreateCommitRequest = {
 	stackId: string;
 	message: string;
 	parentId: string;
+	stackSegmentShortName: string,
 	worktreeChanges: {
 		previousPathBytes?: number[];
 		pathBytes: number[];

apps/desktop/src/lib/stacks/stackService.svelte.ts

@@ -18,9 +18,7 @@ testing = ["dep:gitbutler-commit"]
 gitbutler-command-context.workspace = true
 gitbutler-project.workspace = true
 but-settings.workspace = true
-gitbutler-stack.workspace = true
 but-core.workspace = true
-gitbutler-oxidize.workspace = true
 but-workspace.workspace = true
 but-hunk-dependency.workspace = true
 

crates/but-cli/Cargo.toml

@@ -31,6 +31,11 @@ pub enum Subcommands {
         /// The message of the new commit.
         #[clap(long, short = 'm')]
         message: Option<String>,
+        /// The name of the reference that the commit should be in.
+        ///
+        /// If there is ambiguity, this is what makes it ambiguous.
+        #[clap(long, short = 's')]
+        stack_segment_ref: Option<String>,
         /// Amend to the current or given commit.
         #[clap(long)]
         amend: bool,

crates/but-cli/src/args.rs

@@ -10,6 +10,7 @@ pub fn commit(
     message: Option<&str>,
     amend: bool,
     parent_revspec: Option<&str>,
+    stack_segment_ref: Option<&str>,
 ) -> anyhow::Result<()> {
     if message.is_none() && !amend {
         bail!("Need a message when creating a new commit");
@@ -31,6 +32,7 @@ pub fn commit(
                 but_workspace::commit_engine::Destination::NewCommit {
                     parent_commit_id: Some(parent_id),
                     message: message.unwrap_or_default().to_owned(),
+                    stack_segment_ref: stack_segment_ref.map(|rn| rn.try_into()).transpose()?,
                 }
             },
             None,

crates/but-cli/src/command/commit.rs

@@ -20,9 +20,17 @@ fn main() -> Result<()> {
             message,
             amend,
             parent,
+            stack_segment_ref,
         } => {
             let (repo, project) = repo_and_maybe_project(&args, RepositoryOpenMode::Merge)?;
-            command::commit(repo, project, message.as_deref(), *amend, parent.as_deref())
+            command::commit(
+                repo,
+                project,
+                message.as_deref(),
+                *amend,
+                parent.as_deref(),
+                stack_segment_ref.as_deref(),
+            )
         }
         args::Subcommands::HunkDependency => command::diff::locks(&args.current_dir),
         args::Subcommands::Status { unified_diff } => {

crates/but-cli/src/main.rs

@@ -87,8 +87,11 @@ pub fn hunk_dependencies_for_workspace_changes(
 /// All `changes` are meant to be relative to the worktree.
 /// Note that submodules *must* be provided as diffspec without hunks, as attempting to generate
 /// hunks would fail.
+/// `stack_segment_short_name` is the short name of the reference that the UI knows is present in a given segment.
+/// It is needed to insert the new commit into the right bucket.
 #[tauri::command(async)]
 #[instrument(skip(projects, settings), err(Debug))]
+#[allow(clippy::too_many_arguments)]
 pub fn create_commit_from_worktree_changes(
     projects: State<'_, projects::Controller>,
     settings: State<'_, AppSettingsWithDiskSync>,
@@ -97,6 +100,7 @@ pub fn create_commit_from_worktree_changes(
     parent_id: Option<HexHash>,
     worktree_changes: Vec<commit_engine::ui::DiffSpec>,
     message: String,
+    stack_segment_short_name: String,
 ) -> Result<commit_engine::ui::CreateCommitOutcome, Error> {
     let project = projects.get(project_id)?;
     let repo = but_core::open_repo_for_merging(&project.worktree_path())?;
@@ -106,6 +110,11 @@ pub fn create_commit_from_worktree_changes(
         commit_engine::Destination::NewCommit {
             parent_commit_id: parent_id.map(Into::into),
             message,
+            stack_segment_ref: Some(
+                format!("refs/heads/{stack_segment_short_name}")
+                    .try_into()
+                    .map_err(anyhow::Error::from)?,
+            ),
         },
         None,
         worktree_changes.into_iter().map(Into::into).collect(),