Merged
Conversation
…merge commit is rendered in the correct swimlane
Remove more hacks that were in place
aeschli
previously approved these changes
Jun 19, 2024
alexdima
approved these changes
Jun 19, 2024
bricefriha
pushed a commit
to bricefriha/vscode
that referenced
this pull request
Jun 26, 2024
* Hacked up the starting point * More progress * More progress * Simplified algo, basic support for colors * Add the concept of secondary colors for merge commits * Further optimizations of the algo * Bug fixes to clean-up algo * Add support for curved branches * Keep track of nodes that are moved so that the second parent for the merge commit is rendered in the correct swimlane * Account for offset when drawing a base commit * Algo rework completed * Revert some of the hacks that were put in place to quickly get going * Add caching to the history items used in the graph Remove more hacks that were in place * Added initial tests * More work so that incoming/outgoing works along history * Uncomment more code * Bug fixes to edge cases * Experiment with a new rendering for curved branches * Handle repository with a single commit * Maintain swimlanes * Fix condition * Saving my changes * More polish and clean-up * Remove code that is not needed * Revert change * Revert more changes * More fixes * Rename interface * One last minor change * Pull request feedback * More refactoring * More pull request feedback * Fix layering issues
|
This is excellent, I love this! |
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
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.
Related #215439