Skip to content

Assigning hunks #8694

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.

Sign up for GitHub

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

Jump to bottom
Draft
wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Assigning hunks #8694

wants to merge 15 commits into from
+1,075 −132

Conversation

Caleb-T-Owens
Copy link
Contributor

@Caleb-T-Owens Caleb-T-Owens commented May 21, 2025 •
edited
Loading

Polish items:

  • Only show checkboxes for assigned changes if the user is committing to that particular stack
  • Ensure that assigned items are deselected if the user is committing to a different stack.
  • Make it pop

⧓ Review in Butler Review #2tnIMUho4

Assigning hunks

15 commit series (version 15)

Series Commit Title Status Reviewers
15/15 Start a commit behaviours ⏳
14/15 If there are no changes in the group, select all should always show as false ⏳
13/15 Exit early if there are no relevant assignments ⏳
12/15 Remove useage of group in the idSelection retain ⏳
11/15 Changes ⏳
10/15 Update cypress tests ⏳
9/15 Select alls ⏳
8/15 Move all selection logic into a TS file ⏳
7/15 Fix issue with the main select all button ⏳
6/15 Update selections to consider groups ⏳
5/15 Assigning hunks into the assigned chagnes thingy ⏳
4/15 Listing and dragging whole files assignments ⏳
3/15 Move the file list into a component ⏳
2/15 Use worktree changes key in the hunk assignments ⏳
1/15 Make changes key a unique type ⏳

Please leave review feedback in the Butler Review

@vercel Vercel
Copy link

vercel bot commented May 21, 2025 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
gitbutler-components ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 23, 2025 3:45pm
gitbutler-web ✅ Ready (Inspect) Visit Preview 💬 Add feedback May 23, 2025 3:45pm

@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 22, 2025 13:08 Inactive
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 22, 2025 13:47 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 50eb684 to b1d5514 Compare May 22, 2025 13:47
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from b1d5514 to 712d020 Compare May 22, 2025 13:50
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 22, 2025 13:50 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 712d020 to ec7bebb Compare May 22, 2025 13:52
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 22, 2025 13:52 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from ec7bebb to d6a32c9 Compare May 22, 2025 17:14
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 22, 2025 17:15 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from d6a32c9 to 615f620 Compare May 23, 2025 09:44
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 23, 2025 10:25 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from cfc2bd3 to cf193d4 Compare May 23, 2025 11:08
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 23, 2025 11:40 Inactive
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 23, 2025 13:05 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 5987275 to 07c6cb9 Compare May 23, 2025 13:26
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 07c6cb9 to cafe2ba Compare May 23, 2025 13:32
@Caleb-T-Owens
Make changes key a unique type
b44651e 
This prevents someone from accidentally (or perhaps unwisly on purpose) passing an arbitrary number of their own construction to the down-stream queries
@Caleb-T-Owens
Use worktree changes key in the hunk assignments
951904b
@vercel vercel bot temporarily deployed to Preview – gitbutler-web May 23, 2025 14:58 Inactive
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 2b06003 to 8d5d31e Compare May 23, 2025 14:58
@Caleb-T-Owens Caleb-T-Owens force-pushed the assigning-hunks-to-stacks branch from 8d5d31e to a9bb42c Compare May 23, 2025 15:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
@gitbutler/desktop @gitbutler/ui
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@Caleb-T-Owens