refactor: remove hunk_locks field from HunkAssignment and all usages

Kiril Videlov · Kiril Videlov · commit ae0e8b3b4f64 · 2026-03-25T18:54:42.000-07:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/but-hunk-assignment/src/lib.rs b/crates/but-hunk-assignment/src/lib.rs
@@ -18,7 +18,7 @@ use anyhow::Result;
 use bstr::{BString, ByteSlice};
 use but_core::{DiffSpec, HunkHeader, TreeChange, UnifiedPatch, ref_metadata::StackId};
 use but_db::{HunkAssignmentsHandle, HunkAssignmentsHandleMut};
-use but_hunk_dependency::ui::{HunkDependencies, HunkLock};
+use but_hunk_dependency::ui::HunkDependencies;
 use gix::ObjectId;
 use reconcile::MultipleOverlapping;
 use serde::{Deserialize, Serialize};
@@ -59,10 +59,6 @@ pub struct HunkAssignment {
         schemars(schema_with = "but_schemars::stack_id_opt")
     )]
     pub stack_id: Option<StackId>,
-    /// The dependencies(locks) that this hunk has. This determines where the hunk can be assigned.
-    /// This field is ignored when HunkAssignment is passed by the UI to create a new assignment.
-    #[serde(skip)]
-    pub hunk_locks: Option<Vec<HunkLock>>,
     /// The line numbers that were added in this hunk.
     pub line_nums_added: Option<Vec<usize>>,
     /// The line numbers that were removed in this hunk.
