Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement staging and unstaging hunks #24606

Merged
merged 29 commits into from
Feb 12, 2025
Merged

Implement staging and unstaging hunks #24606

merged 29 commits into from
Feb 12, 2025

Conversation

cole-miller
Copy link
Contributor

@cole-miller cole-miller commented Feb 11, 2025

  • Staging hunks
  • Unstaging hunks
  • Write a randomized test
  • Get test passing
  • Fix existing bug in diff_base_byte_range computation
  • Remote project support
  • Improve performance of buffer_range_to_unchanged_diff_base_range
  • Bug: project diff editor scrolls to top when staging/unstaging hunk existing issue
  • UI deferred
  • Tricky cases
    • Correctly handle acting on multiple hunks for a single file
    • Remove path from index when unstaging the last staged hunk, if it's absent from HEAD, or staging the only hunk, if it's deleted in the working copy

Release Notes:

  • Add ToggleStagedSelectedDiffHunks action for staging and unstaging individual diff hunks

@cla-bot cla-bot bot added the cla-signed The user has signed the Contributor License Agreement label Feb 11, 2025
@cole-miller cole-miller force-pushed the stage-unstage-hunks branch 2 times, most recently from a77e41d to 8bef25e Compare February 11, 2025 05:25
@cole-miller cole-miller marked this pull request as ready for review February 12, 2025 05:21
@cole-miller cole-miller enabled auto-merge (squash) February 12, 2025 19:32
@cole-miller cole-miller merged commit eea6b52 into main Feb 12, 2025
14 checks passed
@cole-miller cole-miller deleted the stage-unstage-hunks branch February 12, 2025 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed The user has signed the Contributor License Agreement
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant