Amending rule now uses change ID

Fix a thing

Author: krlvi

Cargo.lock

@@ -63,9 +63,9 @@ pub fn process_workspace_rules(
                         handle_assign(ctx, assignments, dependencies.as_ref()).unwrap_or_default();
                 }
             }
-            super::Action::Explicit(super::Operation::Amend { commit_id }) => {
+            super::Action::Explicit(super::Operation::Amend { change_id }) => {
                 let assignments = matching(assignments, rule.filters.clone());
-                handle_amend(ctx, assignments, commit_id).unwrap_or_default();
+                handle_amend(ctx, assignments, change_id).unwrap_or_default();
             }
             _ => continue,
         };
@@ -147,18 +147,46 @@ fn handle_assign(
 fn handle_amend(
     ctx: &mut CommandContext,
     assignments: Vec<HunkAssignment>,
-    commit_id: String,
+    change_id: String,
 ) -> anyhow::Result<()> {
     let changes: Vec<DiffSpec> = assignments.into_iter().map(|a| a.into()).collect();
     let project = ctx.project();
     let mut guard = project.exclusive_worktree_access();
     let repo = but_core::open_repo_for_merging(project.worktree_path())?;
+
+    let meta = VirtualBranchesTomlMetadata::from_path(
+        ctx.project().gb_dir().join("virtual_branches.toml"),
+    )?;
+    let ref_info_options = but_workspace::ref_info::Options {
+        expensive_commit_info: true,
+        traversal: meta.graph_options(),
+    };
+    let info = but_workspace::head_info(&repo, &meta, ref_info_options)?;
+    let mut commit_id: Option<gix::ObjectId> = None;
+    'outer: for stack in info.stacks {
+        for segment in stack.segments {
+            for commit in segment.commits {
+                if Some(change_id.clone()) == commit.change_id.map(|c| c.to_string()) {
+                    commit_id = Some(commit.id);
+                    break 'outer;
+                }
+            }
+        }
+    }
+
+    let commit_id = commit_id.ok_or_else(|| {
+        anyhow::anyhow!(
+            "No commit with Change-Id {} found in the current workspace",
+            change_id
+        )
+    })?;
+
     commit_engine::create_commit_and_update_refs_with_project(
         &repo,
         project,
         None,
         commit_engine::Destination::AmendCommit {
-            commit_id: gix::ObjectId::from_str(&commit_id)?,
+            commit_id,
             // TODO: Expose this in the UI for 'edit message' functionality.
             new_message: None,
         },

crates/but-rules/src/handler.rs

@@ -47,8 +47,8 @@ impl WorkspaceRule {
     }
 
     pub fn target_commit_id(&self) -> Option<String> {
-        if let Action::Explicit(Operation::Amend { commit_id }) = &self.action {
-            Some(commit_id.clone())
+        if let Action::Explicit(Operation::Amend { change_id }) = &self.action {
+            Some(change_id.clone())
         } else {
             None
         }
@@ -147,7 +147,7 @@ pub enum Operation {
     /// Assign the matched changes to a specific stack ID.
     Assign { target: StackTarget },
     /// Amend the matched changes into a specific commit.
-    Amend { commit_id: String },
+    Amend { change_id: String },
     /// Create a new commit with the matched changes on a specific branch.
     NewCommit { branch_name: String },
 }

crates/but-rules/src/lib.rs

@@ -47,6 +47,7 @@ but-rules.workspace = true
 gitbutler-command-context.workspace = true
 gitbutler-serde.workspace = true
 gitbutler-stack.workspace = true
+gitbutler-commit.workspace = true
 gitbutler-branch-actions.workspace = true
 gitbutler-branch.workspace = true
 gitbutler-reference.workspace = true

crates/but/Cargo.toml

@@ -22,11 +22,11 @@ pub(crate) fn commit_graph(repo_path: &Path, json: bool, short: bool) -> anyhow:
         .collect::<Vec<_>>();
 
     if json {
-        return output_json(stacks);
+        return output_json(stacks.iter().map(|(_, d)| d).cloned().collect());
     }
 
     if short {
-        return commit_graph_short(stacks);
+        return commit_graph_short(stacks.iter().map(|(_, d)| d).cloned().collect());
     }
 
     let mut nesting = 0;

crates/but/src/log/mod.rs

@@ -1,11 +1,12 @@
-use std::path::Path;
+use std::{path::Path, str::FromStr};
 
 use crate::rub::branch_name_to_stack_id;
 use anyhow::bail;
 use but_rules::Operation;
 use but_settings::AppSettings;
 use but_workspace::StackId;
 use gitbutler_command_context::CommandContext;
+use gitbutler_commit::commit_ext::CommitExt;
 use gitbutler_project::Project;
 pub(crate) fn handle(
     repo_path: &Path,
@@ -45,9 +46,12 @@ fn mark_commit(ctx: &mut CommandContext, oid: gix::ObjectId, delete: bool) -> an
         println!("Mark was removed");
         return Ok(());
     }
-    let action = but_rules::Action::Explicit(Operation::Amend {
-        commit_id: oid.to_string(),
-    });
+    let repo = ctx.gix_repo()?;
+    let commit = repo.find_commit(oid)?;
+    let change_id = commit.change_id().ok_or_else(|| {
+        anyhow::anyhow!("Commit {} does not have a Change-Id, cannot mark it", oid)
+    })?;
+    let action = but_rules::Action::Explicit(Operation::Amend { change_id });
     let req = but_rules::CreateRuleRequest {
         trigger: but_rules::Trigger::FileSytemChange,
         filters: vec![but_rules::Filter::PathMatchesRegex(regex::Regex::new(
@@ -97,8 +101,16 @@ pub(crate) fn stack_marked(ctx: &mut CommandContext, stack_id: StackId) -> anyho
 }
 
 pub(crate) fn commit_marked(ctx: &mut CommandContext, commit_id: String) -> anyhow::Result<bool> {
+    let repo = ctx.gix_repo()?;
+    let commit = repo.find_commit(gix::ObjectId::from_str(&commit_id)?)?;
+    let change_id = commit.change_id().ok_or_else(|| {
+        anyhow::anyhow!(
+            "Commit {} does not have a Change-Id, cannot mark it",
+            commit_id
+        )
+    })?;
     let rules = but_rules::list_rules(ctx)?
         .iter()
-        .any(|r| r.target_commit_id() == Some(commit_id.clone()));
+        .any(|r| r.target_commit_id() == Some(change_id.clone()));
     Ok(rules)
 }