@@ -98,7 +94,6 @@ impl TryFrom<but_db::HunkAssignment> for HunkAssignment {
             path: value.path,
             path_bytes: value.path_bytes.into(),
             stack_id,
-            hunk_locks: None,
             line_nums_added: None,   // derived data (not persisted)
             line_nums_removed: None, // derived data (not persisted)
             diff: None,              // derived data (not persisted)
@@ -518,7 +513,6 @@ fn diff_to_assignments(diff: Option<UnifiedPatch>, path: BString) -> Vec<HunkAss
                 path: path_str.into(),
                 path_bytes: path,
                 stack_id: None,
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
@@ -529,7 +523,6 @@ fn diff_to_assignments(diff: Option<UnifiedPatch>, path: BString) -> Vec<HunkAss
                 path: path_str.into(),
                 path_bytes: path,
                 stack_id: None,
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
@@ -547,7 +540,6 @@ fn diff_to_assignments(diff: Option<UnifiedPatch>, path: BString) -> Vec<HunkAss
                         path: path_str.into(),
                         path_bytes: path,
                         stack_id: None,
-                        hunk_locks: None,
                         line_nums_added: None,
                         line_nums_removed: None,
                         diff: None,
@@ -564,7 +556,6 @@ fn diff_to_assignments(diff: Option<UnifiedPatch>, path: BString) -> Vec<HunkAss
                                 path: path_str.clone().into(),
                                 path_bytes: path.clone(),
                                 stack_id: None,
-                                hunk_locks: None,
                                 line_nums_added: Some(line_nums_added_new),
                                 line_nums_removed: Some(line_nums_removed_old),
                                 diff: Some(hunk.diff.clone()),
@@ -581,7 +572,6 @@ fn diff_to_assignments(diff: Option<UnifiedPatch>, path: BString) -> Vec<HunkAss
             path: path_str.into(),
             path_bytes: path.clone(),
             stack_id: None,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -641,7 +631,6 @@ fn requests_to_assignments(request: Vec<HunkAssignmentRequest>) -> Vec<HunkAssig
             path: req.path_bytes.to_str_lossy().into(),
             path_bytes: req.path_bytes,
             stack_id: req.stack_id,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -751,7 +740,6 @@ mod tests {
                 path: path.to_string(),
                 path_bytes: BString::from(path),
                 stack_id: stack_id.map(stack_id_seq),
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
@@ -794,7 +782,6 @@ mod tests {
             && a.path == b.path
             && a.path_bytes == b.path_bytes
             && a.stack_id == b.stack_id
-            && a.hunk_locks == b.hunk_locks
     }
     fn assert_eq(a: Vec<HunkAssignment>, b: Vec<HunkAssignment>) {
         assert!(
@@ -963,7 +950,6 @@ mod tests {
             path: "image.png".to_string(),
             path_bytes: BString::from("image.png"),
             stack_id: Some(stack_id_seq(1)),
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -975,7 +961,6 @@ mod tests {
             path: "image.png".to_string(),
             path_bytes: BString::from("image.png"),
             stack_id: None,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -1002,7 +987,6 @@ mod tests {
             path: "file.txt".to_string(),
             path_bytes: BString::from("file.txt"),
             stack_id: None,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -1027,7 +1011,6 @@ mod tests {
             path: "image1.png".to_string(),
             path_bytes: BString::from("image1.png"),
             stack_id: Some(stack_id_seq(1)),
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -1039,7 +1022,6 @@ mod tests {
             path: "image2.png".to_string(),
             path_bytes: BString::from("image2.png"),
             stack_id: None,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
@@ -1064,7 +1046,6 @@ mod tests {
                 path: "logo.png".to_string(),
                 path_bytes: BString::from("logo.png"),
                 stack_id: Some(stack_id_seq(1)),
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
@@ -1081,7 +1062,6 @@ mod tests {
                 path: "logo.png".to_string(),
                 path_bytes: BString::from("logo.png"),
                 stack_id: None,
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
@@ -1128,7 +1108,6 @@ mod tests {
             path: "data.file".to_string(),
             path_bytes: BString::from("data.file"),
             stack_id: None,
-            hunk_locks: None,
             line_nums_added: None,
             line_nums_removed: None,
             diff: None,
diff --git a/crates/but-hunk-assignment/src/reconcile.rs b/crates/but-hunk-assignment/src/reconcile.rs
@@ -13,8 +13,6 @@ pub enum MultipleOverlapping {
 
 impl HunkAssignment {
     fn set_from(&mut self, other: &Self, applied_stack_ids: &[StackId], update_unassigned: bool) {
-        // Always override the locks with the from the other assignment
-        self.hunk_locks = other.hunk_locks.clone();
         // Always set the path from the other assignment
         self.path = other.path.clone();
         // Override the id only if the other assignment has an id
@@ -68,13 +66,6 @@ pub(crate) fn assignments(
         match intersecting.len().cmp(&1) {
             Ordering::Less => {
                 // No intersection - do nothing, the None assignment is kept
-                let matching_file = old
-                    .iter()
-                    .filter(|current_entry| current_entry.path == new_assignment.path)
-                    .collect::<Vec<_>>();
-                if let Some(matching_file) = matching_file.first() {
-                    new_assignment.hunk_locks = matching_file.hunk_locks.clone();
-                }
             }
             Ordering::Equal => {
                 new_assignment.set_from(intersecting[0], applied_stack_ids, update_unassigned);
diff --git a/crates/but-tools/Cargo.toml b/crates/but-tools/Cargo.toml
@@ -14,7 +14,6 @@ test = false
 but-core.workspace = true
 but-workspace = { workspace = true, features = ["legacy"] }
 but-serde.workspace = true
-but-hunk-dependency.workspace = true
 but-hunk-assignment.workspace = true
 but-ctx = { workspace = true, features = ["legacy"] }
 
diff --git a/crates/but-tools/src/workspace.rs b/crates/but-tools/src/workspace.rs
@@ -1352,8 +1352,6 @@ pub struct RichHunk {
     pub diff: String,
     /// The stack ID this hunk is assigned to, if any.
     pub assigned_to_stack: Option<but_core::ref_metadata::StackId>,
-    /// The locks this hunk has, if any.
-    pub dependency_locks: Vec<but_hunk_dependency::ui::HunkLock>,
 }
 
 #[derive(Debug, Clone, serde::Serialize)]
@@ -1593,20 +1591,13 @@ fn get_file_changes(
                             .find(|a| {
                                 a.path_bytes == change.path && a.hunk_header == Some(hunk.into())
                             })
-                            .map(|a| (a.stack_id, a.hunk_locks.clone()));
+                            .map(|a| a.stack_id);
 
-                        let (assigned_to_stack, dependency_locks) =
-                            if let Some((stack_id, locks)) = assignment {
-                                let locks = locks.unwrap_or_default();
-                                (stack_id, locks)
-                            } else {
-                                (None, vec![])
-                            };
+                        let assigned_to_stack = assignment.flatten();
 
                         RichHunk {
                             diff,
                             assigned_to_stack,
-                            dependency_locks,
                         }
                     })
                     .collect::<Vec<_>>();
diff --git a/crates/but/src/command/commit/move.rs b/crates/but/src/command/commit/move.rs
@@ -294,7 +294,6 @@ mod tests {
                 path: "test.txt".to_string(),
                 path_bytes: BString::from("test.txt"),
                 stack_id: None,
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
diff --git a/crates/but/src/command/legacy/commit.rs b/crates/but/src/command/legacy/commit.rs
@@ -749,7 +749,6 @@ mod tests {
                     path: path.to_owned(),
                     path_bytes: path.as_bytes().into(),
                     stack_id: None,
-                    hunk_locks: None,
                     line_nums_added: None,
                     line_nums_removed: None,
                     diff: None,
diff --git a/crates/but/src/command/legacy/rub/mod.rs b/crates/but/src/command/legacy/rub/mod.rs
@@ -1141,7 +1141,6 @@ mod tests {
                 path: "test.txt".to_string(),
                 path_bytes: BString::from("test.txt"),
                 stack_id: None,
-                hunk_locks: None,
                 line_nums_added: None,
                 line_nums_removed: None,
                 diff: None,
diff --git a/crates/but/src/command/legacy/status/mod.rs b/crates/but/src/command/legacy/status/mod.rs
@@ -26,7 +26,7 @@ use crate::{
     id::{SegmentWithId, ShortId, StackWithId, TreeChangeWithId},
     tui::text::truncate_text,
     utils::{
-        OutputChannel, WriteWithUtils, shorten_hex_object_id, shorten_object_id, split_short_id,
+        OutputChannel, WriteWithUtils, shorten_hex_object_id, shorten_object_id,
         time::format_relative_time_verbose,
     },
 };
@@ -755,45 +755,14 @@ fn print_assignments(
             "uncommitted file",
         )?;
 
-        let lock_items: Vec<(String, String)> = fa
-            .assignments
-            .iter()
-            .flat_map(|a| a.inner.hunk_locks.iter())
-            .flatten()
-            .map(|l| l.commit_id.to_string())
-            .collect::<std::collections::BTreeSet<_>>()
-            .into_iter()
-            .map(|commit_id| {
-                let short_id = shorten_hex_object_id(repo, &commit_id);
-                let (lead, rest) = split_short_id(&short_id, 2);
-                (lead.to_string(), rest.to_string())
-            })
-            .collect();
-
-        let mut lock_spans: Vec<Span<'static>> = Vec::new();
-        if !lock_items.is_empty() {
-            lock_spans.push(Span::raw("🔒 "));
-            for (i, (lead, rest)) in lock_items.into_iter().enumerate() {
-                if i > 0 {
-                    lock_spans.push(Span::raw(", "));
-                }
-                lock_spans.push(Span::styled(lead, Style::default().blue().bold()));
-                lock_spans.push(Span::styled(rest, Style::default().blue()));
-            }
-        }
-
-        let mut file_line = Vec::from([
+        let file_line = Vec::from([
             Span::raw(id_padding.clone()),
             Span::styled(cli_id.to_string(), Style::default().bold().blue()),
             Span::raw(" "),
             Span::raw(status.to_string()),
             Span::raw(" "),
             path,
         ]);
-        if !lock_spans.is_empty() {
-            file_line.push(Span::raw(" "));
-            file_line.extend(lock_spans);
-        }
 
         if unstaged {
             output.unstaged_file(Vec::from([Span::raw("┊   ")]), file_line, file_cli_id)?;
diff --git a/crates/but/src/id/tests.rs b/crates/but/src/id/tests.rs
