Remove locks from but status subcommand#13043
Merged
Conversation
|
The latest updates on your projects. Learn more about Vercel for GitHub. 1 Skipped Deployment
|
github-actions
bot
added
rust
krlvi
force-pushed
the
remove-hunk-locks
branch
from
73b6e7d to
a6e3381
Compare
Contributor
There was a problem hiding this comment.
Pull request overview
This PR removes the notion of “locks” from the but status CLI output and related data plumbing so agents/users aren’t presented with lock indicators, while updating absorb planning to derive dependency locks from computed hunk dependencies instead of per-assignment fields.
Changes:
- Removed lock rendering (🔒 + commit list) from the legacy
but statusassignments output. - Removed lock fields from hunk assignment/test fixtures and simplified reconciliation now that locks aren’t carried on assignments.
- Updated absorb planning to compute and consult
HunkDependenciesfor lock-based absorption targeting.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
crates/but/src/command/legacy/status/mod.rs |
Removes lock collection/formatting and the lock indicator from status output. |
crates/but-hunk-assignment/src/lib.rs |
Removes hunk_locks from HunkAssignment and updates constructors/tests accordingly. |
crates/but-hunk-assignment/src/reconcile.rs |
Stops copying/preserving locks during reconciliation since assignments no longer carry them. |
crates/but-api/src/legacy/absorb.rs |
Switches lock-based absorption logic to look up locks via computed HunkDependencies. |
crates/but-tools/src/workspace.rs |
Removes dependency_locks from RichHunk and stops populating it. |
crates/but/src/id/tests.rs |
Updates test fixtures for HunkAssignment by removing hunk_locks. |
crates/but/src/command/legacy/rub/mod.rs |
Updates test fixture(s) to remove hunk_locks. |
crates/but/src/command/legacy/commit.rs |
Updates test fixture(s) to remove hunk_locks. |
crates/but/src/command/commit/move.rs |
Updates test fixture(s) to remove hunk_locks. |
krlvi
force-pushed
the
remove-hunk-locks
branch
2 times, most recently
from
4d7f01f to
ce2cb14
Compare
krlvi
force-pushed
the
remove-hunk-locks
branch
from
ce2cb14 to
3735796
Compare
krlvi
force-pushed
the
remove-hunk-locks
branch
from
3735796 to
227ca8a
Compare
krlvi
force-pushed
the
remove-hunk-locks
branch
from
227ca8a to
30e664b
Compare
krlvi
force-pushed
the
remove-hunk-locks
branch
2 times, most recently
from
87e0b6a to
ae0e8b3
Compare
krlvi
force-pushed
the
remove-hunk-locks
branch
from
ae0e8b3 to
5cf8d0b
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
It was confusing agents and humans