Permalink
Checking mergeability…
Don’t worry, you can still create the pull request.
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
...
- 9 commits
- 9 files changed
- 1 contributor
Commits on Jul 1, 2024
-
Checkpoint generalizing to hunks with more than two "parts"
The parts here refer essentially to commits. In a combined diff, there are at least 3 commits in consideration.
-
Checkpoint working combined diffs implementation
Took a while to come up with something that looks correct. Essentially we show the final state as the last "part" i.e. vertical section and the rest of the parts show changes made in the corresponding parent commit. The line width is currently incorrect, will fix later.
-
-
Implement unified diff rendering for combined diffs
The naming is getting confusing here, but the approach we had for rendering a unified diff for "unified diffs" wasn't great for "combined diffs" because it would end up repeating additions/deletions. So, I added a separate implementation which essentially renders what you would see in the last column of the split diff. This required showing deletions in the split diff as well, which I had previously skipped. I think that still looks fine, so will let it be.
-
-
Handle more than 2 parents in combined diffs
The "@"s in the header vary by number of parents, so we need to handle that.
-
Switch how we show deleted lines in combined diffs
On re-reading "A - character in the column N means that the line appears in fileN but it does not appear in the result.", we should be showing the line in the files where it has a '-' prefix and not showing it in other files.
-
Add test cases for merge commits
Found some commits in the TypeScript repo that have non-empty combined diffs using: ``` git rev-list --merges --all --min-parents=2 | while read commit; do if [ -n "$(git show --format='' $commit)" ]; then echo $commit; fi; done ```
-
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff main...handle-combined-diffs