Skip to content

Numeric indexes for hunks (fileid:number)#12658

Merged
jonathantanmy2 merged 3 commits intomasterfrom
jt/hunkindex
Mar 2, 2026
Merged

Numeric indexes for hunks (fileid:number)#12658
jonathantanmy2 merged 3 commits intomasterfrom
jt/hunkindex

Conversation

@jonathantanmy2
Copy link
Collaborator

@jonathantanmy2 jonathantanmy2 commented Mar 2, 2026

@krlvi we talked about this previously and I was worried about filenames with colons in them, but I think I found a solution (limit the number of colons to 2). I'm going to automerge this, but we can change things if you want. If this works, what do you think about removing the old autogenerated IDs (e.g. g0) and using the colon IDs (e.g. kl:0) throughout?

Each UncommittedFile will need access to its own hunks in a subsequent
commit.
`fileid` can be any way to access a file (e.g. a filename or a short
ID).
@vercel
Copy link

vercel bot commented Mar 2, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

1 Skipped Deployment
Project Deployment Actions Updated (UTC)
gitbutler-web Ignored Ignored Mar 2, 2026 10:05pm

Request Review

@github-actions github-actions bot added rust Pull requests that update Rust code CLI The command-line program `but` labels Mar 2, 2026
@jonathantanmy2 jonathantanmy2 merged commit 16120e9 into master Mar 2, 2026
33 checks passed
@jonathantanmy2 jonathantanmy2 deleted the jt/hunkindex branch March 2, 2026 22:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLI The command-line program `but` rust Pull requests that update Rust code

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant